Browse Source

Bump Finagle benchmarks (#3431)

Vladimir Kostyukov 7 years ago
parent
commit
999e015628

+ 2 - 2
frameworks/Scala/finagle/build.sbt

@@ -2,11 +2,11 @@ name := "finagle"
 
 
 scalaVersion := "2.11.12"
 scalaVersion := "2.11.12"
 
 
-version := "17.11.0"
+version := "18.3.0"
 
 
 com.github.retronym.SbtOneJar.oneJarSettings
 com.github.retronym.SbtOneJar.oneJarSettings
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finagle-http" % "17.11.0",
+  "com.twitter" %% "finagle-http" % "18.3.0",
   "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.4"
   "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.4"
 )
 )

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

@@ -4,4 +4,4 @@ COPY ./ ./
 
 
 RUN sbt 'oneJar' -batch
 RUN sbt 'oneJar' -batch
 
 
-CMD java -jar target/scala-2.11/*finagle*one-jar.jar
+CMD java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -Dio.netty.recycler.maxCapacityPerThread=0 -Dio.netty.leakDetection.level=disabled -jar target/scala-2.11/*finagle*one-jar.jar

+ 0 - 1
frameworks/Scala/finagle/src/main/scala/Main.scala

@@ -43,7 +43,6 @@ object Main extends App {
   }
   }
 
 
   Await.ready(Http.server
   Await.ready(Http.server
-    .configured(Http.Netty3Impl)
     .withCompressionLevel(0)
     .withCompressionLevel(0)
     .withStack(nilStack)
     .withStack(nilStack)
     .serve(":8080", serverAndDate.andThen(muxer))
     .serve(":8080", serverAndDate.andThen(muxer))

+ 2 - 2
frameworks/Scala/finatra/build.sbt

@@ -1,6 +1,6 @@
 name := "techempower-benchmarks-finatra"
 name := "techempower-benchmarks-finatra"
 organization := "com.twitter"
 organization := "com.twitter"
-version := "2.11.0"
+version := "18.3.0"
 
 
 scalaVersion := "2.12.4"
 scalaVersion := "2.12.4"
 
 
@@ -16,7 +16,7 @@ assemblyMergeStrategy in assembly := {
 }
 }
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finatra-http" % "17.12.0",
+  "com.twitter" %% "finatra-http" % "18.3.0",
   "org.slf4j" % "slf4j-nop" % "1.7.25",
   "org.slf4j" % "slf4j-nop" % "1.7.25",
   "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.4",
   "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.4",
   "javax.activation" % "activation" % "1.1.1"
   "javax.activation" % "activation" % "1.1.1"

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

@@ -4,4 +4,4 @@ COPY ./ ./
 
 
 RUN sbt clean assembly -batch
 RUN sbt clean assembly -batch
 
 
-CMD java -Dcom.twitt.finagle.netty4.numWorkers=1 -Dcom.twitter.util.events.sinkEnabled=false -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar target/scala-2.12/finatra-benchmark.jar -log.level=ERROR -http.response.charset.enabled=false
+CMD java -Dio.netty.recycler.maxCapacityPerThread=0 -Dio.netty.leakDetection.level=disabled -Dcom.twitter.util.events.sinkEnabled=false -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar target/scala-2.12/finatra-benchmark.jar -log.level=ERROR -http.response.charset.enabled=false

+ 1 - 2
frameworks/Scala/finatra/src/main/scala/Main.scala

@@ -1,4 +1,4 @@
-import com.twitter.finagle.Http.{Netty3Impl, Server}
+import com.twitter.finagle.Http.Server
 import com.twitter.finagle.http.Request
 import com.twitter.finagle.http.Request
 import com.twitter.finagle.stack.nilStack
 import com.twitter.finagle.stack.nilStack
 import com.twitter.finagle.stats.NullStatsReceiver
 import com.twitter.finagle.stats.NullStatsReceiver
@@ -11,7 +11,6 @@ object FinatraBenchmarkServerMain extends FinatraBenchmarkServer
 class FinatraBenchmarkServer extends HttpServer {
 class FinatraBenchmarkServer extends HttpServer {
   override def configureHttpServer(server: Server): Server = {
   override def configureHttpServer(server: Server): Server = {
     server
     server
-      .configured(Netty3Impl)
       .withCompressionLevel(0)
       .withCompressionLevel(0)
       .withStatsReceiver(NullStatsReceiver)
       .withStatsReceiver(NullStatsReceiver)
       .withStack(nilStack)
       .withStack(nilStack)

+ 3 - 3
frameworks/Scala/finch/build.sbt

@@ -1,12 +1,12 @@
 name := """techempower-benchmarks-finch"""
 name := """techempower-benchmarks-finch"""
 
 
-version := "0.16.0-M5"
+version := "0.18.0"
 
 
 scalaVersion := "2.11.12"
 scalaVersion := "2.11.12"
 
 
 com.github.retronym.SbtOneJar.oneJarSettings
 com.github.retronym.SbtOneJar.oneJarSettings
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
-  "com.github.finagle" %% "finch-core" % "0.16.0-M5",
-  "com.github.finagle" %% "finch-circe" % "0.16.0-M5"
+  "com.github.finagle" %% "finch-core" % "0.18.0",
+  "com.github.finagle" %% "finch-circe" % "0.18.0"
 )
 )

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

@@ -4,4 +4,4 @@ COPY ./ ./
 
 
 RUN sbt 'oneJar' -batch
 RUN sbt 'oneJar' -batch
 
 
-CMD java -jar target/scala-2.11/*finch*one-jar.jar
+CMD java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -Dio.netty.recycler.maxCapacityPerThread=0 -Dio.netty.leakDetection.level=disabled -jar target/scala-2.11/*finch*one-jar.jar

+ 6 - 5
frameworks/Scala/finch/src/main/scala/Main.scala

@@ -7,6 +7,7 @@ import com.twitter.util.Await
 
 
 import io.circe.Json
 import io.circe.Json
 import io.finch._
 import io.finch._
+import io.finch.syntax._
 import io.finch.circe._
 import io.finch.circe._
 
 
 object Main extends App {
 object Main extends App {
@@ -27,10 +28,10 @@ object Main extends App {
       .serve[Text.Plain](plaintext)
       .serve[Text.Plain](plaintext)
       .toService
       .toService
 
 
-  Await.ready(Http.server
-    .configured(Http.Netty3Impl)
-    .withCompressionLevel(0)
-    .withStack(nilStack)
-    .serve(":9000", service)
+  Await.ready(
+    Http.server
+      .withCompressionLevel(0)
+      .withStack(nilStack)
+      .serve(":9000", service)
   )
   )
 }
 }