From fd6ecb70930b0aa06742af2ae703e3849ccd67f8 Mon Sep 17 00:00:00 2001 From: Yongshun Ye Date: Fri, 12 Dec 2025 11:21:41 +0800 Subject: [PATCH] Fix SQL capitalization and format in all the Vert.x benchmarks Fix a typo that "world" is misspelled as "word" BTW. --- .../src/main/java/io/vertx/benchmark/App.java | 6 +++--- frameworks/Java/vertx/src/main/java/vertx/App.java | 14 +++++++------- .../src/main/kotlin/io/vertx/benchmark/App.kt | 6 +++--- .../vertx-web-scala/src/main/scala/vertx/App.scala | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java b/frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java index 5630df8d2f2..074f29c3f8f 100644 --- a/frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java +++ b/frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java @@ -50,9 +50,9 @@ private void createPgClientBenchmarkAsync(Vertx vertx, JsonObject config, Handle */ private final class PgClientBenchmark { - private static final String UPDATE_WORLD = "UPDATE world SET randomnumber=$1 WHERE id=$2"; - private static final String SELECT_WORLD = "SELECT id, randomnumber from WORLD where id=$1"; - private static final String SELECT_FORTUNE = "SELECT id, message from FORTUNE"; + private static final String UPDATE_WORLD = "UPDATE world SET randomnumber = $1 WHERE id = $2"; + private static final String SELECT_WORLD = "SELECT id, randomnumber FROM world WHERE id = $1"; + private static final String SELECT_FORTUNE = "SELECT id, message FROM fortune"; private final PgConnection client; diff --git a/frameworks/Java/vertx/src/main/java/vertx/App.java b/frameworks/Java/vertx/src/main/java/vertx/App.java index f2d54510503..0ffb375c47a 100755 --- a/frameworks/Java/vertx/src/main/java/vertx/App.java +++ b/frameworks/Java/vertx/src/main/java/vertx/App.java @@ -90,9 +90,9 @@ static int getQueries(HttpServerRequest request) { private static final CharSequence JSON_LENGTH = HttpHeaders.createOptimized("" + new Message("Hello, World!").toJson().length()); private static final CharSequence SERVER = HttpHeaders.createOptimized("vert.x"); - private static final String SELECT_WORLD = "SELECT id, randomnumber from WORLD where id=$1"; - private static final String SELECT_FORTUNE = "SELECT id, message from FORTUNE"; - private static final String SELECT_WORLDS = "SELECT id, randomnumber from WORLD"; + private static final String SELECT_WORLD = "SELECT id, randomnumber FROM world WHERE id = $1"; + private static final String SELECT_FORTUNE = "SELECT id, message FROM fortune"; + private static final String SELECT_WORLDS = "SELECT id, randomnumber FROM world"; public static CharSequence createDateHeader() { return HttpHeaders.createOptimized(DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.now())); @@ -213,12 +213,12 @@ private Future initClients(PgConnectOptions options) { private static String buildAggregatedUpdateQuery(int len) { StringBuilder sql = new StringBuilder(); - sql.append("UPDATE WORLD SET RANDOMNUMBER = CASE ID"); + sql.append("UPDATE world SET randomnumber = CASE ID"); for (int i = 0; i < len; i++) { int offset = (i * 2) + 1; sql.append(" WHEN $").append(offset).append(" THEN $").append(offset + 1); } - sql.append(" ELSE RANDOMNUMBER"); + sql.append(" ELSE randomnumber"); sql.append(" END WHERE ID IN ($1"); for (int i = 1; i < len; i++) { int offset = (i * 2) + 1; @@ -304,12 +304,12 @@ private void handleDb(HttpServerRequest req) { return; } Row row = resultSet.next(); - World word = new World(row.getInteger(0), row.getInteger(1)); + World world = new World(row.getInteger(0), row.getInteger(1)); MultiMap headers = resp.headers(); headers.add(HttpHeaders.SERVER, SERVER); headers.add(HttpHeaders.DATE, dateString); headers.add(HttpHeaders.CONTENT_TYPE, RESPONSE_TYPE_JSON); - resp.end(word.toJson()); + resp.end(world.toJson()); } else { sendError(req, res.cause()); } diff --git a/frameworks/Kotlin/vertx-web-kotlin-coroutines/src/main/kotlin/io/vertx/benchmark/App.kt b/frameworks/Kotlin/vertx-web-kotlin-coroutines/src/main/kotlin/io/vertx/benchmark/App.kt index cfb47cd1fa6..f877346549c 100644 --- a/frameworks/Kotlin/vertx-web-kotlin-coroutines/src/main/kotlin/io/vertx/benchmark/App.kt +++ b/frameworks/Kotlin/vertx-web-kotlin-coroutines/src/main/kotlin/io/vertx/benchmark/App.kt @@ -37,9 +37,9 @@ class App : CoroutineVerticle() { private const val SERVER = "vertx-web" // for PgClientBenchmark only - private const val UPDATE_WORLD = "UPDATE world SET randomnumber=$1 WHERE id=$2" - private const val SELECT_WORLD = "SELECT id, randomnumber from WORLD where id=$1" - private const val SELECT_FORTUNE = "SELECT id, message from FORTUNE" + private const val UPDATE_WORLD = "UPDATE world SET randomnumber = $1 WHERE id = $2" + private const val SELECT_WORLD = "SELECT id, randomnumber FROM world WHERE id = $1" + private const val SELECT_FORTUNE = "SELECT id, message FROM fortune" } inline fun Route.coroutineHandlerUnconfined(crossinline requestHandler: suspend (RoutingContext) -> Unit): Route = diff --git a/frameworks/Scala/vertx-web-scala/src/main/scala/vertx/App.scala b/frameworks/Scala/vertx-web-scala/src/main/scala/vertx/App.scala index 0f2991c3b47..e6abd39e38a 100644 --- a/frameworks/Scala/vertx-web-scala/src/main/scala/vertx/App.scala +++ b/frameworks/Scala/vertx-web-scala/src/main/scala/vertx/App.scala @@ -102,7 +102,7 @@ class App extends ScalaVerticle { private def handleDb(request: HttpServerRequest): Unit = client - .preparedQuery("SELECT id, randomnumber from WORLD where id=$1") + .preparedQuery("SELECT id, randomnumber FROM world WHERE id = $1") .execute( Tuple.of(App.randomWorld(), Nil: _*), (ar: AsyncResult[RowSet[Row]]) => { @@ -128,7 +128,7 @@ class App extends ScalaVerticle { var failed = false while (i < queries) { client - .preparedQuery("SELECT id, randomnumber from WORLD where id=$1") + .preparedQuery("SELECT id, randomnumber FROM world WHERE id = $1") .execute( Tuple.of(App.randomWorld(), Nil: _*), (ar: AsyncResult[RowSet[Row]]) => { @@ -159,7 +159,7 @@ class App extends ScalaVerticle { val batch = worlds.map(world => Tuple.of(world.randomNumber, world.id)).toList.asJava conn - .preparedQuery("UPDATE world SET randomnumber=$1 WHERE id=$2") + .preparedQuery("UPDATE world SET randomnumber = $1 WHERE id = $2") .executeBatch( batch, (ar: AsyncResult[RowSet[Row]]) => { @@ -184,7 +184,7 @@ class App extends ScalaVerticle { val id = App.randomWorld() val index = i client - .preparedQuery("SELECT id, randomnumber from WORLD where id=$1") + .preparedQuery("SELECT id, randomnumber FROM world WHERE id = $1") .execute( Tuple.of(id, Nil: _*), (ar2: AsyncResult[RowSet[Row]]) => { @@ -206,7 +206,7 @@ class App extends ScalaVerticle { private def handleFortunes(request: HttpServerRequest): Unit = client - .preparedQuery("SELECT id, message from FORTUNE") + .preparedQuery("SELECT id, message FROM fortune") .execute( (ar: AsyncResult[RowSet[Row]]) => { val response = request.response