Skip to content

Commit

Permalink
added HSETNX
Browse files Browse the repository at this point in the history
  • Loading branch information
pietern committed Apr 15, 2010
1 parent 7fb16ba commit 1f1c769
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 1 deletion.
16 changes: 16 additions & 0 deletions redis.c
Expand Up @@ -705,6 +705,7 @@ static void substrCommand(redisClient *c);
static void zrankCommand(redisClient *c);
static void zrevrankCommand(redisClient *c);
static void hsetCommand(redisClient *c);
static void hsetnxCommand(redisClient *c);
static void hgetCommand(redisClient *c);
static void hmsetCommand(redisClient *c);
static void hmgetCommand(redisClient *c);
Expand Down Expand Up @@ -783,6 +784,7 @@ static struct redisCommand cmdTable[] = {
{"zrank",zrankCommand,3,REDIS_CMD_BULK,NULL,1,1,1},
{"zrevrank",zrevrankCommand,3,REDIS_CMD_BULK,NULL,1,1,1},
{"hset",hsetCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,NULL,1,1,1},
{"hsetnx",hsetnxCommand,4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,NULL,1,1,1},
{"hget",hgetCommand,3,REDIS_CMD_BULK,NULL,1,1,1},
{"hmset",hmsetCommand,-4,REDIS_CMD_BULK|REDIS_CMD_DENYOOM,NULL,1,1,1},
{"hmget",hmgetCommand,-3,REDIS_CMD_BULK,NULL,1,1,1},
Expand Down Expand Up @@ -6247,6 +6249,20 @@ static void hsetCommand(redisClient *c) {
server.dirty++;
}

static void hsetnxCommand(redisClient *c) {
robj *o;
if ((o = hashLookupWriteOrCreate(c,c->argv[1])) == NULL) return;
hashTryConversion(o,c->argv,2,3);

if (hashExists(o, c->argv[2])) {
addReply(c, shared.czero);
} else {
hashReplace(o,c->argv[2],c->argv[3]);
addReply(c, shared.cone);
server.dirty++;
}
}

static void hmsetCommand(redisClient *c) {
int i;
robj *o;
Expand Down
2 changes: 1 addition & 1 deletion redis.tcl
Expand Up @@ -46,7 +46,7 @@ foreach redis_bulk_cmd {

# Flag commands requiring last argument as a bulk write operation
foreach redis_multibulk_cmd {
mset msetnx hset hmset hmget
mset msetnx hset hsetnx hmset hmget
} {
set ::redis::multibulkarg($redis_multibulk_cmd) {}
}
Expand Down
24 changes: 24 additions & 0 deletions test-redis.tcl
Expand Up @@ -1652,6 +1652,30 @@ proc main {} {
set _ $rv
} {0 newval1 1 0 newval2 1 1 1}

test {HSETNX target key missing - small hash} {
$r hsetnx smallhash __123123123__ foo
$r hget smallhash __123123123__
} {foo}

test {HSETNX target key exists - small hash} {
$r hsetnx smallhash __123123123__ bar
set result [$r hget smallhash __123123123__]
$r hdel smallhash __123123123__
set _ $result
} {foo}

test {HSETNX target key missing - big hash} {
$r hsetnx bighash __123123123__ foo
$r hget bighash __123123123__
} {foo}

test {HSETNX target key exists - big hash} {
$r hsetnx bighash __123123123__ bar
set result [$r hget bighash __123123123__]
$r hdel bighash __123123123__
set _ $result
} {foo}

test {HMSET wrong number of args} {
catch {$r hmset smallhash key1 val1 key2} err
format $err
Expand Down

0 comments on commit 1f1c769

Please sign in to comment.