Browse Source

fix URL names in benchmark config for queries tests, and renamed QueriesRoutes -> DatabaseRoutes

David Denton 8 years ago
parent
commit
8f6e2c8d6d

+ 3 - 2
frameworks/Scala/fintrospect/benchmark_config.json

@@ -6,11 +6,12 @@
         "orm": "Raw",
         "orm": "Raw",
         "database_os": "Linux",
         "database_os": "Linux",
         "setup_file": "setup",
         "setup_file": "setup",
-        "fortune_url": "/fortunes",
         "db_url": "/db",
         "db_url": "/db",
+        "fortune_url": "/fortunes",
         "json_url": "/json",
         "json_url": "/json",
-        "queries_url": "/queries?queries=",
+        "query_url": "/queries?queries=",
         "plaintext_url": "/plaintext",
         "plaintext_url": "/plaintext",
+        "update_url": "/updates?queries=",
         "port": 9000,
         "port": 9000,
         "approach": "Realistic",
         "approach": "Realistic",
         "classification": "Micro",
         "classification": "Micro",

+ 1 - 1
frameworks/Scala/fintrospect/source_code

@@ -3,5 +3,5 @@ fintrospect/src/main/scala/Database.scala
 fintrospect/src/main/scala/FortunesRoute.scala
 fintrospect/src/main/scala/FortunesRoute.scala
 fintrospect/src/main/scala/JsonRoute.scala
 fintrospect/src/main/scala/JsonRoute.scala
 fintrospect/src/main/scala/PlainTextRoute.scala
 fintrospect/src/main/scala/PlainTextRoute.scala
-fintrospect/src/main/scala/QueriesRoute.scala
+fintrospect/src/main/scala/DatabaseRoutes.scala
 fintrospect/src/main/scala/FintrospectBenchmarkServer.scala
 fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

+ 1 - 1
frameworks/Scala/fintrospect/src/main/scala/QueriesRoutes.scala → frameworks/Scala/fintrospect/src/main/scala/DatabaseRoutes.scala

@@ -15,7 +15,7 @@ import org.json4s.JValue
 import scala.language.reflectiveCalls
 import scala.language.reflectiveCalls
 import scala.util.Random
 import scala.util.Random
 
 
-object QueriesRoutes {
+object DatabaseRoutes {
 
 
   private val toJson: PartialFunction[Result, Option[JValue]] = {
   private val toJson: PartialFunction[Result, Option[JValue]] = {
     case rs: ResultSet => rs.rows.headOption
     case rs: ResultSet => rs.rows.headOption

+ 1 - 1
frameworks/Scala/fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

@@ -26,7 +26,7 @@ object FintrospectBenchmarkServer extends App {
     .withRoute(JsonRoute())
     .withRoute(JsonRoute())
     .withRoute(PlainTextRoute())
     .withRoute(PlainTextRoute())
     .withRoute(FortunesRoute(database))
     .withRoute(FortunesRoute(database))
-    .withRoutes(QueriesRoutes(database))
+    .withRoutes(DatabaseRoutes(database))
 
 
   Await.ready(
   Await.ready(
     Http.server
     Http.server