ashatora/node-mbtiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error handling for geocoderDataIterator

Browse Source
This commit is contained in:
Andrew Pendleton
2016-04-14 13:32:38 -04:00
parent d3845ea9f9
commit 4474634452
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mbtiles.js
View File

@@ -633,18 +633,24 @@ MBTiles.prototype.geocoderDataIterator = function(type) {
while (nextQueue.length && dataQueue.length) { while (nextQueue.length && dataQueue.length) {
var nextCb = nextQueue.shift(), data, cbValue; var nextCb = nextQueue.shift(), data, cbValue;
if (dataQueue[0] == doneSentinel) { if (dataQueue[0] == doneSentinel) {
cbValue = {value: undefined, done: true}; cbValue = {
err: null,
row: {value: undefined, done: true}
}
} else { } else {
data = dataQueue.shift(); data = dataQueue.shift();
maybeRefillBuffer(); maybeRefillBuffer();
cbValue = {value: {shard: data.shard, data: zlib.inflateSync(data.data)}, done: false}; cbValue = {
err: data.err,
row: {value: {shard: data.row.shard, data: zlib.inflateSync(data.row.data)}, done: false}
};
} }
// bind the callback and data now so that they don't change before the setImmediate // bind the callback and data now so that they don't change before the setImmediate
// callback is executed // callback is executed
(function(nextCb, cbValue) { (function(nextCb, cbValue) {
setImmediate(function() { setImmediate(function() {
nextCb(cbValue); nextCb(cbValue.err, cbValue.row);
}); });
})(nextCb, cbValue); })(nextCb, cbValue);
} }
@@ -657,7 +663,7 @@ MBTiles.prototype.geocoderDataIterator = function(type) {
refilling = true; refilling = true;
var segmentCount = 0; var segmentCount = 0;
_this._db.each('SELECT shard, data FROM geocoder_data WHERE type = ? ORDER BY shard limit ?,?', type, position, chunkSize, function(err, row) { _this._db.each('SELECT shard, data FROM geocoder_data WHERE type = ? ORDER BY shard limit ?,?', type, position, chunkSize, function(err, row) {
dataQueue.push(row); dataQueue.push({row: row, err: err});
segmentCount += 1; segmentCount += 1;
sendIfAvailable(); sendIfAvailable();
}, function() { }, function() {

3
test/geocoder.test.js
View File

@@ -80,7 +80,8 @@ tape('putGeocoderData', function(assert) {
tape('geocoderDataIterator', function(assert) { tape('geocoderDataIterator', function(assert) {
var it = to.geocoderDataIterator("term"); var it = to.geocoderDataIterator("term");
var data = []; var data = [];
var n = function(item) { var n = function(err, item) {
assert.ifError(err);
if (item.done) { if (item.done) {
assert.equal(data.length, 2, "iterator produces two shards"); assert.equal(data.length, 2, "iterator produces two shards");