Used prepared statement rather than batch/offset for zxystream.

This commit is contained in:
Young Hahn
2015-01-16 12:54:59 -05:00
parent 18a9d50e2f
commit ea292f20c9
2 changed files with 21 additions and 58 deletions

View File

@@ -10,14 +10,12 @@ tape('zxystream setup', function(assert) {
});
});
tape('zxystream default batch', function(assert) {
tape('zxystream default', function(assert) {
var stream = source.createZXYStream();
var output = '';
var called = 0;
assert.deepEqual(stream.source, source, 'sets stream.source');
assert.deepEqual(stream.batch, 1000, 'sets stream.batch = 1000');
assert.deepEqual(stream.offset, 0, 'sets stream.offset = 0');
stream.on('data', function(lines) {
assert.equal(stream.table, 'map');
@@ -27,7 +25,7 @@ tape('zxystream default batch', function(assert) {
stream.on('end', function() {
var queue = output.toString().split('\n');
assert.equal(queue.length, 270);
assert.equal(called, 1, 'emitted data x1 times');
assert.equal(called, 269, 'emitted data' + called + ' times');
checkTile(queue);
function checkTile(queue) {
if (!queue.length) return assert.end();
@@ -43,38 +41,6 @@ tape('zxystream default batch', function(assert) {
});
tape('zxystream batch = 10', function(assert) {
var stream = source.createZXYStream({batch:10});
var output = '';
var called = 0;
assert.deepEqual(stream.source, source, 'sets stream.source');
assert.deepEqual(stream.batch, 10, 'sets stream.batch = 10');
assert.deepEqual(stream.offset, 0, 'sets stream.offset = 0');
stream.on('data', function(lines) {
assert.equal(stream.table, 'map');
output += lines;
called++;
});
stream.on('end', function() {
var queue = output.toString().split('\n');
assert.equal(queue.length, 270);
assert.equal(called, 27, 'emitted data x27 times');
checkTile(queue);
function checkTile(queue) {
if (!queue.length) return assert.end();
var zxy = queue.shift();
if (!zxy) return checkTile(queue);
zxy = zxy.split('/');
source.getTile(zxy[0], zxy[1], zxy[2], function(err, buffer, headers) {
assert.equal(!err && (buffer instanceof Buffer), true, zxy.join('/') + ' exists');
checkTile(queue);
});
}
});
});
tape('zxystream unindexed', function(assert) {
new MBTiles(__dirname + '/fixtures/unindexed.mbtiles', function(err, s) {
assert.ifError(err);
@@ -89,8 +55,6 @@ tape('zxystream unindexed zxystream', function(assert) {
var called = 0;
assert.deepEqual(stream.source, source, 'sets stream.source');
assert.deepEqual(stream.batch, 1000, 'sets stream.batch = 1000');
assert.deepEqual(stream.offset, 0, 'sets stream.offset = 0');
stream.on('data', function(lines) {
assert.equal(stream.table, 'tiles');
@@ -100,7 +64,7 @@ tape('zxystream unindexed zxystream', function(assert) {
stream.on('end', function() {
var queue = output.toString().split('\n');
assert.equal(queue.length, 286);
assert.equal(called, 1, 'emitted data x27 times');
assert.equal(called, 285, 'emitted data x285 times');
checkTile(queue);
function checkTile(queue) {
if (!queue.length) return assert.end();