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 pull request #853 from fintura/eval

Browse Source 
Remove bad .eval implementation
This commit is contained in:
Ruben Bridgewater
2015-09-18 00:17:35 +02:00
parent 2578aba079 8b7d4a8449
commit 4d1390318c
2 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
index.js
View File

@@ -6,7 +6,6 @@ var net = require("net"),
Queue = require("./lib/queue"), Queue = require("./lib/queue"),
to_array = require("./lib/to_array"), to_array = require("./lib/to_array"),
events = require("events"), events = require("events"),
crypto = require("crypto"),
parsers = [], parsers = [],
// This static list of commands is updated from time to time. // This static list of commands is updated from time to time.
// ./lib/commands.js can be updated with generate_commands.js // ./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); 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 createClient_unix = function(path, options){
var cnxOptions = { var cnxOptions = {
path: path path: path

31
test/commands/eval.spec.js
View File

@@ -12,6 +12,7 @@ describe("The 'eval' method", function () {
describe("using " + parser + " and " + ip, function () { describe("using " + parser + " and " + ip, function () {
var client; var client;
var source = "return redis.call('set', 'sha', 'test')";
beforeEach(function (done) { beforeEach(function (done) {
client = redis.createClient.apply(redis.createClient, args); client = redis.createClient.apply(redis.createClient, args);
@@ -94,24 +95,25 @@ describe("The 'eval' method", function () {
}); });
}); });
describe('evalsha', function () { it('allows a script to be executed that accesses the redis API without callback', function (done) {
var source = "return redis.call('get', 'sha test')"; helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
var sha = crypto.createHash('sha1').update(source).digest('hex'); client.eval(source, 0);
client.get('sha', helper.isString('test', done));
});
beforeEach(function (done) { describe('evalsha', function () {
client.set("sha test", "eval get sha test", function (err, res) { var sha = crypto.createHash('sha1').update(source).digest('hex');
return done(err);
});
});
it('allows a script to be executed that accesses the redis API', function (done) { it('allows a script to be executed that accesses the redis API', function (done) {
helper.serverVersionAtLeast.call(this, client, [2, 5, 0]); helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
client.eval(source, 0, helper.isString('eval get sha test', done)); client.eval(source, 0, helper.isString('OK'));
client.get('sha', helper.isString('test', done));
}); });
it('can execute a script if the SHA exists', function (done) { it('can execute a script if the SHA exists', function (done) {
helper.serverVersionAtLeast.call(this, client, [2, 5, 0]); helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
client.evalsha(sha, 0, helper.isString('eval get sha test', done)); client.evalsha(sha, 0, helper.isString('OK'));
client.get('sha', helper.isString('test', done));
}); });
it('returns an error if SHA does not exist', function (done) { it('returns an error if SHA does not exist', function (done) {
@@ -119,6 +121,15 @@ describe("The 'eval' method", function () {
client.evalsha('ffffffffffffffffffffffffffffffffffffffff', 0, helper.isError(done)); client.evalsha('ffffffffffffffffffffffffffffffffffffffff', 0, helper.isError(done));
}); });
it('emit an error if SHA does not exist without any callback', function (done) {
helper.serverVersionAtLeast.call(this, client, [2, 5, 0]);
client.evalsha('ffffffffffffffffffffffffffffffffffffffff', 0);
client.on('error', function(err) {
assert(/NOSCRIPT No matching script. Please use EVAL./.test(err.message));
done();
});
});
it('emits an error if SHA does not exist and no callback has been provided', function (done) { it('emits an error if SHA does not exist and no callback has been provided', function (done) {
client.on('error', function (err) { client.on('error', function (err) {
assert.equal(err.message, 'NOSCRIPT No matching script. Please use EVAL.'); assert.equal(err.message, 'NOSCRIPT No matching script. Please use EVAL.');