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
8b2449dc
Commit
8b2449dc
authored
Mar 22, 2011
by
Pieter Noordhuis
Browse files
Backport patch: signalModifiedKey (unstable) -> touchWatchedKey (2.2)
parent
763d6165
Changes
1
Show whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
8b2449dc
...
@@ -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);
signalModifi
edKey(c->db,key);
touchWatch
edKey(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_RAW);
zsetConvert(zobj,REDIS_ENCODING_RAW);
signalModifi
edKey(c->db,key);
touchWatch
edKey(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. */
signalModifi
edKey(c->db,key);
touchWatch
edKey(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. */
signalModifi
edKey(c->db,key);
touchWatch
edKey(c->db,key);
server.dirty++;
server.dirty++;
if (incr) /* ZINCRBY */
if (incr) /* ZINCRBY */
...
@@ -990,7 +990,7 @@ void zremCommand(redisClient *c) {
...
@@ -990,7 +990,7 @@ void zremCommand(redisClient *c) {
redisPanic("Unknown sorted set encoding");
redisPanic("Unknown sorted set encoding");
}
}
signalModifi
edKey(c->db,key);
touchWatch
edKey(c->db,key);
server.dirty++;
server.dirty++;
addReply(c,shared.cone);
addReply(c,shared.cone);
}
}
...
@@ -1022,7 +1022,7 @@ void zremrangebyscoreCommand(redisClient *c) {
...
@@ -1022,7 +1022,7 @@ void zremrangebyscoreCommand(redisClient *c) {
redisPanic("Unknown sorted set encoding");
redisPanic("Unknown sorted set encoding");
}
}
if (deleted)
signalModifi
edKey(c->db,key);
if (deleted)
touchWatch
edKey(c->db,key);
server.dirty += deleted;
server.dirty += deleted;
addReplyLongLong(c,deleted);
addReplyLongLong(c,deleted);
}
}
...
@@ -1070,7 +1070,7 @@ void zremrangebyrankCommand(redisClient *c) {
...
@@ -1070,7 +1070,7 @@ void zremrangebyrankCommand(redisClient *c) {
redisPanic("Unknown sorted set encoding");
redisPanic("Unknown sorted set encoding");
}
}
if (deleted)
signalModifi
edKey(c->db,key);
if (deleted)
touchWatch
edKey(c->db,key);
server.dirty += deleted;
server.dirty += deleted;
addReplyLongLong(c,deleted);
addReplyLongLong(c,deleted);
}
}
...
@@ -1603,7 +1603,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
...
@@ -1603,7 +1603,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
dbAdd(c->db,dstkey,dstobj);
dbAdd(c->db,dstkey,dstobj);
addReplyLongLong(c,zsetLength(dstobj));
addReplyLongLong(c,zsetLength(dstobj));
if (!touched)
signalModifi
edKey(c->db,dstkey);
if (!touched)
touchWatch
edKey(c->db,dstkey);
server.dirty++;
server.dirty++;
} else {
} else {
decrRefCount(dstobj);
decrRefCount(dstobj);
...
...
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