Skip to content

Fix SQL capitalization and format in all the Vert.x benchmarks other than vertx-web-kotlinx #10400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShreckYe wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −18
Open

Fix SQL capitalization and format in all the Vert.x benchmarks other than vertx-web-kotlinx #10400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
14 changes: 7 additions & 7 deletions frameworks/Java/vertx/src/main/java/vertx/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down
6 changes: 3 additions & 3 deletions frameworks/Kotlin/vertx-web-kotlin-coroutines/src/main/kotlin/io/vertx/benchmark/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
10 changes: 5 additions & 5 deletions frameworks/Scala/vertx-web-scala/src/main/scala/vertx/App.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]) => {
Expand All @@ -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]]) => {
Expand Down Expand Up @@ -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]]) => {
Expand All @@ -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]]) => {
Expand All @@ -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
Expand Down
Loading