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
95098b72
Commit
95098b72
authored
Apr 17, 2014
by
antirez
Browse files
ZREMRANGE* commands refactored into a single generic function.
parent
c0ccd4da
Changes
1
Show whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
95098b72
...
@@ -1313,65 +1313,35 @@ void zremCommand(redisClient *c) {
...
@@ -1313,65 +1313,35 @@ void zremCommand(redisClient *c) {
addReplyLongLong(c,deleted);
addReplyLongLong(c,deleted);
}
}
void
zremrangebyscoreCommand
(
redisClient
*
c
)
{
/* Implements ZREMRANGEBYRANK, ZREMRANGEBYSCORE, ZREMRANGEBYLEX commands. */
#define ZRANGE_RANK 0
#define ZRANGE_SCORE 1
#define ZRANGE_LEX 2
void zremrangeGenericCommand(redisClient *c, int rangetype) {
robj *key = c->argv[1];
robj *key = c->argv[1];
robj *zobj;
robj *zobj;
zrangespec
range
;
int keyremoved = 0;
int keyremoved = 0;
unsigned long deleted;
unsigned long deleted;
zrangespec range;
long start, end, llen;
/* Parse the range arguments. */
/* Step 1: Parse the range. */
if (rangetype == ZRANGE_RANK) {
if ((getLongFromObjectOrReply(c,c->argv[2],&start,NULL) != REDIS_OK) ||
(getLongFromObjectOrReply(c,c->argv[3],&end,NULL) != REDIS_OK))
return;
} else if (rangetype == ZRANGE_SCORE) {
if (zslParseRange(c->argv[2],c->argv[3],&range) != REDIS_OK) {
if (zslParseRange(c->argv[2],c->argv[3],&range) != REDIS_OK) {
addReplyError(c,"min or max is not a float");
addReplyError(c,"min or max is not a float");
return;
return;
}
}
if
((
zobj
=
lookupKeyWriteOrReply
(
c
,
key
,
shared
.
czero
))
==
NULL
||
checkType
(
c
,
zobj
,
REDIS_ZSET
))
return
;
if
(
zobj
->
encoding
==
REDIS_ENCODING_ZIPLIST
)
{
zobj
->
ptr
=
zzlDeleteRangeByScore
(
zobj
->
ptr
,
range
,
&
deleted
);
if
(
zzlLength
(
zobj
->
ptr
)
==
0
)
{
dbDelete
(
c
->
db
,
key
);
keyremoved
=
1
;
}
}
else
if
(
zobj
->
encoding
==
REDIS_ENCODING_SKIPLIST
)
{
zset
*
zs
=
zobj
->
ptr
;
deleted
=
zslDeleteRangeByScore
(
zs
->
zsl
,
range
,
zs
->
dict
);
if
(
htNeedsResize
(
zs
->
dict
))
dictResize
(
zs
->
dict
);
if
(
dictSize
(
zs
->
dict
)
==
0
)
{
dbDelete
(
c
->
db
,
key
);
keyremoved
=
1
;
}
}
else
{
redisPanic
(
"Unknown sorted set encoding"
);
}
if
(
deleted
)
{
signalModifiedKey
(
c
->
db
,
key
);
notifyKeyspaceEvent
(
REDIS_NOTIFY_ZSET
,
"zrembyscore"
,
key
,
c
->
db
->
id
);
if
(
keyremoved
)
notifyKeyspaceEvent
(
REDIS_NOTIFY_GENERIC
,
"del"
,
key
,
c
->
db
->
id
);
}
}
server
.
dirty
+=
deleted
;
addReplyLongLong
(
c
,
deleted
);
}
void
zremrangebyrankCommand
(
redisClient
*
c
)
{
robj
*
key
=
c
->
argv
[
1
];
robj
*
zobj
;
long
start
;
long
end
;
int
llen
;
unsigned
long
deleted
;
int
keyremoved
=
0
;
if
((
getLongFromObjectOrReply
(
c
,
c
->
argv
[
2
],
&
start
,
NULL
)
!=
REDIS_OK
)
||
(
getLongFromObjectOrReply
(
c
,
c
->
argv
[
3
],
&
end
,
NULL
)
!=
REDIS_OK
))
return
;
/* Step 2: Lookup & range sanity checks if needed. */
if ((zobj = lookupKeyWriteOrReply(c,key,shared.czero)) == NULL ||
if ((zobj = lookupKeyWriteOrReply(c,key,shared.czero)) == NULL ||
checkType(c,zobj,REDIS_ZSET)) return;
checkType(c,zobj,REDIS_ZSET)) return;
if (rangetype == ZRANGE_RANK) {
/* Sanitize indexes. */
/* Sanitize indexes. */
llen = zsetLength(zobj);
llen = zsetLength(zobj);
if (start < 0) start = llen+start;
if (start < 0) start = llen+start;
...
@@ -1385,19 +1355,32 @@ void zremrangebyrankCommand(redisClient *c) {
...
@@ -1385,19 +1355,32 @@ void zremrangebyrankCommand(redisClient *c) {
return;
return;
}
}
if (end >= llen) end = llen-1;
if (end >= llen) end = llen-1;
}
/* Step 3: Perform the range deletion operation. */
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
/* Correct for 1-based rank. */
switch(rangetype) {
case ZRANGE_RANK:
zobj->ptr = zzlDeleteRangeByRank(zobj->ptr,start+1,end+1,&deleted);
zobj->ptr = zzlDeleteRangeByRank(zobj->ptr,start+1,end+1,&deleted);
break;
case ZRANGE_SCORE:
zobj->ptr = zzlDeleteRangeByScore(zobj->ptr,range,&deleted);
break;
}
if (zzlLength(zobj->ptr) == 0) {
if (zzlLength(zobj->ptr) == 0) {
dbDelete(c->db,key);
dbDelete(c->db,key);
keyremoved = 1;
keyremoved = 1;
}
}
} else if (zobj->encoding == REDIS_ENCODING_SKIPLIST) {
} else if (zobj->encoding == REDIS_ENCODING_SKIPLIST) {
zset *zs = zobj->ptr;
zset *zs = zobj->ptr;
switch(rangetype) {
/* Correct for 1-based rank. */
case ZRANGE_RANK:
deleted = zslDeleteRangeByRank(zs->zsl,start+1,end+1,zs->dict);
deleted = zslDeleteRangeByRank(zs->zsl,start+1,end+1,zs->dict);
break;
case ZRANGE_SCORE:
deleted = zslDeleteRangeByScore(zs->zsl,range,zs->dict);
break;
}
if (htNeedsResize(zs->dict)) dictResize(zs->dict);
if (htNeedsResize(zs->dict)) dictResize(zs->dict);
if (dictSize(zs->dict) == 0) {
if (dictSize(zs->dict) == 0) {
dbDelete(c->db,key);
dbDelete(c->db,key);
...
@@ -1407,9 +1390,11 @@ void zremrangebyrankCommand(redisClient *c) {
...
@@ -1407,9 +1390,11 @@ void zremrangebyrankCommand(redisClient *c) {
redisPanic("Unknown sorted set encoding");
redisPanic("Unknown sorted set encoding");
}
}
/* Step 4: Notifications and reply. */
if (deleted) {
if (deleted) {
char *event[3] = {"zremrangebyrank","zremrangebyscore","zremrangebylex"};
signalModifiedKey(c->db,key);
signalModifiedKey(c->db,key);
notifyKeyspaceEvent
(
REDIS_NOTIFY_ZSET
,
"zrembyrank"
,
key
,
c
->
db
->
id
);
notifyKeyspaceEvent(REDIS_NOTIFY_ZSET,
event[rangetype]
,key,c->db->id);
if (keyremoved)
if (keyremoved)
notifyKeyspaceEvent(REDIS_NOTIFY_GENERIC,"del",key,c->db->id);
notifyKeyspaceEvent(REDIS_NOTIFY_GENERIC,"del",key,c->db->id);
}
}
...
@@ -1417,6 +1402,14 @@ void zremrangebyrankCommand(redisClient *c) {
...
@@ -1417,6 +1402,14 @@ void zremrangebyrankCommand(redisClient *c) {
addReplyLongLong(c,deleted);
addReplyLongLong(c,deleted);
}
}
void zremrangebyrankCommand(redisClient *c) {
zremrangeGenericCommand(c,ZRANGE_RANK);
}
void zremrangebyscoreCommand(redisClient *c) {
zremrangeGenericCommand(c,ZRANGE_SCORE);
}
typedef struct {
typedef struct {
robj *subject;
robj *subject;
int type; /* Set, sorted set */
int type; /* Set, sorted set */
...
...
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