Skip to content

Optimize SREM/ZREM/HDEL to pause auto shrink when deleting multiple items #3144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enjoy-binbin merged 5 commits into from
Feb 3, 2026
+7 −0
Merged

Optimize SREM/ZREM/HDEL to pause auto shrink when deleting multiple items #3144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abe64b3
Pause auto shrink in ZREM and SREM commands
enjoy-binbin Feb 1, 2026
a3687e4
Update src/t_zset.c
enjoy-binbin Feb 2, 2026
cd27928
Remove the notifications changes
enjoy-binbin Feb 3, 2026
c21690b
Remove ueseless change
enjoy-binbin Feb 3, 2026
5d74a8f
Add it to hdel as well
enjoy-binbin Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/t_set.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,20 +625,25 @@ void sremCommand(client *c) {

if ((set = lookupKeyWriteOrReply(c, c->argv[1], shared.czero)) == NULL || checkType(c, set, OBJ_SET)) return;

if (set->encoding == OBJ_ENCODING_HASHTABLE) hashtablePauseAutoShrink(objectGetVal(set));
for (j = 2; j < c->argc; j++) {
if (setTypeRemove(set, objectGetVal(c->argv[j]))) {
deleted++;
if (setTypeSize(set) == 0) {
dbDelete(c->db, c->argv[1]);
keyremoved = 1;
break;
}
}
}
if (set->encoding == OBJ_ENCODING_HASHTABLE) hashtableResumeAutoShrink(objectGetVal(set));

if (deleted) {
signalModifiedKey(c, c->db, c->argv[1]);
notifyKeyspaceEvent(NOTIFY_SET, "srem", c->argv[1], c->db->id);
if (keyremoved) notifyKeyspaceEvent(NOTIFY_GENERIC, "del", c->argv[1], c->db->id);
if (keyremoved) {
dbDelete(c->db, c->argv[1]);
notifyKeyspaceEvent(NOTIFY_GENERIC, "del", c->argv[1], c->db->id);
}
server.dirty += deleted;
}
addReplyLongLong(c, deleted);
Expand Down
15 changes: 10 additions & 5 deletions src/t_zset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,18 +1933,22 @@ void zremCommand(client *c) {

if ((zobj = lookupKeyWriteOrReply(c, key, shared.czero)) == NULL || checkType(c, zobj, OBJ_ZSET)) return;

if (zobj->encoding == OBJ_ENCODING_SKIPLIST) hashtablePauseAutoShrink(((zset *)objectGetVal(zobj))->ht);
for (j = 2; j < c->argc; j++) {
if (zsetDel(zobj, objectGetVal(c->argv[j]))) deleted++;
if (zsetLength(zobj) == 0) {
dbDelete(c->db, key);
keyremoved = 1;
break;
}
}
if (zobj->encoding == OBJ_ENCODING_SKIPLIST) hashtableResumeAutoShrink(((zset *)objectGetVal(zobj))->ht);

if (deleted) {
notifyKeyspaceEvent(NOTIFY_ZSET, "zrem", key, c->db->id);
if (keyremoved) notifyKeyspaceEvent(NOTIFY_GENERIC, "del", key, c->db->id);
if (keyremoved) {
dbDelete(c->db, key);
notifyKeyspaceEvent(NOTIFY_GENERIC, "del", key, c->db->id);
}
signalModifiedKey(c, c->db, key);
server.dirty += deleted;
}
Expand Down Expand Up @@ -2019,7 +2023,6 @@ void zremrangeGenericCommand(client *c, zrange_type rangetype) {
case ZRANGE_LEX: objectSetVal(zobj, zzlDeleteRangeByLex(objectGetVal(zobj), &lexrange, &deleted)); break;
}
if (zzlLength(objectGetVal(zobj)) == 0) {
dbDelete(c->db, key);
keyremoved = 1;
}
} else if (zobj->encoding == OBJ_ENCODING_SKIPLIST) {
Expand All @@ -2033,7 +2036,6 @@ void zremrangeGenericCommand(client *c, zrange_type rangetype) {
}
hashtableResumeAutoShrink(zs->ht);
if (hashtableSize(zs->ht) == 0) {
dbDelete(c->db, key);
keyremoved = 1;
}
} else {
Expand All @@ -2044,7 +2046,10 @@ void zremrangeGenericCommand(client *c, zrange_type rangetype) {
if (deleted) {
signalModifiedKey(c, c->db, key);
notifyKeyspaceEvent(NOTIFY_ZSET, notify_type, key, c->db->id);
if (keyremoved) notifyKeyspaceEvent(NOTIFY_GENERIC, "del", key, c->db->id);
if (keyremoved) {
dbDelete(c->db, key);
notifyKeyspaceEvent(NOTIFY_GENERIC, "del", key, c->db->id);
}
server.dirty += deleted;
}
addReplyLongLong(c, deleted);
Expand Down
Loading