limit/offset and order clause for redis adapter

Conflicts:

	lib/adapters/redis.js
This commit is contained in:
Julien Guimont 2011-12-16 21:42:13 -05:00
parent 1ad0d91e57
commit f8f6f4d995
1 changed files with 53 additions and 8 deletions

View File

@ -79,6 +79,11 @@ BridgeToRedis.prototype.create = function (model, data, callback) {
callback(err, id);
}
});
// push the id to the list of user ids for sorting
log('SADD s:' + model + ':' + data.id + ' ...');
this.client.sadd("s:" + model, data.id);
}.bind(this));
};
@ -111,6 +116,8 @@ BridgeToRedis.prototype.destroy = function destroy(model, id, callback) {
this.log('DEL ' + model + ':' + id, t1);
callback(err);
}.bind(this));
this.log('SREM s:' + model, t1);
this.client.srem("s:" + model, id);
};
BridgeToRedis.prototype.possibleIndexes = function (model, filter) {
@ -132,16 +139,54 @@ BridgeToRedis.prototype.all = function all(model, filter, callback) {
var log = this.log;
var t1 = Date.now();
var cmd;
var that = this;
var sortCmd = [];
// ORDER
if (filter && filter.order){
var orders = filter.order;
if (typeof filter.order === "string"){
orders = [filter.order];
}
orders.forEach( function (key){
sortCmd.push("BY", model + ":*->" + key);
});
}
// LIMIT
if (filter && filter.limit){
var from = (filter.offset || 0), to = from + filter.limit;
sortCmd.push("LIMIT", from, to);
}
// do we need to sort or to query normally
if(sortCmd.length){
sortCmd.unshift("s:" + model);
sortCmd.push("GET", "#");
cmd = "sort " + sortCmd.join(" ");
sortCmd.push(function(err, ids){
console.log( ids);
if (err) {
return callback(err, []);
}
var keys = ids.map(function (i) {
return model + ":" + i;
});
console.log(keys);
handleKeys(err, keys);
});
client.sort.apply(client, sortCmd);
}else{
// Do a normal key lookup with possbible indexes
var indexes = this.possibleIndexes(model, filter);
if (indexes.length) {
cmd = 'SINTER "' + indexes.join('" "') + '"';
indexes.push(handleKeys);
client.sinter.apply(client, indexes);
client.sinter.apply(client, indexes, handleKeys);
} else {
cmd = 'KEYS ' + model + ':*';
client.keys(model + ':*', handleKeys);
}
}
function handleKeys(err, keys) {
log(cmd, t1);