mirror of
https://github.com/fluencelabs/redis
synced 2025-06-23 05:51:34 +00:00
Variadic SREM backported from unstable
This commit is contained in:
@ -103,7 +103,7 @@ struct redisCommand readonlyCommandTable[] = {
|
||||
{"lrem",lremCommand,4,0,NULL,1,1,1},
|
||||
{"rpoplpush",rpoplpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,2,1},
|
||||
{"sadd",saddCommand,-3,REDIS_CMD_DENYOOM,NULL,1,1,1},
|
||||
{"srem",sremCommand,3,0,NULL,1,1,1},
|
||||
{"srem",sremCommand,-3,0,NULL,1,1,1},
|
||||
{"smove",smoveCommand,4,0,NULL,1,2,1},
|
||||
{"sismember",sismemberCommand,3,0,NULL,1,1,1},
|
||||
{"scard",scardCommand,2,0,NULL,1,1,1},
|
||||
|
19
src/t_set.c
19
src/t_set.c
@ -242,19 +242,22 @@ void saddCommand(redisClient *c) {
|
||||
|
||||
void sremCommand(redisClient *c) {
|
||||
robj *set;
|
||||
int j, deleted = 0;
|
||||
|
||||
if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
|
||||
checkType(c,set,REDIS_SET)) return;
|
||||
|
||||
c->argv[2] = tryObjectEncoding(c->argv[2]);
|
||||
if (setTypeRemove(set,c->argv[2])) {
|
||||
if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
|
||||
touchWatchedKey(c->db,c->argv[1]);
|
||||
server.dirty++;
|
||||
addReply(c,shared.cone);
|
||||
} else {
|
||||
addReply(c,shared.czero);
|
||||
for (j = 2; j < c->argc; j++) {
|
||||
if (setTypeRemove(set,c->argv[j])) {
|
||||
if (setTypeSize(set) == 0) dbDelete(c->db,c->argv[1]);
|
||||
deleted++;
|
||||
}
|
||||
}
|
||||
if (deleted) {
|
||||
touchWatchedKey(c->db,c->argv[1]);
|
||||
server.dirty += deleted;
|
||||
}
|
||||
addReplyLongLong(c,deleted);
|
||||
}
|
||||
|
||||
void smoveCommand(redisClient *c) {
|
||||
|
Reference in New Issue
Block a user