mirror of
https://github.com/fluencelabs/redis
synced 2025-03-25 11:51:03 +00:00
support dual encoding in LTRIM
This commit is contained in:
parent
a6dd455b09
commit
9ae6b0be4a
27
redis.c
27
redis.c
@ -5087,8 +5087,7 @@ static void ltrimCommand(redisClient *c) {
|
|||||||
|
|
||||||
if ((o = lookupKeyWriteOrReply(c,c->argv[1],shared.ok)) == NULL ||
|
if ((o = lookupKeyWriteOrReply(c,c->argv[1],shared.ok)) == NULL ||
|
||||||
checkType(c,o,REDIS_LIST)) return;
|
checkType(c,o,REDIS_LIST)) return;
|
||||||
list = o->ptr;
|
llen = lLength(o);
|
||||||
llen = listLength(list);
|
|
||||||
|
|
||||||
/* convert negative indexes */
|
/* convert negative indexes */
|
||||||
if (start < 0) start = llen+start;
|
if (start < 0) start = llen+start;
|
||||||
@ -5108,15 +5107,23 @@ static void ltrimCommand(redisClient *c) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Remove list elements to perform the trim */
|
/* Remove list elements to perform the trim */
|
||||||
for (j = 0; j < ltrim; j++) {
|
if (o->encoding == REDIS_ENCODING_ZIPLIST) {
|
||||||
ln = listFirst(list);
|
o->ptr = ziplistDeleteRange(o->ptr,0,ltrim);
|
||||||
listDelNode(list,ln);
|
o->ptr = ziplistDeleteRange(o->ptr,-rtrim,rtrim);
|
||||||
|
} else if (o->encoding == REDIS_ENCODING_LIST) {
|
||||||
|
list = o->ptr;
|
||||||
|
for (j = 0; j < ltrim; j++) {
|
||||||
|
ln = listFirst(list);
|
||||||
|
listDelNode(list,ln);
|
||||||
|
}
|
||||||
|
for (j = 0; j < rtrim; j++) {
|
||||||
|
ln = listLast(list);
|
||||||
|
listDelNode(list,ln);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
redisPanic("Unknown list encoding");
|
||||||
}
|
}
|
||||||
for (j = 0; j < rtrim; j++) {
|
if (lLength(o) == 0) deleteKey(c->db,c->argv[1]);
|
||||||
ln = listLast(list);
|
|
||||||
listDelNode(list,ln);
|
|
||||||
}
|
|
||||||
if (listLength(list) == 0) deleteKey(c->db,c->argv[1]);
|
|
||||||
server.dirty++;
|
server.dirty++;
|
||||||
addReply(c,shared.ok);
|
addReply(c,shared.ok);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user