Skip to content
This repository was archived by the owner on Mar 24, 2026. It is now read-only.

Commit cfd08e5

Browse files
ShreckYeShreckYe
committed
Replace usages of the word "optimized" for the R2DBC configs with "ktor-r2dbc"
1 parent fc3de17 commit cfd08e5

7 files changed

Lines changed: 31 additions & 32 deletions

File tree

‎frameworks/Kotlin/vertx-web-kotlinx/benchmark_config.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
"os": "Linux",
125125
"database_os": "Linux",
126126
"display_name": "vertx-web-kotlinx-exposed-r2dbc-postgresql",
127-
"notes": "Alias for shared-pool-size-512-optimized configuration",
128127
"versus": "vertx-web-kotlinx-r2dbc-postgresql"
129128
},
130129
"exposed-vertx-sql-client-postgresql": {

‎frameworks/Kotlin/vertx-web-kotlinx/with-db/exposed-r2dbc/src/main/kotlin/Main.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@ suspend fun main(args: Array<String>) {
44
// Parse CLI arguments
55
val isSharedPool = args.getOrNull(0)?.toBooleanStrictOrNull() ?: false
66
val poolSize = args.getOrNull(1)?.toIntOrNull() ?: 8
7-
val useOptimizedConfig = args.getOrNull(2)?.toBooleanStrictOrNull() ?: false
7+
val useKtorR2dbcConfig = args.getOrNull(2)?.toBooleanStrictOrNull() ?: false
88

99
val benchmarkName = buildString {
1010
append("Vert.x-Web Kotlinx with Exposed R2DBC (and PostgreSQL)")
11-
if (!isSharedPool || poolSize != 512 || !useOptimizedConfig) {
11+
if (!isSharedPool || poolSize != 512 || !useKtorR2dbcConfig) {
1212
append(" - ")
1313
if (isSharedPool) {
1414
append("Shared Pool Size $poolSize")
1515
} else {
1616
append("Separate Pool Size $poolSize")
1717
}
18-
if (useOptimizedConfig) {
19-
append(" Optimized")
18+
if (useKtorR2dbcConfig) {
19+
append(" Ktor R2DBC portion config")
2020
}
2121
}
2222
}
2323

2424
if (isSharedPool) {
2525
commonRunVertxServer(
2626
benchmarkName,
27-
{ r2dbcConnectPool(poolSize, useOptimizedConfig) },
27+
{ r2dbcConnectPool(poolSize, useKtorR2dbcConfig) },
2828
::MainVerticle
2929
)
3030
} else {
3131
commonRunVertxServer(
3232
benchmarkName,
3333
{ Unit },
34-
{ MainVerticleWithSeparatePool(poolSize, useOptimizedConfig) }
34+
{ MainVerticleWithSeparatePool(poolSize, useKtorR2dbcConfig) }
3535
)
3636
}
3737
}

‎frameworks/Kotlin/vertx-web-kotlinx/with-db/exposed-r2dbc/src/main/kotlin/MainVerticle.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ class MainVerticle(private val r2dbcDatabase: R2dbcDatabase) : CommonWithDbVerti
5252
* Creates a MainVerticle that will create its own connection pool per verticle instance.
5353
* Used for separate-pool benchmark configurations.
5454
*/
55-
fun MainVerticleWithSeparatePool(poolSize: Int, useOptimizedConfig: Boolean): MainVerticle =
56-
MainVerticle(r2dbcConnectPool(poolSize, useOptimizedConfig))
55+
fun MainVerticleWithSeparatePool(poolSize: Int, useKtorR2dbcConfig: Boolean): MainVerticle =
56+
MainVerticle(r2dbcConnectPool(poolSize, useKtorR2dbcConfig))

‎frameworks/Kotlin/vertx-web-kotlinx/with-db/exposed-r2dbc/src/main/kotlin/database/ExposedDatabaseR2dbc.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ fun r2dbcDatabaseConnectPoolOriginal(connectionPoolSize: Int) =
1010
explicitDialect = PostgreSQLDialect()
1111
})
1212

13-
fun r2dbcDatabaseConnectPoolOptimized(connectionPoolSize: Int) =
14-
R2dbcDatabase.connect(connectionPoolOptimized(connectionPoolSize), R2dbcDatabaseConfig {
13+
fun r2dbcDatabaseConnectPoolKtorR2dbc(connectionPoolSize: Int) =
14+
R2dbcDatabase.connect(connectionPoolKtorR2dbc(connectionPoolSize), R2dbcDatabaseConfig {
1515
explicitDialect = PostgreSQLDialect()
1616
})
1717

1818
/**
1919
* Creates a shared R2dbcDatabase instance with a connection pool.
2020
* Used for shared-pool benchmark configurations.
2121
*/
22-
fun r2dbcConnectPool(poolSize: Int, useOptimizedConfig: Boolean): R2dbcDatabase =
23-
if (useOptimizedConfig)
24-
r2dbcDatabaseConnectPoolOptimized(poolSize)
22+
fun r2dbcConnectPool(poolSize: Int, useKtorR2dbcConfig: Boolean): R2dbcDatabase =
23+
if (useKtorR2dbcConfig)
24+
r2dbcDatabaseConnectPoolKtorR2dbc(poolSize)
2525
else
2626
r2dbcDatabaseConnectPoolOriginal(poolSize)

frameworks/Kotlin/vertx-web-kotlinx/with-db/r2dbc-common/src/main/kotlin/database/R2dbcOptimized.kt renamed to frameworks/Kotlin/vertx-web-kotlinx/with-db/r2dbc-common/src/main/kotlin/database/R2dbcKtorR2dbc.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import io.r2dbc.postgresql.client.SSLMode
88
import io.r2dbc.spi.ConnectionFactory
99
import java.time.Duration
1010

11-
// Optimized configuration with TCP settings and connection validation
12-
val connectionFactoryOptimized: ConnectionFactory = PostgresqlConnectionFactory(
11+
// Alternative configurations copied from the `ktor-r2dbc` portion. These configurations don't lead to better performance as tested in Continuous Benchmarking.
12+
13+
val connectionFactoryKtorR2dbc: ConnectionFactory = PostgresqlConnectionFactory(
1314
PostgresqlConnectionConfiguration.builder()
1415
.host(HOST)
1516
.port(5432)
@@ -22,14 +23,13 @@ val connectionFactoryOptimized: ConnectionFactory = PostgresqlConnectionFactory(
2223
.build()
2324
)
2425

25-
fun connectionPoolConfigurationOptimized(size: Int) =
26-
ConnectionPoolConfiguration.builder(connectionFactoryOptimized)
26+
fun connectionPoolConfigurationKtorR2dbc(size: Int) =
27+
ConnectionPoolConfiguration.builder(connectionFactoryKtorR2dbc)
2728
.initialSize(size)
2829
.maxSize(size)
2930
.maxIdleTime(Duration.ofSeconds(30))
3031
.maxAcquireTime(Duration.ofSeconds(5))
31-
.validationQuery("SELECT 1")
3232
.build()
3333

34-
fun connectionPoolOptimized(size: Int) =
35-
ConnectionPool(connectionPoolConfigurationOptimized(size))
34+
fun connectionPoolKtorR2dbc(size: Int) =
35+
ConnectionPool(connectionPoolConfigurationKtorR2dbc(size))

‎frameworks/Kotlin/vertx-web-kotlinx/with-db/r2dbc/src/main/kotlin/Main.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import database.connectionPoolOptimized
1+
import database.connectionPoolKtorR2dbc
22
import database.connectionPoolOriginal
33
import io.r2dbc.spi.ConnectionFactory
44

@@ -7,27 +7,27 @@ suspend fun main(args: Array<String>) {
77
val isSharedPool = args.getOrNull(0)?.toBooleanStrictOrNull() ?: false
88
val poolSize = args.getOrNull(1)?.toIntOrNull()
99
?: 8 // TODO `1` might produce equivalent results because there is no transaction in this portion compared to `exposed-r2dbc`.
10-
val useOptimizedConfig = args.getOrNull(2)?.toBooleanStrictOrNull() ?: false
10+
val useKtorR2dbcConfig = args.getOrNull(2)?.toBooleanStrictOrNull() ?: false
1111

1212
val benchmarkName = buildString {
1313
append("Vert.x-Web Kotlinx with R2DBC (and PostgreSQL)")
14-
if (!isSharedPool || poolSize != 512 || !useOptimizedConfig) {
14+
if (!isSharedPool || poolSize != 512 || !useKtorR2dbcConfig) {
1515
append(" - ")
1616
if (isSharedPool) {
1717
append("Shared Pool Size $poolSize")
1818
} else {
1919
append("Separate Pool Size $poolSize")
2020
}
21-
if (useOptimizedConfig) {
22-
append(" Optimized")
21+
if (useKtorR2dbcConfig) {
22+
append(" Ktor R2DBC portion config")
2323
}
2424
}
2525
}
2626

2727
if (isSharedPool) {
2828
// Shared pool: create one ConnectionPool that all verticles will share
29-
val connectionFactory: ConnectionFactory = if (useOptimizedConfig) {
30-
connectionPoolOptimized(poolSize)
29+
val connectionFactory: ConnectionFactory = if (useKtorR2dbcConfig) {
30+
connectionPoolKtorR2dbc(poolSize)
3131
} else {
3232
connectionPoolOriginal(poolSize)
3333
}
@@ -42,7 +42,7 @@ suspend fun main(args: Array<String>) {
4242
commonRunVertxServer(
4343
benchmarkName,
4444
{},
45-
{ MainVerticleWithSeparatePool(poolSize, useOptimizedConfig) }
45+
{ MainVerticleWithSeparatePool(poolSize, useKtorR2dbcConfig) }
4646
)
4747
}
4848
}

‎frameworks/Kotlin/vertx-web-kotlinx/with-db/r2dbc/src/main/kotlin/MainVerticle.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class MainVerticle(private val connectionFactory: ConnectionFactory) : CommonWit
5656
}
5757

5858
// Factory function for creating MainVerticle with separate connection pools
59-
fun MainVerticleWithSeparatePool(poolSize: Int, useOptimizedConfig: Boolean): MainVerticle {
60-
val connectionPool = if (useOptimizedConfig) {
61-
connectionPoolOptimized(poolSize)
59+
fun MainVerticleWithSeparatePool(poolSize: Int, useKtorR2dbcConfig: Boolean): MainVerticle {
60+
val connectionPool = if (useKtorR2dbcConfig) {
61+
connectionPoolKtorR2dbc(poolSize)
6262
} else {
6363
connectionPoolOriginal(poolSize)
6464
}

0 commit comments

Comments
 (0)