fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

dict.c: convert types to unsigned long where appropriate.

Browse Source 
No semantical changes since to make dict.c truly able to scale over the
32 bit table size limit, the hash function shoulds and other internals
related to hash function output should be 64 bit ready.
This commit is contained in:
antirez 2015-03-27 10:14:52 +01:00
parent 9cd8333ed2
commit 068d3c9737
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dict.c
View File

@ -687,10 +687,10 @@ dictEntry *dictGetRandomKey(dict *d)
* statistics. However the function is much faster than dictGetRandomKey() * statistics. However the function is much faster than dictGetRandomKey()
* at producing N elements. */ * at producing N elements. */
unsigned int dictGetSomeKeys(dict *d, dictEntry **des, unsigned int count) { unsigned int dictGetSomeKeys(dict *d, dictEntry **des, unsigned int count) {
unsigned int j; /* internal hash table id, 0 or 1. */ unsigned long j; /* internal hash table id, 0 or 1. */
unsigned int tables; /* 1 or 2 tables? */ unsigned long tables; /* 1 or 2 tables? */
unsigned int stored = 0, maxsizemask; unsigned long stored = 0, maxsizemask;
unsigned int maxsteps; unsigned long maxsteps;
if (dictSize(d) < count) count = dictSize(d); if (dictSize(d) < count) count = dictSize(d);
maxsteps = count*10; maxsteps = count*10;
@ -709,14 +709,14 @@ unsigned int dictGetSomeKeys(dict *d, dictEntry **des, unsigned int count) {
maxsizemask = d->ht[1].sizemask; maxsizemask = d->ht[1].sizemask;
/* Pick a random point inside the larger table. */ /* Pick a random point inside the larger table. */
unsigned int i = random() & maxsizemask; unsigned long i = random() & maxsizemask;
unsigned int emptylen = 0; /* Continuous empty entries so far. */ unsigned long emptylen = 0; /* Continuous empty entries so far. */
while(stored < count && maxsteps--) { while(stored < count && maxsteps--) {
for (j = 0; j < tables; j++) { for (j = 0; j < tables; j++) {
/* Invariant of the dict.c rehashing: up to the indexes already /* Invariant of the dict.c rehashing: up to the indexes already
* visited in ht[0] during the rehashing, there are no populated * visited in ht[0] during the rehashing, there are no populated
* buckets, so we can skip ht[0] for indexes between 0 and idx-1. */ * buckets, so we can skip ht[0] for indexes between 0 and idx-1. */
if (tables == 2 && j == 0 && i < (unsigned int) d->rehashidx) { if (tables == 2 && j == 0 && i < (unsigned long) d->rehashidx) {
/* Moreover, if we are currently out of range in the second /* Moreover, if we are currently out of range in the second
* table, there will be no elements in both tables up to * table, there will be no elements in both tables up to
* the current rehashing index, so we jump if possible. * the current rehashing index, so we jump if possible.