ソースを参照

Hapi fix (#2424)

* remove redis implementation

* combine default test
Nate 8 年 前
コミット
39abd9aca0

+ 1 - 19
frameworks/JavaScript/hapi/benchmark_config.json

@@ -2,27 +2,9 @@
   "framework": "hapi",
   "tests": [{
     "default": {
-      "setup_file": "setup",
+      "setup_file": "setup-mongodb",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "None",
-      "framework": "hapi",
-      "language": "JavaScript",
-      "flavor": "NodeJS",
-      "orm": "Raw",
-      "platform": "None",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "hapi",
-      "notes": "",
-      "versus": "nodejs"
-    },
-    "mongodb": {
-      "setup_file": "setup-mongodb",
       "db_url": "/mongoose/db",
       "query_url": "/mongoose/queries?queries=",
       "fortune_url": "/mongoose/fortunes",

+ 13 - 8
frameworks/JavaScript/hapi/create-server.js

@@ -1,3 +1,8 @@
+/**
+ * Currently commenting out redis caching as there is no 
+ * working implementation for the benchmark suite.
+ */
+
 var Hapi = require('hapi');
 var Vision = require('vision');
 var server = new Hapi.Server();
@@ -17,19 +22,19 @@ var Promise = require('bluebird');
 var MongooseHandler;
 var SequelizeHandler;
 var SequelizePgHandler;
-var RedisHandler;
+// var RedisHandler;
 
 // Slight start-up improvement loading handlers in parallel
 Promise.join(
   require('./handlers/mongoose'),
   require('./handlers/sequelize'),
   require('./handlers/sequelize-postgres'),
-  require('./handlers/redis'),
-  function (mongo, mysql, pg, redis) {
+  // require('./handlers/redis'),
+  function (mongo, mysql, pg) {
     MongooseHandler = mongo;
     SequelizeHandler = mysql;
     SequelizePgHandler = pg;
-    RedisHandler = redis;
+    // RedisHandler = redis;
   })
   .catch(function (err) {
     console.log('There was a problem setting up the handlers');
@@ -55,10 +60,10 @@ Route('/sequelize-pg/queries', SequelizePgHandler.MultipleQueries);
 Route('/sequelize-pg/fortunes', SequelizePgHandler.Fortunes);
 Route('/sequelize-pg/updates', SequelizePgHandler.Updates);
 
-Route('/hiredis/db', RedisHandler.SingleQuery);
-Route('/hiredis/queries', RedisHandler.MultipleQueries);
-Route('/hiredis/fortunes', RedisHandler.Fortunes);
-Route('/hiredis/updates', RedisHandler.Updates);
+// Route('/hiredis/db', RedisHandler.SingleQuery);
+// Route('/hiredis/queries', RedisHandler.MultipleQueries);
+// Route('/hiredis/fortunes', RedisHandler.Fortunes);
+// Route('/hiredis/updates', RedisHandler.Updates);
 
 
 function JsonSerialization(req, reply) {