Commit 6e326c81 authored by antirez's avatar antirez
Browse files

prepare to cherry pick variadic ZADD without conflicts

parent 83533b62
...@@ -859,7 +859,7 @@ void zaddGenericCommand(redisClient *c, int incr) { ...@@ -859,7 +859,7 @@ void zaddGenericCommand(redisClient *c, int incr) {
zobj->ptr = zzlDelete(zobj->ptr,eptr); zobj->ptr = zzlDelete(zobj->ptr,eptr);
zobj->ptr = zzlInsert(zobj->ptr,ele,score); zobj->ptr = zzlInsert(zobj->ptr,ele,score);
touchWatchedKey(c->db,key); signalModifiedKey(c->db,key);
server.dirty++; server.dirty++;
} }
...@@ -876,7 +876,7 @@ void zaddGenericCommand(redisClient *c, int incr) { ...@@ -876,7 +876,7 @@ void zaddGenericCommand(redisClient *c, int incr) {
if (sdslen(ele->ptr) > server.zset_max_ziplist_value) if (sdslen(ele->ptr) > server.zset_max_ziplist_value)
zsetConvert(zobj,REDIS_ENCODING_SKIPLIST); zsetConvert(zobj,REDIS_ENCODING_SKIPLIST);
touchWatchedKey(c->db,key); signalModifiedKey(c->db,key);
server.dirty++; server.dirty++;
if (incr) /* ZINCRBY */ if (incr) /* ZINCRBY */
...@@ -914,7 +914,7 @@ void zaddGenericCommand(redisClient *c, int incr) { ...@@ -914,7 +914,7 @@ void zaddGenericCommand(redisClient *c, int incr) {
incrRefCount(curobj); /* Re-inserted in skiplist. */ incrRefCount(curobj); /* Re-inserted in skiplist. */
dictGetEntryVal(de) = &znode->score; /* Update score ptr. */ dictGetEntryVal(de) = &znode->score; /* Update score ptr. */
touchWatchedKey(c->db,key); signalModifiedKey(c->db,key);
server.dirty++; server.dirty++;
} }
...@@ -928,7 +928,7 @@ void zaddGenericCommand(redisClient *c, int incr) { ...@@ -928,7 +928,7 @@ void zaddGenericCommand(redisClient *c, int incr) {
redisAssert(dictAdd(zs->dict,ele,&znode->score) == DICT_OK); redisAssert(dictAdd(zs->dict,ele,&znode->score) == DICT_OK);
incrRefCount(ele); /* Added to dictionary. */ incrRefCount(ele); /* Added to dictionary. */
touchWatchedKey(c->db,key); signalModifiedKey(c->db,key);
server.dirty++; server.dirty++;
if (incr) /* ZINCRBY */ if (incr) /* ZINCRBY */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment