Initial test events for the new keyspace notification API.

This commit is contained in:
antirez 2013-01-23 17:04:18 +01:00
parent 2ea9518a53
commit 5b9357a6b3
3 changed files with 11 additions and 0 deletions

View File

@ -240,6 +240,7 @@ void delCommand(redisClient *c) {
for (j = 1; j < c->argc; j++) { for (j = 1; j < c->argc; j++) {
if (dbDelete(c->db,c->argv[j])) { if (dbDelete(c->db,c->argv[j])) {
signalModifiedKey(c->db,c->argv[j]); signalModifiedKey(c->db,c->argv[j]);
notifyKeyspaceEvent("del",c->argv[j],c->db->id);
server.dirty++; server.dirty++;
deleted++; deleted++;
} }
@ -391,6 +392,8 @@ void renameGenericCommand(redisClient *c, int nx) {
dbDelete(c->db,c->argv[1]); dbDelete(c->db,c->argv[1]);
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
signalModifiedKey(c->db,c->argv[2]); signalModifiedKey(c->db,c->argv[2]);
notifyKeyspaceEvent("rename_from",c->argv[1],c->db->id);
notifyKeyspaceEvent("rename_to",c->argv[2],c->db->id);
server.dirty++; server.dirty++;
addReply(c,nx ? shared.cone : shared.ok); addReply(c,nx ? shared.cone : shared.ok);
} }

View File

@ -689,6 +689,7 @@ void activeExpireCycle(void) {
propagateExpire(db,keyobj); propagateExpire(db,keyobj);
dbDelete(db,keyobj); dbDelete(db,keyobj);
notifyKeyspaceEvent("expired",keyobj,db->id);
decrRefCount(keyobj); decrRefCount(keyobj);
expired++; expired++;
server.stat_expiredkeys++; server.stat_expiredkeys++;
@ -2431,6 +2432,7 @@ int freeMemoryIfNeeded(void) {
delta -= (long long) zmalloc_used_memory(); delta -= (long long) zmalloc_used_memory();
mem_freed += delta; mem_freed += delta;
server.stat_evictedkeys++; server.stat_evictedkeys++;
notifyKeyspaceEvent("evicted",keyobj,db->id);
decrRefCount(keyobj); decrRefCount(keyobj);
keys_freed++; keys_freed++;

View File

@ -62,6 +62,8 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir
setKey(c->db,key,val); setKey(c->db,key,val);
server.dirty++; server.dirty++;
if (expire) setExpire(c->db,key,mstime()+milliseconds); if (expire) setExpire(c->db,key,mstime()+milliseconds);
notifyKeyspaceEvent("set",key,c->db->id);
if (expire) notifyKeyspaceEvent("expire",key,c->db->id);
addReply(c, nx ? shared.cone : shared.ok); addReply(c, nx ? shared.cone : shared.ok);
} }
@ -253,6 +255,7 @@ void msetGenericCommand(redisClient *c, int nx) {
for (j = 1; j < c->argc; j += 2) { for (j = 1; j < c->argc; j += 2) {
c->argv[j+1] = tryObjectEncoding(c->argv[j+1]); c->argv[j+1] = tryObjectEncoding(c->argv[j+1]);
setKey(c->db,c->argv[j],c->argv[j+1]); setKey(c->db,c->argv[j],c->argv[j+1]);
notifyKeyspaceEvent("set",c->argv[j+1],c->db->id);
} }
server.dirty += (c->argc-1)/2; server.dirty += (c->argc-1)/2;
addReply(c, nx ? shared.cone : shared.ok); addReply(c, nx ? shared.cone : shared.ok);
@ -287,6 +290,7 @@ void incrDecrCommand(redisClient *c, long long incr) {
else else
dbAdd(c->db,c->argv[1],new); dbAdd(c->db,c->argv[1],new);
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
notifyKeyspaceEvent("incrby",c->argv[1],c->db->id);
server.dirty++; server.dirty++;
addReply(c,shared.colon); addReply(c,shared.colon);
addReply(c,new); addReply(c,new);
@ -336,6 +340,7 @@ void incrbyfloatCommand(redisClient *c) {
else else
dbAdd(c->db,c->argv[1],new); dbAdd(c->db,c->argv[1],new);
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
notifyKeyspaceEvent("incrbyfloat",c->argv[1],c->db->id);
server.dirty++; server.dirty++;
addReplyBulk(c,new); addReplyBulk(c,new);
@ -383,6 +388,7 @@ void appendCommand(redisClient *c) {
totlen = sdslen(o->ptr); totlen = sdslen(o->ptr);
} }
signalModifiedKey(c->db,c->argv[1]); signalModifiedKey(c->db,c->argv[1]);
notifyKeyspaceEvent("append",c->argv[1],c->db->id);
server.dirty++; server.dirty++;
addReplyLongLong(c,totlen); addReplyLongLong(c,totlen);
} }