Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7229d60d
Commit
7229d60d
authored
May 13, 2011
by
antirez
Browse files
EVALSHA implemented
parent
82c6b825
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/redis.c
View file @
7229d60d
...
@@ -194,7 +194,8 @@ struct redisCommand redisCommandTable[] = {
...
@@ -194,7 +194,8 @@ struct redisCommand redisCommandTable[] = {
{
"dump"
,
dumpCommand
,
2
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"dump"
,
dumpCommand
,
2
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"object"
,
objectCommand
,
-
2
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"object"
,
objectCommand
,
-
2
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"client"
,
clientCommand
,
-
2
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"client"
,
clientCommand
,
-
2
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"eval"
,
evalCommand
,
-
3
,
REDIS_CMD_DENYOOM
,
zunionInterGetKeys
,
0
,
0
,
0
,
0
,
0
}
{
"eval"
,
evalCommand
,
-
3
,
REDIS_CMD_DENYOOM
,
zunionInterGetKeys
,
0
,
0
,
0
,
0
,
0
},
{
"evalsha"
,
evalShaCommand
,
-
3
,
REDIS_CMD_DENYOOM
,
zunionInterGetKeys
,
0
,
0
,
0
,
0
,
0
}
};
};
/*============================ Utility functions ============================ */
/*============================ Utility functions ============================ */
...
@@ -781,6 +782,8 @@ void createSharedObjects(void) {
...
@@ -781,6 +782,8 @@ void createSharedObjects(void) {
"-ERR source and destination objects are the same
\r\n
"
));
"-ERR source and destination objects are the same
\r\n
"
));
shared
.
outofrangeerr
=
createObject
(
REDIS_STRING
,
sdsnew
(
shared
.
outofrangeerr
=
createObject
(
REDIS_STRING
,
sdsnew
(
"-ERR index out of range
\r\n
"
));
"-ERR index out of range
\r\n
"
));
shared
.
noscripterr
=
createObject
(
REDIS_STRING
,
sdsnew
(
"-NOSCRIPT No matching script. Please use EVAL.
\r\n
"
));
shared
.
loadingerr
=
createObject
(
REDIS_STRING
,
sdsnew
(
shared
.
loadingerr
=
createObject
(
REDIS_STRING
,
sdsnew
(
"-LOADING Redis is loading the dataset in memory
\r\n
"
));
"-LOADING Redis is loading the dataset in memory
\r\n
"
));
shared
.
space
=
createObject
(
REDIS_STRING
,
sdsnew
(
" "
));
shared
.
space
=
createObject
(
REDIS_STRING
,
sdsnew
(
" "
));
...
...
src/redis.h
View file @
7229d60d
...
@@ -365,7 +365,7 @@ struct sharedObjectsStruct {
...
@@ -365,7 +365,7 @@ struct sharedObjectsStruct {
robj
*
crlf
,
*
ok
,
*
err
,
*
emptybulk
,
*
czero
,
*
cone
,
*
cnegone
,
*
pong
,
*
space
,
robj
*
crlf
,
*
ok
,
*
err
,
*
emptybulk
,
*
czero
,
*
cone
,
*
cnegone
,
*
pong
,
*
space
,
*
colon
,
*
nullbulk
,
*
nullmultibulk
,
*
queued
,
*
colon
,
*
nullbulk
,
*
nullmultibulk
,
*
queued
,
*
emptymultibulk
,
*
wrongtypeerr
,
*
nokeyerr
,
*
syntaxerr
,
*
sameobjecterr
,
*
emptymultibulk
,
*
wrongtypeerr
,
*
nokeyerr
,
*
syntaxerr
,
*
sameobjecterr
,
*
outofrangeerr
,
*
loadingerr
,
*
plus
,
*
outofrangeerr
,
*
noscripterr
,
*
loadingerr
,
*
plus
,
*
select0
,
*
select1
,
*
select2
,
*
select3
,
*
select4
,
*
select0
,
*
select1
,
*
select2
,
*
select3
,
*
select4
,
*
select5
,
*
select6
,
*
select7
,
*
select8
,
*
select9
,
*
select5
,
*
select6
,
*
select7
,
*
select8
,
*
select9
,
*
messagebulk
,
*
pmessagebulk
,
*
subscribebulk
,
*
unsubscribebulk
,
*
mbulk3
,
*
messagebulk
,
*
pmessagebulk
,
*
subscribebulk
,
*
unsubscribebulk
,
*
mbulk3
,
...
@@ -1217,6 +1217,7 @@ void dumpCommand(redisClient *c);
...
@@ -1217,6 +1217,7 @@ void dumpCommand(redisClient *c);
void
objectCommand
(
redisClient
*
c
);
void
objectCommand
(
redisClient
*
c
);
void
clientCommand
(
redisClient
*
c
);
void
clientCommand
(
redisClient
*
c
);
void
evalCommand
(
redisClient
*
c
);
void
evalCommand
(
redisClient
*
c
);
void
evalShaCommand
(
redisClient
*
c
);
#if defined(__GNUC__)
#if defined(__GNUC__)
void
*
calloc
(
size_t
count
,
size_t
size
)
__attribute__
((
deprecated
));
void
*
calloc
(
size_t
count
,
size_t
size
)
__attribute__
((
deprecated
));
...
...
src/scripting.c
View file @
7229d60d
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
#include <lua.h>
#include <lua.h>
#include <lauxlib.h>
#include <lauxlib.h>
#include <lualib.h>
#include <lualib.h>
#include <ctype.h>
char
*
redisProtocolToLuaType_Int
(
lua_State
*
lua
,
char
*
reply
);
char
*
redisProtocolToLuaType_Int
(
lua_State
*
lua
,
char
*
reply
);
char
*
redisProtocolToLuaType_Bulk
(
lua_State
*
lua
,
char
*
reply
);
char
*
redisProtocolToLuaType_Bulk
(
lua_State
*
lua
,
char
*
reply
);
...
@@ -320,7 +321,7 @@ void luaSetGlobalArray(lua_State *lua, char *var, robj **elev, int elec) {
...
@@ -320,7 +321,7 @@ void luaSetGlobalArray(lua_State *lua, char *var, robj **elev, int elec) {
lua_setglobal
(
lua
,
var
);
lua_setglobal
(
lua
,
var
);
}
}
void
evalCommand
(
redisClient
*
c
)
{
void
eval
Generic
Command
(
redisClient
*
c
,
int
evalsha
)
{
lua_State
*
lua
=
server
.
lua
;
lua_State
*
lua
=
server
.
lua
;
char
funcname
[
43
];
char
funcname
[
43
];
long
long
numkeys
;
long
long
numkeys
;
...
@@ -337,11 +338,32 @@ void evalCommand(redisClient *c) {
...
@@ -337,11 +338,32 @@ void evalCommand(redisClient *c) {
* defined into the Lua state */
* defined into the Lua state */
funcname
[
0
]
=
'f'
;
funcname
[
0
]
=
'f'
;
funcname
[
1
]
=
'_'
;
funcname
[
1
]
=
'_'
;
hashScript
(
funcname
+
2
,
c
->
argv
[
1
]
->
ptr
,
sdslen
(
c
->
argv
[
1
]
->
ptr
));
if
(
!
evalsha
)
{
/* Hash the code if this is an EVAL call */
hashScript
(
funcname
+
2
,
c
->
argv
[
1
]
->
ptr
,
sdslen
(
c
->
argv
[
1
]
->
ptr
));
}
else
{
/* We already have the SHA if it is a EVALSHA */
int
j
;
char
*
sha
=
c
->
argv
[
1
]
->
ptr
;
for
(
j
=
0
;
j
<
40
;
j
++
)
funcname
[
j
+
2
]
=
tolower
(
sha
[
j
]);
funcname
[
42
]
=
'\0'
;
}
lua_getglobal
(
lua
,
funcname
);
lua_getglobal
(
lua
,
funcname
);
if
(
lua_isnil
(
lua
,
1
))
{
if
(
lua_isnil
(
lua
,
1
))
{
/* Function not defined... let's define it. */
sds
funcdef
;
sds
funcdef
=
sdsempty
();
/* Function not defined... let's define it if we have the
* body of the funciton. If this is an EVALSHA call we can just
* return an error. */
if
(
evalsha
)
{
addReply
(
c
,
shared
.
noscripterr
);
lua_pop
(
lua
,
1
);
/* remove the nil from the stack */
return
;
}
funcdef
=
sdsempty
();
lua_pop
(
lua
,
1
);
/* remove the nil from the stack */
lua_pop
(
lua
,
1
);
/* remove the nil from the stack */
funcdef
=
sdscat
(
funcdef
,
"function "
);
funcdef
=
sdscat
(
funcdef
,
"function "
);
...
@@ -402,3 +424,19 @@ void evalCommand(redisClient *c) {
...
@@ -402,3 +424,19 @@ void evalCommand(redisClient *c) {
luaReplyToRedisReply
(
c
,
lua
);
luaReplyToRedisReply
(
c
,
lua
);
lua_gc
(
lua
,
LUA_GCSTEP
,
1
);
lua_gc
(
lua
,
LUA_GCSTEP
,
1
);
}
}
void
evalCommand
(
redisClient
*
c
)
{
evalGenericCommand
(
c
,
0
);
}
void
evalShaCommand
(
redisClient
*
c
)
{
if
(
sdslen
(
c
->
argv
[
1
]
->
ptr
)
!=
40
)
{
/* We know that a match is not possible if the provided SHA is
* not the right length. So we return an error ASAP, this way
* evalGenericCommand() can be implemented without string length
* sanity check */
addReply
(
c
,
shared
.
noscripterr
);
return
;
}
evalGenericCommand
(
c
,
1
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment