redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Merge remote branch 'tj/features/multi'

Browse Source 
Conflicts:
	test.js
This commit is contained in:
Matt Ranney
2010-09-24 10:51:21 -07:00
parent 02e466fb75 7795d68351
commit 29f10cd593
2 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
index.js
View File

@@ -662,8 +662,9 @@ exports.commands = [
"INFO", "MONITOR", "SLAVEOF", "CONFIG",
// Publish/Subscribe
"PUBLISH", "SUBSCRIBE", "PSUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE",
"MULTI", "EXEC",
// Undocumented commands
"PING"
"PING",
];
exports.commands.forEach(function (command) {
@@ -680,47 +681,43 @@ exports.commands.forEach(function (command) {
};
});
// Transactions - "DISCARD", "WATCH", "UNWATCH",
function Multi(client) {
this.client = client;
this.queue = [];
this.queue.push(['MULTI']);
}
RedisClient.prototype.multi = function (commands, callback) {
var self = this;
exports.commands.forEach(function (command) {
Multi.prototype[command.toLowerCase()] = function () {
var args = to_array(arguments);
args.unshift(command); // put command at the beginning
this.queue.push(args);
return this;
};
});
this.send_command("MULTI", function (err, reply) {
if (err) {
console.warn("Error starting MULTI request: " + err.stack);
}
});
commands.forEach(function (args, command_num) {
self.send_command(args[0], args[1], function (err, reply) {
Multi.prototype.exec = function(fn){
var done;
this.queue.push(['EXEC']);
this.queue.forEach(function(args){
var command = args.shift();
this.client[command](args, function(err, reply){
if (done) return;
if (err) {
args[2](err);
commands.splice(command_num, 1); // what if this runs before all commands are sent?
} else {
if (reply !== "QUEUED") {
console.warn("Unexpected MULTI reply: " + reply + " instead of 'QUEUED'");
}
done = true;
fn(new Error(err));
} else if ('EXEC' == command) {
done = true;
fn(null, reply);
}
});
});
this.send_command("EXEC", function (err, replies) {
replies.forEach(function (reply, reply_num) {
if (typeof commands[reply_num][2] === "function") {
commands[reply_num][2](null, reply);
} else {
if (exports.debug_mode) {
console.log("no callback for multi response " + reply_num + ", skipping.");
}
}
});
if (typeof callback === "function") {
callback(replies);
}
});
};
RedisClient.prototype.MULTI = function (commands) {
return this.multi(commands);
}, this);
};
RedisClient.prototype.__defineGetter__('multi', function(){
return new Multi(this);
});
exports.createClient = function (port_arg, host_arg, options) {
var port = port_arg || default_port,
host = host_arg || default_host,