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
80181f78
Commit
80181f78
authored
Nov 28, 2009
by
antirez
Browse files
Implemented LIMIT option in ZRANGEBYSCORE. We now enter feature-freeze
parent
d799af31
Changes
3
Hide whitespace changes
Inline
Side-by-side
TODO
View file @
80181f78
...
...
@@ -8,6 +8,7 @@ Most of the features already implemented for this release. The following is a li
* Man pages for SRANDMEMBER, missing Z-commands, ...
* Write docs for the "STORE" operaiton of SORT. Link to the article about SORT by written by defunkt.
* ZRANGEBYSCORE LIMIT option and test.
* check the command table for deny on OOM correctness.
VERSION 1.4 TODO (Hash type)
============================
...
...
redis-cli.c
View file @
80181f78
...
...
@@ -97,7 +97,7 @@ static struct redisCommand cmdTable[] = {
{
"zrem"
,
3
,
REDIS_CMD_BULK
},
{
"zremrangebyscore"
,
4
,
REDIS_CMD_INLINE
},
{
"zrange"
,
4
,
REDIS_CMD_INLINE
},
{
"zrangebyscore"
,
4
,
REDIS_CMD_INLINE
},
{
"zrangebyscore"
,
-
4
,
REDIS_CMD_INLINE
},
{
"zrevrange"
,
4
,
REDIS_CMD_INLINE
},
{
"zcard"
,
2
,
REDIS_CMD_INLINE
},
{
"zscore"
,
3
,
REDIS_CMD_BULK
},
...
...
redis.c
View file @
80181f78
...
...
@@ -521,7 +521,7 @@ static struct redisCommand cmdTable[] = {
{
"zrem"
,
zremCommand
,
3
,
REDIS_CMD_BULK
},
{
"zremrangebyscore"
,
zremrangebyscoreCommand
,
4
,
REDIS_CMD_INLINE
},
{
"zrange"
,
zrangeCommand
,
4
,
REDIS_CMD_INLINE
},
{
"zrangebyscore"
,
zrangebyscoreCommand
,
4
,
REDIS_CMD_INLINE
},
{
"zrangebyscore"
,
zrangebyscoreCommand
,
-
4
,
REDIS_CMD_INLINE
},
{
"zrevrange"
,
zrevrangeCommand
,
4
,
REDIS_CMD_INLINE
},
{
"zcard"
,
zcardCommand
,
2
,
REDIS_CMD_INLINE
},
{
"zscore"
,
zscoreCommand
,
3
,
REDIS_CMD_BULK
|
REDIS_CMD_DENYOOM
},
...
...
@@ -4559,6 +4559,18 @@ static void zrangebyscoreCommand(redisClient *c) {
robj
*
o
;
double
min
=
strtod
(
c
->
argv
[
2
]
->
ptr
,
NULL
);
double
max
=
strtod
(
c
->
argv
[
3
]
->
ptr
,
NULL
);
int
offset
=
0
,
limit
=
-
1
;
if
(
c
->
argc
!=
4
&&
c
->
argc
!=
7
)
{
addReplySds
(
c
,
sdsnew
(
"-ERR wrong number of arguments
\r\n
"
));
return
;
}
else
if
(
c
->
argc
==
7
&&
strcasecmp
(
c
->
argv
[
4
]
->
ptr
,
"limit"
))
{
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
else
if
(
c
->
argc
==
7
)
{
offset
=
atoi
(
c
->
argv
[
5
]
->
ptr
);
limit
=
atoi
(
c
->
argv
[
6
]
->
ptr
);
}
o
=
lookupKeyRead
(
c
->
db
,
c
->
argv
[
1
]);
if
(
o
==
NULL
)
{
...
...
@@ -4590,12 +4602,19 @@ static void zrangebyscoreCommand(redisClient *c) {
decrRefCount
(
lenobj
);
while
(
ln
&&
ln
->
score
<=
max
)
{
if
(
offset
)
{
offset
--
;
ln
=
ln
->
forward
[
0
];
continue
;
}
if
(
limit
==
0
)
break
;
ele
=
ln
->
obj
;
addReplyBulkLen
(
c
,
ele
);
addReply
(
c
,
ele
);
addReply
(
c
,
shared
.
crlf
);
ln
=
ln
->
forward
[
0
];
rangelen
++
;
if
(
limit
>
0
)
limit
--
;
}
lenobj
->
ptr
=
sdscatprintf
(
sdsempty
(),
"*%d
\r\n
"
,
rangelen
);
}
...
...
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