mirror of
https://github.com/fluencelabs/redis
synced 2025-06-19 12:11:21 +00:00
prepare to cherry pick variadic ZADD without conflicts
This commit is contained in:
@ -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) {
|
|||||||
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) {
|
|||||||
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) {
|
|||||||
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 */
|
||||||
|
Reference in New Issue
Block a user