Browse Source

Fix tests for MongoDB store

jamming 10 years ago
parent
commit
d1c461930f

+ 11 - 11
frameworks/Java/sabina/benchmark_config.json

@@ -1,7 +1,7 @@
 {
 {
   "framework": "sabina",
   "framework": "sabina",
   "tests": [{
   "tests": [{
-    "undertow-mysql": {
+    "default": {
       "json_url": "/json",
       "json_url": "/json",
       "db_url": "/db",
       "db_url": "/db",
       "query_url": "/query?queries=",
       "query_url": "/query?queries=",
@@ -10,10 +10,10 @@
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
 
 
       "port": 5050,
       "port": 5050,
-      "setup_file": "undertow",
+      "setup_file": "undertow-mongodb",
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
-      "database": "MySQL",
+      "database": "MongoDB",
       "framework": "Sabina",
       "framework": "Sabina",
       "language": "Java",
       "language": "Java",
       "orm": "Raw",
       "orm": "Raw",
@@ -21,12 +21,12 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Sabina Undertow MySQL",
+      "display_name": "Sabina Undertow MongoDB",
       "notes": "",
       "notes": "",
       "versus": "servlet"
       "versus": "servlet"
     }
     }
   }, {
   }, {
-    "jetty-mysql": {
+    "undertow-mysql": {
       "json_url": "/json",
       "json_url": "/json",
       "db_url": "/db",
       "db_url": "/db",
       "query_url": "/query?queries=",
       "query_url": "/query?queries=",
@@ -35,7 +35,7 @@
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
 
 
       "port": 5050,
       "port": 5050,
-      "setup_file": "jetty",
+      "setup_file": "undertow",
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
       "database": "MySQL",
       "database": "MySQL",
@@ -46,12 +46,12 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Sabina Jetty MySQL",
+      "display_name": "Sabina Undertow MySQL",
       "notes": "",
       "notes": "",
       "versus": "servlet"
       "versus": "servlet"
     }
     }
   }, {
   }, {
-    "undertow-mongodb": {
+    "jetty-mysql": {
       "json_url": "/json",
       "json_url": "/json",
       "db_url": "/db",
       "db_url": "/db",
       "query_url": "/query?queries=",
       "query_url": "/query?queries=",
@@ -60,10 +60,10 @@
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
 
 
       "port": 5050,
       "port": 5050,
-      "setup_file": "undertow-mongodb",
+      "setup_file": "jetty",
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
-      "database": "MongoDB",
+      "database": "MySQL",
       "framework": "Sabina",
       "framework": "Sabina",
       "language": "Java",
       "language": "Java",
       "orm": "Raw",
       "orm": "Raw",
@@ -71,7 +71,7 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Sabina Undertow MongoDB",
+      "display_name": "Sabina Jetty MySQL",
       "notes": "",
       "notes": "",
       "versus": "servlet"
       "versus": "servlet"
     }
     }

+ 0 - 1
frameworks/Java/sabina/pom.xml

@@ -93,7 +93,6 @@
             <version>5.1.28</version>
             <version>5.1.28</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
-            <!-- compile 'org.mongodb:mongo-java-driver:3.0.0' -->
             <groupId>org.mongodb</groupId>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
             <artifactId>mongo-java-driver</artifactId>
             <version>3.0.0</version>
             <version>3.0.0</version>

+ 3 - 2
frameworks/Java/sabina/src/main/java/sabina/benchmark/MongoDbRepository.java

@@ -27,10 +27,9 @@ import com.mongodb.client.MongoDatabase;
 import org.bson.Document;
 import org.bson.Document;
 
 
 final class MongoDbRepository implements Repository {
 final class MongoDbRepository implements Repository {
-//    private static final boolean BULK = true; // TODO
     private static final String [] FORTUNES = {
     private static final String [] FORTUNES = {
         "fortune: No such file or directory",
         "fortune: No such file or directory",
-        "A computer scientist is someone who fixes things that aren''t broken.",
+        "A computer scientist is someone who fixes things that aren't broken.",
         "After enough decimal places, nobody gives a damn.",
         "After enough decimal places, nobody gives a damn.",
         "A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1",
         "A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1",
         "A computer program does what you tell it to do, not what you want it to do.",
         "A computer program does what you tell it to do, not what you want it to do.",
@@ -62,6 +61,7 @@ final class MongoDbRepository implements Repository {
     }
     }
 
 
     private void loadData () {
     private void loadData () {
+        fortuneCollection.drop ();
         if (fortuneCollection.count () == 0) {
         if (fortuneCollection.count () == 0) {
             int id = 0;
             int id = 0;
             for (String fortune : FORTUNES) {
             for (String fortune : FORTUNES) {
@@ -71,6 +71,7 @@ final class MongoDbRepository implements Repository {
             }
             }
         }
         }
 
 
+        worldCollection.drop ();
         if (worldCollection.count () == 0) {
         if (worldCollection.count () == 0) {
             final Random random = ThreadLocalRandom.current ();
             final Random random = ThreadLocalRandom.current ();
             for (int ii = 1; ii <= DB_ROWS; ii++) {
             for (int ii = 1; ii <= DB_ROWS; ii++) {