Skip to content
Browse files

Morph SPOP to SREM for correct behavior on log replay/replication

  • Loading branch information...
1 parent ca9d961 commit 97aeda982886dad341fb81e63bc9e1db5a11ba3d @pietern pietern committed
Showing with 15 additions and 2 deletions.
  1. +15 −2 src/t_set.c
View
17 src/t_set.c
@@ -334,12 +334,25 @@ void spopCommand(redisClient *c) {
encoding = setTypeRandomElement(set,&ele,&llele);
if (encoding == REDIS_ENCODING_INTSET) {
- addReplyBulkLongLong(c,llele);
+ ele = createStringObjectFromLongLong(llele);
set->ptr = intsetRemove(set->ptr,llele,NULL);
} else {
- addReplyBulk(c,ele);
+ incrRefCount(ele);
setTypeRemove(set,ele);
}
+
+ /* Change argv to replicate as SREM */
+ c->argc = 3;
+ c->argv = zrealloc(c->argv,sizeof(robj*)*(c->argc));
+
+ /* Overwrite SREM with SPOP (same length) */
+ redisAssert(sdslen(c->argv[0]->ptr) == 4);
+ memcpy(c->argv[0]->ptr, "SREM", 4);
+
+ /* Popped element already has incremented refcount */
+ c->argv[2] = ele;
+
+ addReplyBulk(c,ele);
if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
touchWatchedKey(c->db,c->argv[1]);
server.dirty++;

0 comments on commit 97aeda9

Please sign in to comment.
Something went wrong with that request. Please try again.