Browse Source

Changed mysql connector and orm to libmysqlclient and Mapper

Patrick Falls 12 years ago
parent
commit
1427c747a2
4 changed files with 14 additions and 27 deletions
  1. 8 21
      express/app.js
  2. 2 2
      express/benchmark_config
  3. 2 2
      express/package.json
  4. 2 2
      nodejs/benchmark_config

+ 8 - 21
express/app.js

@@ -9,24 +9,8 @@ var cluster = require('cluster')
   , mongoose = require('mongoose')
   , async = require('async')
   , conn = mongoose.connect('mongodb://localhost/hello_world')
-  , Sequelize = require("sequelize")
-  , sequelize = new Sequelize('hello_world', 'benchmarkdbuser', 'benchmarkdbpass', {
-    host: 'localhost',
-    logging: false,
-    define: { timestamps: false },
-    maxConcurrentQueries: 100,
-    pool: { maxConnections: 800, maxIdleTime: 30 }
-  })
-  , World      = sequelize.define('World', {
-    randomNumber: Sequelize.INTEGER
-  }, {
-    freezeTableName: true
-  })
-  , Fortune      = sequelize.define('Fortune', {
-    message: Sequelize.STRING
-  }, {
-    freezeTableName: true
-  });
+  , Mapper = require('mapper')
+  , connMap = { user: 'benchmarkdbuser', password: 'benchmarkdbpass', database: 'hello_world' };
 
 var Schema = mongoose.Schema
   , ObjectId = Schema.ObjectId;
@@ -37,6 +21,9 @@ var WorldSchema = new Schema({
 }, { collection : 'world' });
 var MWorld = conn.model('World', WorldSchema);
 
+Mapper.connect(connMap, {verbose: false, strict: false});
+var World = Mapper.map("World", "id", "randomNumber");
+var Fortune = Mapper.map("Fortune", "id", "message");
 
 if (cluster.isMaster) {
   // Fork workers.
@@ -93,14 +80,14 @@ if (cluster.isMaster) {
     });
   });
 
-  app.get('/sequelize', function(req, res) {
+  app.get('/mysql-orm', function(req, res) {
     var queries = req.query.queries || 1
       , worlds  = []
       , queryFunctions = [];
 
     for (var i = 1; i <= queries; i++ ) {
       queryFunctions.push(function(callback) {
-        World.find(Math.floor(Math.random()*10000) + 1).success(function (world) {
+        World.findById(Math.floor(Math.random()*10000) + 1, function (err, world) {
           worlds.push(world);
           callback(null, 'success');
         });
@@ -113,7 +100,7 @@ if (cluster.isMaster) {
   });
 
   app.get('/fortune', function(req, res) {
-    Fortune.findAll().success(function (fortunes) {
+    Fortune.all(function (err, fortunes) {
       var newFortune = Fortune.build({message: "Additional fortune added at request time."});
       fortunes.push(newFortune);
       fortunes.sort(sortFortunes);

+ 2 - 2
express/benchmark_config

@@ -16,8 +16,8 @@
     },
     "mysql": {
       "setup_file": "setup",
-      "db_url": "/sequelize",
-      "query_url": "/sequelize?queries=",
+      "db_url": "/mysql-orm",
+      "query_url": "/mysql-orm?queries=",
       "fortune_url": "/fortune",
       "port": 8080,
       "sort": 6

+ 2 - 2
express/package.json

@@ -6,8 +6,8 @@
       "express": "3.1.0"
     , "mongoose": "3.5.5" 
     , "async": "0.2.5"
-    , "sequelize": "1.6.0-beta4"
-    , "mysql": "2.0.0-alpha7"
+    , "mysql-libmysqlclient": "1.5.2"
+    , "mapper": "0.2.4-pre"
     , "jade": "0.29.0"
   }
 }

+ 2 - 2
nodejs/benchmark_config

@@ -23,8 +23,8 @@
     },
     "mysql": {
       "setup_file": "setup",
-      "db_url": "/sequelize",
-      "query_url": "/sequelize?queries=",
+      "db_url": "/mysql-orm",
+      "query_url": "/mysql-orm?queries=",
       "port": 8080,
       "sort": 10
     },