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

Fixed detect_buffers keeping all multi/exec results as buffers

Browse Source
This commit is contained in:
Raymond Myers
2015-04-01 01:03:10 -07:00
committed by Ray Myers
parent aea03d60be
commit ded75c8ea2
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
index.js
View File

@@ -1106,15 +1106,24 @@ Multi.prototype.HMSET = Multi.prototype.hmset;
Multi.prototype.exec = function (callback) { Multi.prototype.exec = function (callback) {
var self = this; var self = this;
var errors = []; var errors = [];
var wants_buffers = [];
// drain queue, callback will catch "QUEUED" or error // drain queue, callback will catch "QUEUED" or error
// TODO - get rid of all of these anonymous functions which are elegant but slow // TODO - get rid of all of these anonymous functions which are elegant but slow
this.queue.forEach(function (args, index) { this.queue.forEach(function (args, index) {
var command = args[0], obj; var command = args[0], obj, i, il, buffer_args;
if (typeof args[args.length - 1] === "function") { if (typeof args[args.length - 1] === "function") {
args = args.slice(1, -1); args = args.slice(1, -1);
} else { } else {
args = args.slice(1); args = args.slice(1);
} }
// Keep track of who wants buffer responses:
buffer_args = false;
for (i = 0, il = args.length; i < il; i += 1) {
if (Buffer.isBuffer(args[i])) {
buffer_args = true;
}
}
wants_buffers.push(buffer_args);
if (args.length === 1 && Array.isArray(args[0])) { if (args.length === 1 && Array.isArray(args[0])) {
args = args[0]; args = args[0];
} }
@@ -1149,12 +1158,18 @@ Multi.prototype.exec = function (callback) {
} }
} }
var i, il, reply, args; var i, il, reply, to_buffer, args;
if (replies) { if (replies) {
for (i = 1, il = self.queue.length; i < il; i += 1) { for (i = 1, il = self.queue.length; i < il; i += 1) {
reply = replies[i - 1]; reply = replies[i - 1];
args = self.queue[i]; args = self.queue[i];
to_buffer = wants_buffers[i];
// If we asked for strings, even in detect_buffers mode, then return strings:
if (self._client.options.detect_buffers && to_buffer === false) {
replies[i - 1] = reply = reply_to_strings(reply);
}
// TODO - confusing and error-prone that hgetall is special cased in two places // TODO - confusing and error-prone that hgetall is special cased in two places
if (reply && args[0].toLowerCase() === "hgetall") { if (reply && args[0].toLowerCase() === "hgetall") {