Skip to content

Commit de4bda3

Browse files
authored
Use the new Exposed SELECT DSL in the "ktor-exposed" benchmarks, and bump the Exposed version to the latest (#9375)
Add `--no-daemon` to the Dockerfile Gradle commands BTW.
1 parent d91f017 commit de4bda3

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM gradle:jdk17
33
WORKDIR /ktor-exposed
44
COPY ktor-exposed/settings.gradle.kts settings.gradle.kts
55
COPY ktor-exposed/app app
6-
RUN gradle shadowJar
6+
RUN gradle --no-daemon shadowJar
77

88
EXPOSE 8080
99

frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM gradle:jdk17
33
WORKDIR /ktor-exposed
44
COPY ktor-exposed/settings.gradle.kts settings.gradle.kts
55
COPY ktor-exposed/app app
6-
RUN gradle shadowJar
6+
RUN gradle --no-daemon shadowJar
77

88
EXPOSE 8080
99

frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repositories {
1111

1212
val ktorVersion = "2.3.12"
1313
val kotlinxSerializationVersion = "1.6.3"
14-
val exposedVersion = "0.52.0"
14+
val exposedVersion = "0.56.0"
1515

1616
dependencies {
1717
implementation("io.ktor:ktor-server-core:$ktorVersion")

frameworks/Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ import org.jetbrains.exposed.dao.IntEntity
1919
import org.jetbrains.exposed.dao.IntEntityClass
2020
import org.jetbrains.exposed.dao.id.EntityID
2121
import org.jetbrains.exposed.dao.id.IdTable
22-
import org.jetbrains.exposed.sql.*
22+
import org.jetbrains.exposed.sql.Database
23+
import org.jetbrains.exposed.sql.ResultRow
2324
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
25+
import org.jetbrains.exposed.sql.Transaction
2426
import org.jetbrains.exposed.sql.transactions.transaction
27+
import org.jetbrains.exposed.sql.update
2528
import java.util.concurrent.ThreadLocalRandom
2629

2730
@Serializable
@@ -82,7 +85,7 @@ fun Application.module(exposedMode: ExposedMode) {
8285

8386
routing {
8487
fun selectWorldsWithIdQuery(id: Int) =
85-
WorldTable.slice(WorldTable.id, WorldTable.randomNumber).select(WorldTable.id eq id)
88+
WorldTable.select(WorldTable.id, WorldTable.randomNumber).where(WorldTable.id eq id)
8689

8790
fun ResultRow.toWorld() =
8891
World(this[WorldTable.id].value, this[WorldTable.randomNumber])
@@ -129,7 +132,7 @@ fun Application.module(exposedMode: ExposedMode) {
129132
get("/fortunes") {
130133
val result = withDatabaseContextAndTransaction {
131134
when (exposedMode) {
132-
Dsl -> FortuneTable.slice(FortuneTable.id, FortuneTable.message).selectAll()
135+
Dsl -> FortuneTable.select(FortuneTable.id, FortuneTable.message)
133136
.asSequence().map { it.toFortune() }
134137

135138
Dao -> FortuneDao.all().asSequence().map { it.toFortune() }

0 commit comments

Comments
 (0)