fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-25 10:32:14 +00:00
Code Issues Projects Releases Wiki Activity

REPLACE option for RESTORE.

Browse Source 
The REPLACE option deletes an existing key with the same name (if any)
and materializes the new one. The default behavior without RESTORE is to
return an error if a key already exists.
This commit is contained in:
antirez 2012-11-07 10:57:23 +01:00
parent c4b0b6854e
commit e5b5763f56
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cluster.c
View File

@ -1539,15 +1539,25 @@ void dumpCommand(redisClient *c) {
return; return;
} }
/* RESTORE key ttl serialized-value */ /* RESTORE key ttl serialized-value [REPLACE] */
void restoreCommand(redisClient *c) { void restoreCommand(redisClient *c) {
long ttl; long ttl;
rio payload; rio payload;
int type; int j, type, replace = 0;
robj *obj; robj *obj;
/* Parse additional options */
for (j = 4; j < c->argc; j++) {
if (!strcasecmp(c->argv[j]->ptr,"replace")) {
replace = 1;
} else {
addReply(c,shared.syntaxerr);
return;
}
}
/* Make sure this key does not already exist here... */ /* Make sure this key does not already exist here... */
if (lookupKeyWrite(c->db,c->argv[1]) != NULL) { if (!replace && lookupKeyWrite(c->db,c->argv[1]) != NULL) {
addReplyError(c,"Target key name is busy."); addReplyError(c,"Target key name is busy.");
return; return;
} }
@ -1574,6 +1584,9 @@ void restoreCommand(redisClient *c) {
return; return;
} }
/* Remove the old key if needed. */
if (replace) dbDelete(c->db,c->argv[1]);
/* Create the key and set the TTL if any */ /* Create the key and set the TTL if any */
dbAdd(c->db,c->argv[1],obj); dbAdd(c->db,c->argv[1],obj);
if (ttl) setExpire(c->db,c->argv[1],mstime()+ttl); if (ttl) setExpire(c->db,c->argv[1],mstime()+ttl);

2
src/redis.c
View File

@ -240,7 +240,7 @@ struct redisCommand redisCommandTable[] = {
{"watch",watchCommand,-2,"rs",0,noPreloadGetKeys,1,-1,1,0,0}, {"watch",watchCommand,-2,"rs",0,noPreloadGetKeys,1,-1,1,0,0},
{"unwatch",unwatchCommand,1,"rs",0,NULL,0,0,0,0,0}, {"unwatch",unwatchCommand,1,"rs",0,NULL,0,0,0,0,0},
{"cluster",clusterCommand,-2,"ar",0,NULL,0,0,0,0,0}, {"cluster",clusterCommand,-2,"ar",0,NULL,0,0,0,0,0},
{"restore",restoreCommand,4,"awm",0,NULL,1,1,1,0,0}, {"restore",restoreCommand,-4,"awm",0,NULL,1,1,1,0,0},
{"migrate",migrateCommand,6,"aw",0,NULL,0,0,0,0,0}, {"migrate",migrateCommand,6,"aw",0,NULL,0,0,0,0,0},
{"asking",askingCommand,1,"r",0,NULL,0,0,0,0,0}, {"asking",askingCommand,1,"r",0,NULL,0,0,0,0,0},
{"dump",dumpCommand,2,"ar",0,NULL,1,1,1,0,0}, {"dump",dumpCommand,2,"ar",0,NULL,1,1,1,0,0},

16
tests/unit/dump.tcl
View File

@ -23,6 +23,22 @@ start_server {tags {"dump"}} {
set e set e
} {*is busy*} } {*is busy*}
test {RESTORE can overwrite an existing key with REPLACE} {
r set foo bar1
set encoded1 [r dump foo]
r set foo bar2
set encoded2 [r dump foo]
r del foo
r restore foo 0 $encoded1
r restore foo 0 $encoded2 replace
r get foo
} {bar2}
test {RESTORE can detect a syntax error for unrecongized options} {
catch {r restore foo 0 "..." invalid-option} e
set e
} {*syntax*}
test {DUMP of non existing key returns nil} { test {DUMP of non existing key returns nil} {
r dump nonexisting_key r dump nonexisting_key
} {} } {}