hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move work on LevelDB

Browse Source
v1.18.x
psychobunny 11 years ago
parent e79284e75f
commit 129019777f
2 changed files with 169 additions and 121 deletions
Show Stats Download Patch File Download Diff File

150
src/database/level.js
Unescape Escape View File

@ -2,9 +2,9 @@
(function(module) { (function(module) {
/* /*
* Okay, so LevelDB was made by Google. Therefore its skalable. * Okay, so LevelDB was made by Google. Therefore it's skalable.
* BUT, I created 99% of the rest of NodeBB's expected functionality out of just simple get and set commands. * BUT, I created 99% of the rest of NodeBB's expected functionality out of just simple get and set commands.
* Therefore, it is unskalable. * Therefore, it is unskalable. I totally should have read the docs before starting.
* *
* With much <3, psychobunny. * With much <3, psychobunny.
*/ */
@ -58,15 +58,15 @@
// Exported functions // Exported functions
// //
module.searchIndex = function(key, content, id) { module.searchIndex = function(key, content, id) {
// o.O
}; };
module.search = function(key, term, limit, callback) { module.search = function(key, term, limit, callback) {
// O.o
}; };
module.searchRemove = function(key, id, callback) { module.searchRemove = function(key, id, callback) {
// o___O
}; };
module.flushdb = function(callback) { module.flushdb = function(callback) {
@ -78,7 +78,8 @@
}; };
module.info = function(callback) { module.info = function(callback) {
// O____O GIEF FOOD
// v v
}; };
// key // key
@ -100,19 +101,28 @@
}; };
module.set = function(key, value, callback) { module.set = function(key, value, callback) {
db.put(key, value, callback); if (value === '') {
callback(false);
} else {
db.put(key, value, function(err) {
// uh, err is {}.. why??
if (typeof callback === 'function') {
callback(null);
}
});
}
}; };
module.rename = function(oldKey, newKey, callback) { module.rename = function(oldKey, newKey, callback) {
//db.rename(oldKey, newKey, callback); // G__G
}; };
module.expire = function(key, seconds, callback) { module.expire = function(key, seconds, callback) {
//db.expire(key, seconds, callback); // >__>
}; };
module.expireAt = function(key, timestamp, callback) { module.expireAt = function(key, timestamp, callback) {
//db.expireat(key, timestamp, callback); // <__<
}; };
//hashes //hashes
@ -132,7 +142,11 @@
}; };
module.setObjectField = function(key, field, value, callback) { module.setObjectField = function(key, field, value, callback) {
module.set(key + ':' + field, value, callback); // can be improved.
module.getObject(key, function(err, obj) {
obj[key] = field;
module.setObject(key, obj, callback);
});
}; };
module.getObject = function(key, callback) { module.getObject = function(key, callback) {
@ -225,6 +239,7 @@
module.delete(key + ':' + field, callback); module.delete(key + ':' + field, callback);
}; };
// BEGIN FAILURE: if the obj doesn't exist like redis, it does not create it!
module.incrObjectField = function(key, field, callback) { module.incrObjectField = function(key, field, callback) {
module.get(key + ':' + field, function(err, val) { module.get(key + ':' + field, function(err, val) {
module.set(key + ':' + field, val + 1, callback); module.set(key + ':' + field, val + 1, callback);
@ -248,66 +263,76 @@
module.set(key + ':' + field, val - value, callback); module.set(key + ':' + field, val - value, callback);
}); });
}; };
// END FAILURE: if the obj doesn't exist like redis, it does not create it!
// sets // sets
module.setAdd = function(key, value, callback) { module.setAdd = function(key, value, callback) {
db.sadd(key, value, callback); module.getListRange(key, 0, -1, function(err, set) {
if (!set.indexOf(value)) {
module.listAppend(set, value, callback);
} else {
callback(null, true); // verify if it sends back true on redis?
}
});
}; };
module.setRemove = function(key, value, callback) { module.setRemove = function(key, value, callback) {
db.srem(key, value, callback); module.getListRange(key, 0, -1, function(err, set) {
module.set(key, set.splice(set.indexOf(value), 1), callback);
});
}; };
module.isSetMember = function(key, value, callback) { module.isSetMember = function(key, value, callback) {
db.sismember(key, value, function(err, result) { module.getListRange(key, 0, -1, function(err, set) {
if(err) { callback(err, !!set.indexOf(value));
return callback(err);
}
callback(null, result === 1);
}); });
}; };
module.isSetMembers = function(key, values, callback) { module.isSetMembers = function(key, values, callback) {
var multi = db.multi(); var members = {};
for (var i=0; i<values.length; ++i) {
multi.sismember(key, values[i]);
}
multi.exec(function(err, results) { async.each(values, function(value, next) {
if (err) { module.isSetMember(key, value, function(err, isMember) {
return callback(err); members[key] = isMember;
} });
}, function(err) {
for (var i=0; i<results.length; ++i) { callback(err, members);
results[i] = results[i] === 1;
}
callback(null, results);
}); });
}; };
module.isMemberOfSets = function(sets, value, callback) { module.isMemberOfSets = function(sets, value, callback) {
var multi = db.multi(); // can be improved
var members = {};
for (var i = 0, ii = sets.length; i < ii; i++) {
multi.sismember(sets[i], value);
}
multi.exec(callback); async.each(sets, function(set, next) {
module.isSetMember(set, value, function(err, isMember) {
members[set] = value;
next();
});
}, function(err) {
callback(err, members);
});
}; };
module.getSetMembers = function(key, callback) { module.getSetMembers = function(key, callback) {
db.smembers(key, callback); module.getListRange(key, 0, -1, callback);
}; };
module.setCount = function(key, callback) { module.setCount = function(key, callback) {
db.scard(key, callback); module.getListRange(key, 0, -1, function(err, set) {
callback(err, set.length);
});
}; };
module.setRemoveRandom = function(key, callback) { module.setRemoveRandom = function(key, callback) {
db.spop(key, callback); // how random is this? well, how random are the other implementations of this?
// imo rename this to setRemoveOne
module.getListRange(key, 0, -2, function(err, set) {
module.set(key, set.join('-ldb-'), callback);
});
}; };
// sorted sets // sorted sets
@ -374,26 +399,53 @@
// lists // lists
module.listPrepend = function(key, value, callback) { module.listPrepend = function(key, value, callback) {
module.get(key, function(err, list) { module.getListRange(key, 0, -1, function(err, list) {
list.split('-ldb-') var arr = list || [];
}) arr.unshift(value);
db.lpush(key, value, callback); module.set(key, arr.join('-ldb-'), callback);
});
}; };
module.listAppend = function(key, value, callback) { module.listAppend = function(key, value, callback) {
db.rpush(key, value, callback); module.getListRange(key, 0, -1, function(err, list) {
var arr = list || [];
arr.push(value);
module.set(key, arr.join('-ldb-'), callback);
});
}; };
module.listRemoveLast = function(key, callback) { module.listRemoveLast = function(key, callback) {
db.rpop(key, callback); module.getListRange(key, 0, -1, function(err, list) {
var arr = list || [];
list.pop();
module.set(key, list.join('-ldb-'), callback);
});
};
module.listRemoveFirst = function(key, callback) {
module.getListRange(key, 0, -1, function(err, list) {
var arr = list || [];
list.shift();
module.set(key, list.join('-ldb-'), callback);
});
}; };
module.listRemoveAll = function(key, value, callback) { module.listRemoveAll = function(key, value, callback) {
db.lrem(key, 0, value, callback); // wut is this
//db.lrem(key, 0, value, callback);
throw new Error('not implemented');
}; };
module.getListRange = function(key, start, stop, callback) { module.getListRange = function(key, start, stop, callback) {
db.lrange(key, start, stop, callback); // needs testing.
module.get(key, function(err, list) {
if (list) {
list = list.split('-ldb-');
callback(err, list.slice(start, stop >= 0 ? stop : list.length + stop));
} else {
callback(null, []);
}
});
}; };
}(exports)); }(exports));

