Skip to content

draft: make dict a fully concrete, transparent set of map helpers for hashtable, removing dict elements where redundant #3720

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

Draft
rainsupreme wants to merge 4 commits into
base: unstable
Choose a base branch
from
Draft

draft: make dict a fully concrete, transparent set of map helpers for hashtable, removing dict elements where redundant #3720

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9217d8
eliminate dictSetKey (use dictAddRaw to avoid post-insert key mutation)
rainsupreme May 14, 2026
1244ed5
dict: remove accessor wrappers, access dictEntry fields directly
rainsupreme May 14, 2026
b4d6efb
dict.h: replace Redis BSD boilerplate with Valkey SPDX header
rainsupreme May 14, 2026
d507179
dict: remove dict/dictType/dictIterator typedefs, use hashtable types…
rainsupreme May 14, 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
2 changes: 1 addition & 1 deletion src/aof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2332,7 +2332,7 @@ static int rewriteFunctions(rio *aof) {
dictIterator *iter = dictGetIterator(functions);
dictEntry *entry = NULL;
while ((entry = dictNext(iter))) {
functionLibInfo *li = dictGetVal(entry);
functionLibInfo *li = entry->v.val;
if (rioWrite(aof, "*3\r\n", 4) == 0) goto werr;
char function_load[] = "$8\r\nFUNCTION\r\n$4\r\nLOAD\r\n";
if (rioWrite(aof, function_load, sizeof(function_load) - 1) == 0) goto werr;
Expand Down
18 changes: 9 additions & 9 deletions src/blocked.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,23 +457,23 @@ void blockForKeys(client *c, int btype, robj **keys, int numkeys, mstime_t timeo
/* In case key[j] did not have blocking clients yet, we need to create a new list */
if (db_blocked_entry != NULL) {
l = listCreate();
dictSetVal(c->db->blocking_keys, db_blocked_entry, l);
db_blocked_entry->v.val = l;
incrRefCount(keys[j]);
} else {
l = dictGetVal(db_blocked_existing_entry);
l = db_blocked_existing_entry->v.val;
}
listAddNodeTail(l, c);
dictSetVal(c->bstate->keys, client_blocked_entry, listLast(l));
client_blocked_entry->v.val = listLast(l);

/* We need to add the key to blocking_keys_unblock_on_nokey, if the client
* wants to be awakened if key is deleted (like XREADGROUP) */
if (unblock_on_nokey) {
db_blocked_entry = dictAddRaw(c->db->blocking_keys_unblock_on_nokey, keys[j], &db_blocked_existing_entry);
if (db_blocked_entry) {
incrRefCount(keys[j]);
dictSetUnsignedIntegerVal(db_blocked_entry, 1);
db_blocked_entry->v.u64 = 1;
} else {
dictIncrUnsignedIntegerVal(db_blocked_existing_entry, 1);
db_blocked_existing_entry->v.u64 += 1;
}
}
}
Expand Down Expand Up @@ -582,8 +582,8 @@ static void releaseBlockedEntry(client *c, dictEntry *de, int remove_key) {
void *key;
dictEntry *unblock_on_nokey_entry;

key = dictGetKey(de);
pos = dictGetVal(de);
key = de->key;
pos = de->v.val;
/* Remove this client from the list of clients waiting for this key. */
l = dictFetchValue(c->db->blocking_keys, key);
serverAssertWithInfo(c, key, l != NULL);
Expand All @@ -602,7 +602,7 @@ static void releaseBlockedEntry(client *c, dictEntry *de, int remove_key) {
unblock_on_nokey_entry = dictFind(c->db->blocking_keys_unblock_on_nokey, key);
/* it is not possible to have a client blocked on nokey with no matching entry */
serverAssertWithInfo(c, key, unblock_on_nokey_entry != NULL);
if (!dictIncrUnsignedIntegerVal(unblock_on_nokey_entry, -1)) {
if (!--unblock_on_nokey_entry->v.u64) {
/* in case the count is zero, we can delete the entry */
dictDelete(c->db->blocking_keys_unblock_on_nokey, key);
}
Expand All @@ -627,7 +627,7 @@ static void handleClientsBlockedOnKey(readyList *rl) {
dictEntry *de = dictFind(rl->db->blocking_keys, rl->key);

if (de) {
list *clients = dictGetVal(de);
list *clients = de->v.val;
listNode *ln;
listIter li;
listRewind(clients, &li);
Expand Down
10 changes: 5 additions & 5 deletions src/cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,10 @@ migrateCachedSocket *migrateGetSocket(client *c, robj *host, robj *port, long ti
if (dictSize(server.migrate_cached_sockets) == MIGRATE_SOCKET_CACHE_ITEMS) {
/* Too many items, drop one at random. */
dictEntry *de = dictGetRandomKey(server.migrate_cached_sockets);
cs = dictGetVal(de);
cs = de->v.val;
connClose(cs->conn);
zfree(cs);
dictDelete(server.migrate_cached_sockets, dictGetKey(de));
dictDelete(server.migrate_cached_sockets, de->key);
}

/* Create the connection */
Expand Down Expand Up @@ -409,12 +409,12 @@ void migrateCloseTimedoutSockets(void) {
dictEntry *de;

while ((de = dictNext(di)) != NULL) {
migrateCachedSocket *cs = dictGetVal(de);
migrateCachedSocket *cs = de->v.val;

if ((server.unixtime - cs->last_use_time) > MIGRATE_SOCKET_CACHE_TTL) {
connClose(cs->conn);
zfree(cs);
dictDelete(server.migrate_cached_sockets, dictGetKey(de));
dictDelete(server.migrate_cached_sockets, de->key);
}
}
dictReleaseIterator(di);
Expand Down Expand Up @@ -1371,7 +1371,7 @@ int clusterRedirectBlockedClientIfNeeded(client *c) {
/* All keys must belong to the same slot, so check first key only. */
di = dictGetIterator(c->bstate->keys);
if ((de = dictNext(di)) != NULL) {
robj *key = dictGetKey(de);
robj *key = de->key;
int slot = keyHashSlot((char *)objectGetVal(key), sdslen(objectGetVal(key)));
serverAssert(slot == c->slot);
clusterNode *node = getNodeBySlot(slot);
Expand Down
Loading
Loading