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
4a14dbba
Commit
4a14dbba
authored
Mar 08, 2011
by
Pieter Noordhuis
Browse files
Look up and remove elements by range
parent
9f9b60f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
4a14dbba
...
@@ -454,6 +454,87 @@ unsigned int zzlLength(robj *zobj) {
...
@@ -454,6 +454,87 @@ unsigned int zzlLength(robj *zobj) {
return
ziplistLen
(
zl
)
/
2
;
return
ziplistLen
(
zl
)
/
2
;
}
}
/* Returns if there is a part of the zset is in range. Should only be used
* internally by zzlFirstInRange and zzlLastInRange. */
int
zzlIsInRange
(
unsigned
char
*
zl
,
zrangespec
*
range
)
{
unsigned
char
*
p
;
double
score
;
/* Test for ranges that will always be empty. */
if
(
range
->
min
>
range
->
max
||
(
range
->
min
==
range
->
max
&&
(
range
->
minex
||
range
->
maxex
)))
return
0
;
p
=
ziplistIndex
(
zl
,
-
1
);
/* Last score. */
redisAssert
(
p
!=
NULL
);
score
=
zzlGetScore
(
p
);
if
(
!
zslValueGteMin
(
score
,
range
))
return
0
;
p
=
ziplistIndex
(
zl
,
1
);
/* First score. */
redisAssert
(
p
!=
NULL
);
score
=
zzlGetScore
(
p
);
if
(
!
zslValueLteMax
(
score
,
range
))
return
0
;
return
1
;
}
/* Find pointer to the first element contained in the specified range.
* Returns NULL when no element is contained in the range. */
unsigned
char
*
zzlFirstInRange
(
robj
*
zobj
,
zrangespec
range
)
{
unsigned
char
*
zl
=
zobj
->
ptr
;
unsigned
char
*
eptr
=
ziplistIndex
(
zl
,
0
),
*
sptr
;
double
score
;
/* If everything is out of range, return early. */
if
(
!
zzlIsInRange
(
zl
,
&
range
))
return
NULL
;
while
(
eptr
!=
NULL
)
{
sptr
=
ziplistNext
(
zl
,
eptr
);
redisAssert
(
sptr
!=
NULL
);
score
=
zzlGetScore
(
sptr
);
if
(
zslValueGteMin
(
score
,
&
range
))
return
eptr
;
/* Move to next element. */
eptr
=
ziplistNext
(
zl
,
sptr
);
}
return
NULL
;
}
/* Find pointer to the last element contained in the specified range.
* Returns NULL when no element is contained in the range. */
unsigned
char
*
zzlLastInRange
(
robj
*
zobj
,
zrangespec
range
)
{
unsigned
char
*
zl
=
zobj
->
ptr
;
unsigned
char
*
eptr
=
ziplistIndex
(
zl
,
-
2
),
*
sptr
;
double
score
;
/* If everything is out of range, return early. */
if
(
!
zzlIsInRange
(
zl
,
&
range
))
return
NULL
;
while
(
eptr
!=
NULL
)
{
sptr
=
ziplistNext
(
zl
,
eptr
);
redisAssert
(
sptr
!=
NULL
);
score
=
zzlGetScore
(
sptr
);
if
(
zslValueLteMax
(
score
,
&
range
))
return
eptr
;
/* Move to previous element by moving to the score of previous element.
* When this returns NULL, we know there also is no element. */
sptr
=
ziplistPrev
(
zl
,
eptr
);
if
(
sptr
!=
NULL
)
redisAssert
((
eptr
=
ziplistPrev
(
zl
,
sptr
))
!=
NULL
);
else
eptr
=
NULL
;
}
return
NULL
;
}
unsigned
char
*
zzlFind
(
robj
*
zobj
,
robj
*
ele
,
double
*
score
)
{
unsigned
char
*
zzlFind
(
robj
*
zobj
,
robj
*
ele
,
double
*
score
)
{
unsigned
char
*
zl
=
zobj
->
ptr
;
unsigned
char
*
zl
=
zobj
->
ptr
;
unsigned
char
*
eptr
=
ziplistIndex
(
zl
,
0
),
*
sptr
;
unsigned
char
*
eptr
=
ziplistIndex
(
zl
,
0
),
*
sptr
;
...
@@ -557,6 +638,34 @@ int zzlInsert(robj *zobj, robj *ele, double score) {
...
@@ -557,6 +638,34 @@ int zzlInsert(robj *zobj, robj *ele, double score) {
return
REDIS_OK
;
return
REDIS_OK
;
}
}
unsigned
long
zzlDeleteRangeByScore
(
robj
*
zobj
,
zrangespec
range
)
{
unsigned
char
*
zl
=
zobj
->
ptr
;
unsigned
char
*
eptr
,
*
sptr
;
double
score
;
unsigned
long
deleted
=
0
;
eptr
=
zzlFirstInRange
(
zobj
,
range
);
if
(
eptr
==
NULL
)
return
deleted
;
/* When the tail of the ziplist is deleted, eptr will point to the sentinel
* byte and ziplistNext will return NULL. */
while
((
sptr
=
ziplistNext
(
zl
,
eptr
))
!=
NULL
)
{
score
=
zzlGetScore
(
sptr
);
if
(
zslValueLteMax
(
score
,
&
range
))
{
/* Delete both the element and the score. */
zl
=
ziplistDelete
(
zl
,
&
eptr
);
zl
=
ziplistDelete
(
zl
,
&
eptr
);
deleted
++
;
}
else
{
/* No longer in range. */
break
;
}
}
return
deleted
;
}
/*-----------------------------------------------------------------------------
/*-----------------------------------------------------------------------------
* Sorted set commands
* Sorted set commands
*----------------------------------------------------------------------------*/
*----------------------------------------------------------------------------*/
...
@@ -736,10 +845,10 @@ void zremCommand(redisClient *c) {
...
@@ -736,10 +845,10 @@ void zremCommand(redisClient *c) {
}
}
void
zremrangebyscoreCommand
(
redisClient
*
c
)
{
void
zremrangebyscoreCommand
(
redisClient
*
c
)
{
robj
*
key
=
c
->
argv
[
1
];
robj
*
zobj
;
zrangespec
range
;
zrangespec
range
;
long
deleted
;
unsigned
long
deleted
;
robj
*
o
;
zset
*
zs
;
/* Parse the range arguments. */
/* Parse the range arguments. */
if
(
zslParseRange
(
c
->
argv
[
2
],
c
->
argv
[
3
],
&
range
)
!=
REDIS_OK
)
{
if
(
zslParseRange
(
c
->
argv
[
2
],
c
->
argv
[
3
],
&
range
)
!=
REDIS_OK
)
{
...
@@ -747,14 +856,21 @@ void zremrangebyscoreCommand(redisClient *c) {
...
@@ -747,14 +856,21 @@ void zremrangebyscoreCommand(redisClient *c) {
return
;
return
;
}
}
if
((
o
=
lookupKeyWriteOrReply
(
c
,
c
->
argv
[
1
]
,
shared
.
czero
))
==
NULL
||
if
((
zobj
=
lookupKeyWriteOrReply
(
c
,
key
,
shared
.
czero
))
==
NULL
||
checkType
(
c
,
o
,
REDIS_ZSET
))
return
;
checkType
(
c
,
zobj
,
REDIS_ZSET
))
return
;
zs
=
o
->
ptr
;
if
(
zobj
->
encoding
==
REDIS_ENCODING_ZIPLIST
)
{
deleted
=
zslDeleteRangeByScore
(
zs
->
zsl
,
range
,
zs
->
dict
);
deleted
=
zzlDeleteRangeByScore
(
zobj
,
range
);
if
(
htNeedsResize
(
zs
->
dict
))
dictResize
(
zs
->
dict
);
}
else
if
(
zobj
->
encoding
==
REDIS_ENCODING_RAW
)
{
if
(
dictSize
(
zs
->
dict
)
==
0
)
dbDelete
(
c
->
db
,
c
->
argv
[
1
]);
zset
*
zs
=
zobj
->
ptr
;
if
(
deleted
)
signalModifiedKey
(
c
->
db
,
c
->
argv
[
1
]);
deleted
=
zslDeleteRangeByScore
(
zs
->
zsl
,
range
,
zs
->
dict
);
if
(
htNeedsResize
(
zs
->
dict
))
dictResize
(
zs
->
dict
);
if
(
dictSize
(
zs
->
dict
)
==
0
)
dbDelete
(
c
->
db
,
key
);
}
else
{
redisPanic
(
"Unknown sorted set encoding"
);
}
if
(
deleted
)
signalModifiedKey
(
c
->
db
,
key
);
server
.
dirty
+=
deleted
;
server
.
dirty
+=
deleted
;
addReplyLongLong
(
c
,
deleted
);
addReplyLongLong
(
c
,
deleted
);
}
}
...
...
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