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
70789cf4
Unverified
Commit
70789cf4
authored
Jan 26, 2021
by
Vladimir Maksimovski
Committed by
GitHub
Jan 25, 2021
Browse files
Remove check leading to duplicate branches (#8398)
Remove check leading to duplicate branches and unused withscores parameter
parent
951d25ff
Changes
1
Show whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
70789cf4
...
@@ -3073,8 +3073,8 @@ void zrevrangeCommand(client *c) {
...
@@ -3073,8 +3073,8 @@ void zrevrangeCommand(client *c) {
/* This command implements ZRANGEBYSCORE, ZREVRANGEBYSCORE. */
/* This command implements ZRANGEBYSCORE, ZREVRANGEBYSCORE. */
void
genericZrangebyscoreCommand
(
zrange_result_handler
*
handler
,
void
genericZrangebyscoreCommand
(
zrange_result_handler
*
handler
,
zrangespec
*
range
,
robj
*
zobj
,
int
withscores
,
long
offse
t
,
zrangespec
*
range
,
robj
*
zobj
,
long
offset
,
long
limi
t
,
long
limit
,
int
reverse
)
{
int
reverse
)
{
client
*
c
=
handler
->
client
;
client
*
c
=
handler
->
client
;
unsigned
long
rangelen
=
0
;
unsigned
long
rangelen
=
0
;
...
@@ -3174,8 +3174,7 @@ void genericZrangebyscoreCommand(zrange_result_handler *handler,
...
@@ -3174,8 +3174,7 @@ void genericZrangebyscoreCommand(zrange_result_handler *handler,
}
}
rangelen
++
;
rangelen
++
;
handler
->
emitResultFromCBuffer
(
handler
,
ln
->
ele
,
sdslen
(
ln
->
ele
),
handler
->
emitResultFromCBuffer
(
handler
,
ln
->
ele
,
sdslen
(
ln
->
ele
),
ln
->
score
);
((
withscores
)
?
ln
->
score
:
ln
->
score
));
/* Move to next node */
/* Move to next node */
if
(
reverse
)
{
if
(
reverse
)
{
...
@@ -3626,8 +3625,8 @@ void zrangeGenericCommand(zrange_result_handler *handler, int argc_start, int st
...
@@ -3626,8 +3625,8 @@ void zrangeGenericCommand(zrange_result_handler *handler, int argc_start, int st
break
;
break
;
case
ZRANGE_SCORE
:
case
ZRANGE_SCORE
:
genericZrangebyscoreCommand
(
handler
,
&
range
,
zobj
,
opt_
withscores
||
store
,
genericZrangebyscoreCommand
(
handler
,
&
range
,
zobj
,
opt_
offset
,
opt_offset
,
opt_limit
,
direction
==
ZRANGE_DIRECTION_REVERSE
);
opt_limit
,
direction
==
ZRANGE_DIRECTION_REVERSE
);
break
;
break
;
case
ZRANGE_LEX
:
case
ZRANGE_LEX
:
...
...
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