Remove check leading to duplicate branches (#8398)

Remove check leading to duplicate branches and unused withscores parameter
This commit is contained in:
Vladimir Maksimovski 2021-01-26 05:58:03 +01:00 committed by GitHub
parent 951d25ff66
commit 70789cf4bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 offset, zrangespec *range, robj *zobj, long offset, long limit,
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,
} }
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
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: