Merge pull request #2334 from daviddenton/master

R13 fixes: upped version of fintrospect and tweaked JVM params

frameworks/Scala/fintrospect/build.sbt

@@ -1,6 +1,6 @@
 name := """techempower-benchmarks-fintrospect"""
 
-version := "0.0.6"
+version := "0.0.7"
 
 scalaVersion := "2.11.8"
 
@@ -15,10 +15,10 @@ com.github.retronym.SbtOneJar.oneJarSettings
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "io.fintrospect" %% "fintrospect-core" % "13.7.0",
-  "io.fintrospect" %% "fintrospect-circe" % "13.7.0",
-  "io.fintrospect" %% "fintrospect-mustache" % "13.7.0",
-  "com.twitter" %% "finagle-mysql" % "6.37.0"
+  "io.fintrospect" %% "fintrospect-core" % "13.10.1",
+  "io.fintrospect" %% "fintrospect-circe" % "13.10.1",
+  "io.fintrospect" %% "fintrospect-mustache" % "13.10.1",
+  "com.twitter" %% "finagle-mysql" % "6.38.0"
   )
 
 resolvers += Resolver.sonatypeRepo("snapshots")

frameworks/Scala/fintrospect/setup.sh

@@ -4,4 +4,4 @@ fw_depends java sbt
 
 sbt 'oneJar' -batch
 
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+AlwaysPreTouch -jar target/scala-2.11/*fintrospect*one-jar.jar &
+java -jar target/scala-2.11/*fintrospect*one-jar.jar &

frameworks/Scala/fintrospect/source_code

@@ -1,5 +1,4 @@
 fintrospect/src/main/scala/
-fintrospect/src/main/scala/Fortunes.scala
 fintrospect/src/main/scala/JsonHelloWorld.scala
 fintrospect/src/main/scala/PlainTextHelloWorld.scala
 fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

frameworks/Scala/fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

@@ -21,9 +21,8 @@ object FintrospectBenchmarkServer extends App {
   }
 
   val module = ModuleSpec(Root, SimpleJson(), addServerAndDate)
-    .withRoute(JsonHelloWorld.route)
     .withRoute(PlainTextHelloWorld.route)
-    .withRoute(Fortunes.route)
+    .withRoute(JsonHelloWorld.route)
 
   Await.ready(
     Http.server

frameworks/Scala/fintrospect/src/main/scala/Fortunes.scala

@@ -30,12 +30,12 @@ object Fortunes {
   private val dbClient = Mysql.client
     .withCredentials("benchmarkdbuser", "benchmarkdbpass")
     .withDatabase("hello_world")
-    .configured(Param(low = 0, high = 10, idleTime = fromSeconds(5 * 60), bufferSize = 0, maxWaiters = Int.MaxValue))
+    .configured(Param(low = 0, high = 256, idleTime = fromSeconds(5 * 60), bufferSize = 0, maxWaiters = Int.MaxValue))
     .withStatsReceiver(NullStatsReceiver)
     .withMonitor(NullMonitor)
     .withTracer(NullTracer)
     .withMaxConcurrentPrepareStatements(256)
-    .newRichClient("localhost:3306")
+    .newRichClient(s"${System.getenv("DB_HOST")}:3306")
 
   private val statement = dbClient.prepare("SELECT * FROM Fortune")
 

frameworks/Scala/fintrospect/src/main/scala/JsonHelloWorld.scala

@@ -3,8 +3,8 @@ import com.twitter.finagle.http.Method.Get
 import com.twitter.finagle.http.Request
 import com.twitter.finagle.http.Status.Ok
 import io.fintrospect.RouteSpec
-import io.fintrospect.formats.json.Circe.JsonFormat.{obj, string}
-import io.fintrospect.formats.json.Circe.ResponseBuilder.implicits._
+import io.fintrospect.formats.Circe.JsonFormat.{obj, string}
+import io.fintrospect.formats.Circe.ResponseBuilder.implicits._
 
 object JsonHelloWorld {