rewrote benchmarks

Author: Joshua Wise

benchmark/concurrency-trial.js

@@ -1,26 +1,30 @@
 'use strict';
+var OurDatabase = require('../.');
 
 module.exports = function (db, count, SQL, values, callback) {
-	if (db.pragma) {
-		var run = function (values, cb) {
-			cb(null, db.prepare(SQL).run(values));
-		};
-	} else {
-		var run = function (values, cb) {
-			db.run(SQL, values, cb);
-		};
+	if (db instanceof OurDatabase) {
+		db.transaction(new Array(count).fill(SQL)).run(values);
+		callback();
+		return;
 	}
 
-	var ranCount = 0;
-	for (var i=0; i<count; ++i) {
-		run(values, ran);
+	// node-sqlite3 requires the "@" character for named parameters.
+	var obj = {};
+	for (var key in values) {
+		obj['@' + key] = values[key];
 	}
-	function ran(err) {
-		if (err) {
-			console.log('Error: Failed to fill table.');
+	
+	var checkForError = function (err) {
+		if (err) {throw err;}
+	};
+	db.serialize(function () {
+		db.run('BEGIN TRANSACTION;', checkForError);
+		for (var i=0; i<count; ++i) {
+			db.run(SQL, obj, checkForError);
 		}
-		if (++ranCount === count) {
+		db.run('COMMIT TRANSACTION;', function (err) {
+			checkForError(err);
 			callback();
-		}
-	}
+		});
+	});
 };

benchmark/fill-table.js

@@ -23,37 +23,47 @@ console.log('Generating tables...');
 
 var createdCount = 0;
 function created() {
-	if (++createdCount === 2) {
+	if (++createdCount === 8) {
 		console.log(clc.magenta('--- Benchmarks ---'));
 		next();
 	}
 }
 
-require('./create-table')('CREATE TABLE entries (aaaa TEXT, bbbb INTEGER, cccc FLOAT, dddd TEXT, eeee INTEGER, ffff BLOB)', 'select-db', function (ourDb, theirDb) {
-	var values = [
-		'John Smith',
-		524,
-		0.324176234,
-		'New York City',
-		20,
-		Buffer.alloc(1024 * 1024).fill(0xdd)
-	];
+require('./create-table')('CREATE TABLE entries (text TEXT, integer INTEGER, real REAL, blob BLOB, nul)', 'select-small', fillSmallDataTable);
+require('./create-table')('CREATE TABLE entries (text TEXT, blob BLOB)', 'select-large', function (ourDb, theirDb) {
+	var bigString = '';
+	while (bigString.length < 1024 * 1024) {
+		bigString += 'John Peter Smith';
+	}
+	var values = {
+		a: bigString,
+		b: Buffer.alloc(1024 * 1024).fill(0xdd)
+	};
 	var filledCount = 0;
 	function filled() {++filledCount === 2 && created();}
-	require('./fill-table')(ourDb, 1000, 'INSERT INTO entries VALUES (?, ?, ?, ?, ?, ?)', values, filled);
-	require('./fill-table')(theirDb, 1000, 'INSERT INTO entries VALUES (?, ?, ?, ?, ?, ?)', values, filled);
+	require('./fill-table')(ourDb, 1000, 'INSERT INTO entries VALUES (@a, @b)', values, filled);
+	require('./fill-table')(theirDb, 1000, 'INSERT INTO entries VALUES (@a, @b)', values, filled);
 });
-require('./create-table')('CREATE TABLE entries (name TEXT, number INTEGER, data BLOB)', 'insert-db', function (ourDb, theirDb) {
-	var values = [
-		'John Smith',
-		524,
-		null
-	];
+require('./create-table')('CREATE TABLE entries (data TEXT)', 'insert-text', created);
+require('./create-table')('CREATE TABLE entries (data INTEGER)', 'insert-integer', created);
+require('./create-table')('CREATE TABLE entries (data REAL)', 'insert-real', created);
+require('./create-table')('CREATE TABLE entries (data BLOB)', 'insert-blob', created);
+require('./create-table')('CREATE TABLE entries (data)', 'insert-null', created);
+require('./create-table')('CREATE TABLE entries (text TEXT, integer INTEGER, real REAL, blob BLOB, nul)', 'real-world', fillSmallDataTable);
+
+function fillSmallDataTable(ourDb, theirDb) {
+	var values = {
+		a: 'John Peter Smith',
+		b: 12345,
+		c: 0.12345,
+		d: Buffer.alloc(16).fill(0xdd),
+		e: null
+	};
 	var filledCount = 0;
 	function filled() {++filledCount === 2 && created();}
-	require('./fill-table')(ourDb, 1000, 'INSERT INTO entries VALUES (?, ?, ?)', values, filled);
-	require('./fill-table')(theirDb, 1000, 'INSERT INTO entries VALUES (?, ?, ?)', values, filled);
-});
+	require('./fill-table')(ourDb, 1000, 'INSERT INTO entries VALUES (@a, @b, @c, @d, @e)', values, filled);
+	require('./fill-table')(theirDb, 1000, 'INSERT INTO entries VALUES (@a, @b, @c, @d, @e)', values, filled);
+}
 
 function next() {
 	if (!trials.length) {
@@ -66,5 +76,10 @@ function next() {
 
 	console.log(clc.cyan(trialName));
 	var child = spawn('node', ['--expose-gc', path.join(__dirname, 'trials', trialName)], {stdio: 'inherit'});
-	child.on('exit', function () {setTimeout(next, 100);});
+	child.on('exit', function (code) {
+		if (code !== 0) {
+			console.log(clc.red('ERROR (code ' + code + '), probably out of memory'));
+		}
+		setTimeout(next, 100);
+	});
 }

benchmark/get-db2.js

@@ -1,8 +1,8 @@
 'use strict';
-require('../get-db')('select-db', function (ourDb, theirDb) {
+require('../get-db')('real-world', function (ourDb, theirDb) {
 	ourDb.pragma('journal_mode = DELETE');
 	ourDb.pragma('synchronous = 2');
 	theirDb.exec('PRAGMA journal_mode = DELETE; PRAGMA synchronous = 2;', function () {
-		require('../select-each-trial')(ourDb, theirDb, 1, false);
+		require('../types/real-world')(ourDb, theirDb, 1000, 10);
 	});
 });

benchmark/index.js

@@ -1,8 +1,8 @@
 'use strict';
-require('../get-db')('insert-db', function (ourDb, theirDb) {
+require('../get-db')('real-world', function (ourDb, theirDb) {
 	ourDb.pragma('journal_mode = WAL');
 	ourDb.pragma('synchronous = 1');
 	theirDb.exec('PRAGMA journal_mode = WAL; PRAGMA synchronous = 1;', function () {
-		require('../dual-trial')(ourDb, theirDb, 10000, 10);
+		require('../types/real-world')(ourDb, theirDb, 10000, 10);
 	});
 });

benchmark/select-all-trial.js

@@ -0,0 +1,4 @@
+'use strict';
+require('../get-db')('select-small', function (ourDb, theirDb) {
+	require('../types/select')(ourDb, theirDb, 10000, 'integer');
+});

benchmark/trials/select-each.sync.large.js renamed to benchmark/trials/10.real-world.sync.js

@@ -0,0 +1,4 @@
+'use strict';
+require('../get-db')('select-small', function (ourDb, theirDb) {
+	require('../types/select')(ourDb, theirDb, 10000, 'real');
+});

benchmark/trials/dual.wal.js renamed to benchmark/trials/11.real-world.wal.js

@@ -0,0 +1,4 @@
+'use strict';
+require('../get-db')('select-small', function (ourDb, theirDb) {
+	require('../types/select')(ourDb, theirDb, 10000, 'nul');
+});