140
tests/database.js
Unescape Escape View File

@ -189,7 +189,7 @@ describe('Test database', function() {
]; ];
async.series(listTasks, function(err, results) { async.series(listTasks, function(err, results) {
assert.equal(err, null, 'error in list methods'); assert.equal(err, null, 'error in list methods: ' + err);
assert.ok(results); assert.ok(results);
done(); done();
@ -197,77 +197,7 @@ describe('Test database', function() {
}); });
/*
it('should not throw err', function(done) { it('should not throw err', function(done) {
function sortedSetAdd(callback) {
db.sortedSetAdd('sortedSet3', 12, 5, function(err, data) {
callback(err, {'sortedSetAdd': data});
});
}
function sortedSetRemove(callback) {
db.sortedSetRemove('sortedSet3', 12, function(err, data) {
callback(err, {'sortedSetRemove': data});
});
}
function getSortedSetRange(callback) {
db.getSortedSetRevRange('sortedSet3', 0, -1, function(err, data) {
callback(err, {'getSortedSetRange': data});
});
}
function getSortedSetRevRangeByScore(callback) {
var args = ['sortedSet2', '+inf', 100, 'LIMIT', 0, 10];
db.getSortedSetRevRangeByScore(args, function(err, data) {
callback(err, {'getSortedSetRevRangeByScore': data});
});
}
function sortedSetCount(callback) {
db.sortedSetCount('sortedSet3', -Infinity, Infinity, function(err, data) {
callback(err, {'sortedSetCount': data});
});
}
function sortedSetScore(callback) {
db.sortedSetScore('users:joindate', 1, function(err, data) {
callback(err, {'sortedSetScore': data});
});
}
function sortedSetsScore(callback) {
db.sortedSetsScore(['users:joindate', 'users:derp', 'users:postcount'], 1, function(err, data) {
callback(err, {'sortedSetsScore': data});
});
}
var sortedSetTasks = [
sortedSetAdd,
getSortedSetRange,
sortedSetAdd,
getSortedSetRange,
sortedSetRemove,
getSortedSetRange,
sortedSetCount,
sortedSetScore,
sortedSetsScore,
getSortedSetRevRangeByScore
];
async.series(sortedSetTasks, function(err, results) {
assert.equal(err, null, 'error in sorted set methods');
assert.ok(results);
done();
});
});
it('should not throw err', function(done) {
function setAdd(callback) { function setAdd(callback) {
db.setAdd('myTestSet', 15, function(err, data) { db.setAdd('myTestSet', 15, function(err, data) {
callback(err, {'setAdd': data}); callback(err, {'setAdd': data});
@ -335,5 +265,71 @@ describe('Test database', function() {
done(); done();
}); });
}); });
*/
it('should not throw err', function(done) {
function sortedSetAdd(callback) {
db.sortedSetAdd('sortedSet3', 12, 5, function(err, data) {
callback(err, {'sortedSetAdd': data});
});
}
function sortedSetRemove(callback) {
db.sortedSetRemove('sortedSet3', 12, function(err, data) {
callback(err, {'sortedSetRemove': data});
});
}
function getSortedSetRange(callback) {
db.getSortedSetRevRange('sortedSet3', 0, -1, function(err, data) {
callback(err, {'getSortedSetRange': data});
});
}
function getSortedSetRevRangeByScore(callback) {
var args = ['sortedSet2', '+inf', 100, 'LIMIT', 0, 10];
db.getSortedSetRevRangeByScore(args, function(err, data) {
callback(err, {'getSortedSetRevRangeByScore': data});
});
}
function sortedSetCount(callback) {
db.sortedSetCount('sortedSet3', -Infinity, Infinity, function(err, data) {
callback(err, {'sortedSetCount': data});
});
}
function sortedSetScore(callback) {
db.sortedSetScore('users:joindate', 1, function(err, data) {
callback(err, {'sortedSetScore': data});
});
}
function sortedSetsScore(callback) {
db.sortedSetsScore(['users:joindate', 'users:derp', 'users:postcount'], 1, function(err, data) {
callback(err, {'sortedSetsScore': data});
});
}
var sortedSetTasks = [
sortedSetAdd,
getSortedSetRange,
sortedSetAdd,
getSortedSetRange,
sortedSetRemove,
getSortedSetRange,
sortedSetCount,
sortedSetScore,
sortedSetsScore,
getSortedSetRevRangeByScore
];
async.series(sortedSetTasks, function(err, results) {
assert.equal(err, null, 'error in sorted set methods');
assert.ok(results);
done();
});
});
}); });

Write Preview
Loading…
Cancel
Save