Skip to content

Use the new Exposed SELECT DSL in the "ktor-exposed" benchmarks, and bump the Exposed version to the latest #9375

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

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Use the new Exposed SELECT DSL in the "ktor-exposed" benchmarks, and bump the Exposed version to the latest #9375

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
2 changes: 1 addition & 1 deletion frameworks/Kotlin/ktor/ktor-exposed-dao.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/ktor/ktor-exposed-dsl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion frameworks/Kotlin/ktor/ktor-exposed/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 6 additions & 3 deletions frameworks/Kotlin/ktor/ktor-exposed/app/src/main/kotlin/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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])
Expand Down Expand Up @@ -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() }
Expand Down
Loading