Browse Source

[Scala/otavia] upgrade otavia to 0.4.5 (#9275)

* [Scala/otavia] upgrade otavia to 0.4.5

* [Scala/otavia] Add a test mutation
Yan Kun 11 months ago
parent
commit
caef9599e7

+ 1 - 47
frameworks/Scala/otavia/benchmark_config.json

@@ -25,53 +25,7 @@
         "notes": "",
         "notes": "",
         "versus": "Otavia"
         "versus": "Otavia"
       },
       },
-      "equalization": {
-        "json_url": "/json",
-        "plaintext_url": "/plaintext",
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "otavia",
-        "language": "Scala",
-        "flavor": "None",
-        "orm": "Micro",
-        "platform": "Otavia",
-        "webserver": "None",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "otavia",
-        "notes": "",
-        "versus": "Otavia"
-      },
-      "equalization-offgc": {
-        "json_url": "/json",
-        "plaintext_url": "/plaintext",
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "otavia",
-        "language": "Scala",
-        "flavor": "None",
-        "orm": "Micro",
-        "platform": "Otavia",
-        "webserver": "None",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "otavia",
-        "notes": "",
-        "versus": "Otavia"
-      },
-      "offgc": {
+      "overshoot": {
         "json_url": "/json",
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "plaintext_url": "/plaintext",
         "db_url": "/db",
         "db_url": "/db",

+ 2 - 2
frameworks/Scala/otavia/build.sc

@@ -1,11 +1,11 @@
 import mill._
 import mill._
 import mill.scalalib._
 import mill.scalalib._
 
 
-def otaviaVersion = "0.4.3"
+def otaviaVersion = "0.4.5"
 
 
 object benchmark extends ScalaModule {
 object benchmark extends ScalaModule {
 
 
-    override def scalaVersion = "3.3.1"
+    override def scalaVersion = "3.3.3"
 
 
     override def ivyDeps = Agg(
     override def ivyDeps = Agg(
       ivy"cc.otavia::otavia-codec-http:$otaviaVersion",
       ivy"cc.otavia::otavia-codec-http:$otaviaVersion",

+ 1 - 35
frameworks/Scala/otavia/config.toml

@@ -18,41 +18,7 @@ platform = "Otavia"
 webserver = "None"
 webserver = "None"
 versus = "Otavia"
 versus = "Otavia"
 
 
-[equalization]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Otavia"
-webserver = "None"
-versus = "Otavia"
-
-[equalization-offgc]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Otavia"
-webserver = "None"
-versus = "Otavia"
-
-[offgc]
+[overshoot]
 urls.plaintext = "/plaintext"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.json = "/json"
 urls.db = "/db"
 urls.db = "/db"

+ 0 - 16
frameworks/Scala/otavia/otavia-equalization-offgc.dockerfile

@@ -1,16 +0,0 @@
-FROM nightscape/scala-mill:eclipse-temurin-17.0.8.1_1-jdk-focal_0.11.6_3.3.0
-WORKDIR /otavia
-COPY benchmark benchmark
-COPY build.sc build.sc
-ENV COURSIER_REPOSITORIES=ivy2Local|central
-RUN mill benchmark.assembly
-
-EXPOSE 8080
-
-CMD java -server \
-    -Dcc.otavia.actor.worker.size=56 -Dcc.otavia.nio.worker.size=56 \
-    -Dcc.otavia.system.gc.aggressive=false \
-    -jar \
-    out/benchmark/assembly.dest/out.jar \
-    jdbc:postgresql://tfb-database:5432/hello_world \
-    benchmarkdbuser benchmarkdbpass 56

+ 0 - 16
frameworks/Scala/otavia/otavia-offgc.dockerfile

@@ -1,16 +0,0 @@
-FROM nightscape/scala-mill:eclipse-temurin-17.0.8.1_1-jdk-focal_0.11.6_3.3.0
-WORKDIR /otavia
-COPY benchmark benchmark
-COPY build.sc build.sc
-ENV COURSIER_REPOSITORIES=ivy2Local|central
-RUN mill benchmark.assembly
-
-EXPOSE 8080
-
-CMD java -server \
-    -Dcc.otavia.actor.worker.size=28 -Dcc.otavia.nio.worker.size=56 \
-    -Dcc.otavia.system.gc.aggressive=false \
-    -jar \
-    out/benchmark/assembly.dest/out.jar \
-    jdbc:postgresql://tfb-database:5432/hello_world \
-    benchmarkdbuser benchmarkdbpass 56

+ 2 - 2
frameworks/Scala/otavia/otavia-equalization.dockerfile → frameworks/Scala/otavia/otavia-overshoot.dockerfile

@@ -8,8 +8,8 @@ RUN mill benchmark.assembly
 EXPOSE 8080
 EXPOSE 8080
 
 
 CMD java -server \
 CMD java -server \
-    -Dcc.otavia.actor.worker.size=56 -Dcc.otavia.nio.worker.size=56 \
+    -Dcc.otavia.actor.worker.size=64 \
     -jar \
     -jar \
     out/benchmark/assembly.dest/out.jar \
     out/benchmark/assembly.dest/out.jar \
     jdbc:postgresql://tfb-database:5432/hello_world \
     jdbc:postgresql://tfb-database:5432/hello_world \
-    benchmarkdbuser benchmarkdbpass 56
+    benchmarkdbuser benchmarkdbpass 64

+ 1 - 1
frameworks/Scala/otavia/otavia.dockerfile

@@ -8,7 +8,7 @@ RUN mill benchmark.assembly
 EXPOSE 8080
 EXPOSE 8080
 
 
 CMD java -server \
 CMD java -server \
-    -Dcc.otavia.actor.worker.size=28 -Dcc.otavia.nio.worker.size=56 \
+    -Dcc.otavia.actor.worker.size=56 \
     -jar \
     -jar \
     out/benchmark/assembly.dest/out.jar \
     out/benchmark/assembly.dest/out.jar \
     jdbc:postgresql://tfb-database:5432/hello_world \
     jdbc:postgresql://tfb-database:5432/hello_world \