Add possibility to run asyns/sync benchmarks and disabling typeCast

bin/node-mysql-benchmarks.js

@@ -8,16 +8,6 @@
 "use strict";
 
 var
-  bindings_list = [
-    'C',
-    'PHP',
-    'db-mysql',
-    'mysql',
-    'mysql-libmysqlclient',
-    'mysql-native',
-    'odbc',
-    'mariasql'
-  ],
   util = require('util'),
   ArgumentParser = require('argparse').ArgumentParser,
   Table = require('cli-table'),
@@ -43,7 +33,7 @@ parser.addArgument(
   {
     action: 'append',
     defaultValue: [],
-    help: 'Benchmark name to skip.'
+    help: 'Module to skip.'
   }
 );
 parser.addArgument(
@@ -71,8 +61,8 @@ if (args.quiet) {
 
 function printResults() {
   var table = new Table({
-    head: ["Module name", "Init", "Escapes", "Reconnects", "Inserts", "Selects"],
-    colWidths: [22, 7, 11, 12, 9, 9],
+    head: ["Name", "Async", "TypeCast", "Init", "Escapes", "Reconnects", "Inserts", "Selects"],
+    colWidths: [30, 7, 10, 7, 11, 12, 9, 9],
     chars: {
       'top': '-',
       'top-mid':'+',
@@ -95,6 +85,10 @@ function printResults() {
     if (results.hasOwnProperty(name)) {
       table.push([
         name,
+
+        cfg.benchmarksO[name].async    ? 'V' : '',
+        cfg.benchmarksO[name].typeCast ? 'V' : '',
+
         results[name].init       || '-',
         results[name].escapes    || '-',
         results[name].reconnects || '-',
@@ -107,7 +101,7 @@ function printResults() {
   // Output results
   util.print("\n\u001B[1mResults:\u001B[22m\n");
   console.log(table.toString());
-  util.print("\u001B[1mInit time in seconds (less is better), other values are operations per second (more is better).\u001B[22m\n");
+  util.print("\u001B[1mInit time in seconds (doesn't matter), other values are operations/rows per second (more is better).\u001B[22m\n");
 }
 
 function inArray(what, where) {
@@ -119,32 +113,34 @@ function inArray(what, where) {
   return false;
 }
 
+var benchmarksA = cfg.benchmarksA;
+
 function runNextBenchmark() {
-  if (bindings_list.length > 0) {
-    var
-      binding_name = bindings_list.shift(),
-      benchmark = require("../src/" + binding_name);
+  if (benchmarksA.length > 0) {
+    var benchmark = benchmarksA.shift();
 
-    if (args.skip.length === 0 || !inArray(binding_name, args.skip)) {
-      printProgress("Benchmarking " + binding_name + "... ");
+    if (args.skip.length === 0 || !inArray(benchmark.module, args.skip)) {
+      printProgress("Benchmarking '" + benchmark.name + "'... ");
 
-      benchmark.run(function (binding_results) {
+      require("../src/" + benchmark.module).run(function (benchmark_results) {
         printProgress("Done.\n");
-        results[binding_name] = binding_results;
+        results[benchmark.name] = benchmark_results;
 
         printProgress("Cooldown...\n");
-        setTimeout(function () {
-          runNextBenchmark();
-        }, cfg.cooldown);
-      }, cfg);
+        if (benchmarksA.length > 0) {
+          setTimeout(function () {
+            runNextBenchmark();
+          }, cfg.cooldown);
+        } else {
+          printResults();
+        }
+      }, cfg, benchmark);
     } else {
-      printProgress("Skipping " + binding_name + ".\n");
-      
+      printProgress("Skipping '" + benchmark.name + "'.\n");
+
       runNextBenchmark();
     }
   } else {
-    printProgress("\u001B[1mAll benchmarks finished.\u001B[22m\n");
-
     printResults();
   }
 }

src/config.js

@@ -12,6 +12,19 @@ GRANT ALL PRIVILEGES ON test.* TO 'test'@'127.0.0.1' IDENTIFIED BY '';
 
 "use strict";
 
+function addBenchmark(cfg, module, async, typeCast, name) {
+  if (!name) {
+    name = module;
+  }
+  cfg.benchmarksO[name] = {
+    name:     name,
+    module:   module,
+    async:    async,
+    typeCast: typeCast
+  };
+  cfg.benchmarksA.push(cfg.benchmarksO[name]);
+}
+
 exports.getConfig = function (factor) {
   var cfg = {
     // Database connection settings
@@ -23,13 +36,13 @@ exports.getConfig = function (factor) {
     test_table: "test_table",
 
     // Benchmarks parameters
-    escape_count: 1000000 * factor,
+    escapes_count: 1000000 * factor,
     string_to_escape: "str\\str\"str\'str\x00str",
     reconnect_count: 1000 * factor,
     insert_rows_count: 10000 * factor,
 
     // Delay before assertion check (ms)
-    delay_before_select: 1000,
+    delay_before_select: 10000 * factor,
     cooldown: 10000 * factor
   };
 
@@ -42,5 +55,19 @@ exports.getConfig = function (factor) {
 
   cfg.select_query = "SELECT * FROM " + cfg.test_table;
 
+  cfg.benchmarksA = [];
+  cfg.benchmarksO = {};
+
+  addBenchmark(cfg, "C",                    false, false);
+  addBenchmark(cfg, "PHP",                  false, false);
+  addBenchmark(cfg, "db-mysql",             false, false);
+  addBenchmark(cfg, "mysql",                true,  true,  "mysql");
+  addBenchmark(cfg, "mysql",                true,  false, "mysql *");
+  addBenchmark(cfg, "mysql-libmysqlclient", true,  true,  "mysql-libmysqlclient");
+  addBenchmark(cfg, "mysql-libmysqlclient", false, true,  "mysql-libmysqlclient *");
+  addBenchmark(cfg, "mysql-native",         false, false);
+  addBenchmark(cfg, "mariasql",             true,  false);
+  addBenchmark(cfg, "odbc",                 false, false);
+
   return cfg;
 };

src/db-mysql.js

@@ -76,13 +76,13 @@ function benchmark() {
 
     start_time = Date.now();
 
-    for (i = 0; i < cfg.escape_count; i += 1) {
+    for (i = 0; i < cfg.escapes_count; i += 1) {
       escaped_string = conn.escape(cfg.string_to_escape);
     }
 
     total_time = (Date.now() - start_time) / 1000;
 
-    results.escapes = Math.round(cfg.escape_count / total_time);
+    results.escapes = Math.round(cfg.escapes_count / total_time);
 
     insertAsyncBenchmark(results, callback, cfg);
   }

src/helper.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-exports.spawnBenchmark = function (file, args, callback, cfg) {
+exports.spawnBenchmark = function (file, args, callback, cfg, benchmark) {
   var child = require('child_process').spawn(file, args),
     exitEvent = (require('semver').gt(process.versions.node, '0.8.0') ? 'close' : 'exit'),
     out = '';
@@ -25,5 +25,8 @@ exports.spawnBenchmark = function (file, args, callback, cfg) {
   child.on(exitEvent, function () {
     callback(JSON.parse(out));
   });
+  if (benchmark) {
+    cfg.benchmark = benchmark;
+  }
   child.stdin.end(JSON.stringify(cfg));
 };

src/mariasql.js

@@ -80,13 +80,13 @@ function benchmark () {
 
     start_time = Date.now();
 
-    for (i = 0; i < cfg.escape_count; i += 1) {
+    for (i = 0; i < cfg.escapes_count; i += 1) {
       escaped_string = conn.escape(cfg.string_to_escape);
     }
 
     total_time = (Date.now() - start_time) / 1000;
 
-    results['escapes'] = Math.round(cfg.escape_count / total_time);
+    results['escapes'] = Math.round(cfg.escapes_count / total_time);
 
     insertAsyncBenchmark(results, callback, cfg);
   }