You've already forked node-redis
mirror of
https://github.com/redis/node-redis.git
synced 2025-08-04 15:02:09 +03:00
Merge pull request #853 from fintura/eval
Remove bad .eval implementation
This commit is contained in:
32
index.js
32
index.js
@@ -6,7 +6,6 @@ var net = require("net"),
|
||||
Queue = require("./lib/queue"),
|
||||
to_array = require("./lib/to_array"),
|
||||
events = require("events"),
|
||||
crypto = require("crypto"),
|
||||
parsers = [],
|
||||
// This static list of commands is updated from time to time.
|
||||
// ./lib/commands.js can be updated with generate_commands.js
|
||||
@@ -1078,37 +1077,6 @@ RedisClient.prototype.multi = RedisClient.prototype.MULTI = function (args) {
|
||||
return new Multi(this, args);
|
||||
};
|
||||
|
||||
// stash original eval method
|
||||
var eval_orig = RedisClient.prototype.eval;
|
||||
// hook eval with an attempt to evalsha for cached scripts
|
||||
RedisClient.prototype.eval = RedisClient.prototype.EVAL = function () {
|
||||
var self = this,
|
||||
args = to_array(arguments),
|
||||
callback;
|
||||
|
||||
if (typeof args[args.length - 1] === "function") {
|
||||
callback = args.pop();
|
||||
}
|
||||
|
||||
if (Array.isArray(args[0])) {
|
||||
args = args[0];
|
||||
}
|
||||
|
||||
// replace script source with sha value
|
||||
var source = args[0];
|
||||
args[0] = crypto.createHash("sha1").update(source).digest("hex");
|
||||
|
||||
self.evalsha(args, function (err, reply) {
|
||||
if (err && /NOSCRIPT/.test(err.message)) {
|
||||
args[0] = source;
|
||||
eval_orig.call(self, args, callback);
|
||||
|
||||
} else if (callback) {
|
||||
callback(err, reply);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
var createClient_unix = function(path, options){
|
||||
var cnxOptions = {
|
||||
path: path
|
||||
|
Reference in New Issue
Block a user