From 77683e89f101a6c53d9a9cb1483d0c7107b02761 Mon Sep 17 00:00:00 2001
From: Shreck Ye <ShreckYe@gmail.com>
Date: Thu, 31 Oct 2024 00:35:14 +0800
Subject: [PATCH] Use the new Exposed SELECT DSL in the "ktor-exposed"
 benchmarks, and bump the Exposed version to the latest

Add `--no-daemon` to the Dockerfile Gradle commands BTW.
---
 frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile       | 2 +-
 frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile       | 2 +-
 frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts | 2 +-
 .../Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt  | 9 ++++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile b/frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile
index e12a664f8dc..10f2ed2180d 100644
--- a/frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile
+++ b/frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile
@@ -3,7 +3,7 @@ FROM gradle:jdk17
 WORKDIR /ktor-exposed
 COPY ktor-exposed/settings.gradle.kts settings.gradle.kts
 COPY ktor-exposed/app app
-RUN gradle shadowJar
+RUN gradle --no-daemon shadowJar
 
 EXPOSE 8080
 
diff --git a/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile b/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile
index f65069e6b78..5d05b4494ce 100644
--- a/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile
+++ b/frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile
@@ -3,7 +3,7 @@ FROM gradle:jdk17
 WORKDIR /ktor-exposed
 COPY ktor-exposed/settings.gradle.kts settings.gradle.kts
 COPY ktor-exposed/app app
-RUN gradle shadowJar
+RUN gradle --no-daemon shadowJar
 
 EXPOSE 8080
 
diff --git a/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts b/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts
index 60f4dab3b17..f57ded6c314 100644
--- a/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts
+++ b/frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 val ktorVersion = "2.3.12"
 val kotlinxSerializationVersion = "1.6.3"
-val exposedVersion = "0.52.0"
+val exposedVersion = "0.56.0"
 
 dependencies {
     implementation("io.ktor:ktor-server-core:$ktorVersion")
diff --git a/frameworks/Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt b/frameworks/Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt
index c284ecd7b17..513a20b7ab7 100644
--- a/frameworks/Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt
+++ b/frameworks/Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt
@@ -19,9 +19,12 @@ import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IdTable
-import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
 import java.util.concurrent.ThreadLocalRandom
 
 @Serializable
@@ -82,7 +85,7 @@ fun Application.module(exposedMode: ExposedMode) {
 
     routing {
         fun selectWorldsWithIdQuery(id: Int) =
-            WorldTable.slice(WorldTable.id, WorldTable.randomNumber).select(WorldTable.id eq id)
+            WorldTable.select(WorldTable.id, WorldTable.randomNumber).where(WorldTable.id eq id)
 
         fun ResultRow.toWorld() =
             World(this[WorldTable.id].value, this[WorldTable.randomNumber])
@@ -129,7 +132,7 @@ fun Application.module(exposedMode: ExposedMode) {
         get("/fortunes") {
             val result = withDatabaseContextAndTransaction {
                 when (exposedMode) {
-                    Dsl -> FortuneTable.slice(FortuneTable.id, FortuneTable.message).selectAll()
+                    Dsl -> FortuneTable.select(FortuneTable.id, FortuneTable.message)
                         .asSequence().map { it.toFortune() }
 
                     Dao -> FortuneDao.all().asSequence().map { it.toFortune() }