made benchmarks more transparent and realistic

heywooooorld · Apr 12, 2017 · 1e05dfb · 1e05dfb
1 parent 01d58ab
commit 1e05dfb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 40 deletions.
diff --git a/benchmark/index.js b/benchmark/index.js
@@ -31,7 +31,10 @@ var trials;
 }());
 
 function getTrials() {
-	return process.argv.slice(2).reduce(filterByArgs, require('./trials').map(addSearchTerms));
+	var trials = require('./trials');
+	var specifiedGroup = trials.hasOwnProperty(process.argv[2]) ? process.argv[2] : '';
+	var args = process.argv.slice(specifiedGroup ? 3 : 2);
+	return args.reduce(filterByArgs, trials[specifiedGroup || 'default'].map(addSearchTerms));
 
 	function addSearchTerms(trial) {
 		var size = trial.table.toLowerCase().indexOf('large') === -1 ? 'small' : 'large';

diff --git a/benchmark/trials.js b/benchmark/trials.js
@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = [
+exports.default = [
 	{type: 'select', table: 'allSmall', columns: ['integer']},
 	{type: 'select', table: 'allSmall', columns: ['real']},
 	{type: 'select', table: 'allSmall', columns: ['text']},
@@ -42,17 +42,24 @@ module.exports = [
 	{type: 'transaction', table: 'blobSmall', columns: ['blob']},
 	{type: 'transaction', table: 'nulSmall', columns: ['nul']},
 	{type: 'transaction', table: 'textLarge', columns: ['text']},
-	{type: 'transaction', table: 'blobLarge', columns: ['blob']},
-	{type: 'real-world', table: 'allSmall', columns: ['integer', 'real', 'text', 'blob', 'nul'], pragma: ['journal_mode = WAL']},
-	{type: 'real-world', table: 'allSmall', columns: ['integer', 'real', 'text', 'blob', 'nul'], pragma: ['journal_mode = DELETE']}
+	{type: 'transaction', table: 'blobLarge', columns: ['blob']}
 ];
 
-if (/^(1|true|on|yes)$/i.test(process.env.NO_CACHE)) {
-	module.exports.forEach(function (trial) {
-		trial.pragma = ['cache_size = 0'].concat(trial.pragma || []);
-	});
-} else {
-	module.exports.forEach(function (trial) {
-		trial.pragma = ['cache_size = -16000'].concat(trial.pragma || []);
+exports.rows = [
+	{type: 'select', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul']},
+	{type: 'select-all', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul']},
+	{type: 'select-each', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul']},
+	{type: 'insert', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul'], pragma: ['journal_mode = WAL']},
+	{type: 'insert', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul'], pragma: ['journal_mode = DELETE']},
+	{type: 'transaction', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul']},
+	{type: 'real-world', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul'], pragma: ['journal_mode = WAL']},
+	{type: 'real-world', table: 'allSmall', columns: ['integer', 'real', 'text', 'nul'], pragma: ['journal_mode = DELETE']}
+];
+
+(function () {
+	var cacheSize = /^(1|true|on|yes)$/i.test(process.env.NO_CACHE) ? 'cache_size = 0' : 'cache_size = -16000';
+	var trials = [].concat.apply([], Object.keys(exports).map(function (key) {return exports[key];}));
+	trials.forEach(function (trial) {
+		trial.pragma = [cacheSize].concat(trial.pragma || []);
 	});
-}
+}());
diff --git a/benchmark/types/insert.js b/benchmark/types/insert.js
@@ -7,13 +7,10 @@ require('../runner')(function (benchmark, dbs, ctx) {
 	var nodeSqlite3 = dbs['node-sqlite3'];
 	var data = factory(ctx.table, ctx.columns);
 
-	var stmt = betterSqlite3.prepare(SQL);
+	var betterSqlite3Insert = betterSqlite3.prepare(SQL);
 
 	benchmark.add('better-sqlite3', function () {
-		betterSqlite3.prepare(SQL).run(data);
-	});
-	benchmark.add(' + optimized', function () {
-		stmt.run(data);
+		betterSqlite3Insert.run(data);
 	});
 	benchmark.add('node-sqlite3', function (deferred) {
 		nodeSqlite3.run(SQL, data).then(function () {deferred.resolve();});

diff --git a/benchmark/types/select-all.js b/benchmark/types/select-all.js
@@ -7,14 +7,10 @@ require('../runner')(function (benchmark, dbs, ctx) {
 	var rowid = 99;
 	benchmark.on('cycle', function () {rowid = 0;});
 
-	var stmt = betterSqlite3.prepare(SQL).pluck();
+	var betterSqlite3Select = betterSqlite3.prepare(SQL);
 
 	benchmark.add('better-sqlite3', function () {
-		betterSqlite3.prepare(SQL).all(rowid % 1000 - 98);
-		rowid += 100;
-	});
-	benchmark.add(' + optimized', function () {
-		stmt.all(rowid % 1000 - 98);
+		betterSqlite3Select.all(rowid % 1000 - 98);
 		rowid += 100;
 	});
 	benchmark.add('node-sqlite3', function (deferred) {

diff --git a/benchmark/types/select-each.js b/benchmark/types/select-each.js
@@ -7,14 +7,10 @@ require('../runner')(function (benchmark, dbs, ctx) {
 	var rowid = 99;
 	benchmark.on('cycle', function () {rowid = 0;});
 
-	var stmt = betterSqlite3.prepare(SQL).pluck();
+	var betterSqlite3Select = betterSqlite3.prepare(SQL);
 
 	benchmark.add('better-sqlite3', function () {
-		betterSqlite3.prepare(SQL).each(rowid % 1000 - 98, function () {});
-		rowid += 100;
-	});
-	benchmark.add(' + optimized', function () {
-		stmt.each(rowid % 1000 - 98, function () {});
+		betterSqlite3Select.each(rowid % 1000 - 98, function () {});
 		rowid += 100;
 	});
 	benchmark.add('node-sqlite3', function (deferred) {

diff --git a/benchmark/types/select.js b/benchmark/types/select.js
@@ -7,13 +7,10 @@ require('../runner')(function (benchmark, dbs, ctx) {
 	var rowid = 0;
 	benchmark.on('cycle', function () {rowid = 0;});
 
-	var stmt = betterSqlite3.prepare(SQL).pluck();
+	var betterSqlite3Select = betterSqlite3.prepare(SQL);
 
 	benchmark.add('better-sqlite3', function () {
-		betterSqlite3.prepare(SQL).get(rowid++ % 1000 + 1);
-	});
-	benchmark.add(' + optimized', function () {
-		stmt.get(rowid++ % 1000 + 1);
+		betterSqlite3Select.get(rowid++ % 1000 + 1);
 	});
 	benchmark.add('node-sqlite3', function (deferred) {
 		nodeSqlite3.get(SQL, rowid++ % 1000 + 1).then(function () {deferred.resolve();});

diff --git a/benchmark/types/transaction.js b/benchmark/types/transaction.js
@@ -7,13 +7,10 @@ require('../runner')(function (benchmark, dbs, ctx) {
 	var data = namedData(ctx.table, ctx.columns);
 	var dataWithPrefix = namedData(ctx.table, ctx.columns, true);
 
-	var transaction = betterSqlite3.transaction(new Array(100).fill(SQL));
+	var betterSqlite3Transaction = betterSqlite3.transaction(new Array(100).fill(SQL));
 
 	benchmark.add('better-sqlite3', function () {
-		betterSqlite3.transaction(new Array(100).fill(SQL)).run(data);
-	});
-	benchmark.add(' + optimized', function () {
-		transaction.run(data);
+		betterSqlite3Transaction.run(data);
 	});
 	benchmark.add('node-sqlite3', function (deferred) {
 		var count = 0;