mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use primes right in the hash table

Browse source 
git-svn-id: file:///svn/tokudb@128 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2007-08-13 22:13:40 +00:00
parent 8ae9b13b8e
commit 0d4231e0b2
1 changed files with 7 additions and 4 deletions

11
newbrt/hashtable.c
View file

@ -53,7 +53,10 @@ int toku_hash_find (HASHTABLE tab, bytevec key, ITEMLEN keylen, bytevec *data, I
} }
} }
int toku_hash_rehash_everything (HASHTABLE tab, unsigned int newarraysize) { int toku_hash_rehash_everything (HASHTABLE tab, unsigned int primeindexdelta) {
int newprimeindex = primeindexdelta+tab->primeidx;
assert(newprimeindex>=0);
unsigned int newarraysize = get_prime(newprimeindex);
HASHELT *newarray = toku_calloc(newarraysize, sizeof(*tab->array)); HASHELT *newarray = toku_calloc(newarraysize, sizeof(*tab->array));
unsigned int i; unsigned int i;
assert(newarray!=0); assert(newarray!=0);
@ -102,7 +105,7 @@ int toku_hash_insert (HASHTABLE tab, const void *key, ITEMLEN keylen, const void
tab->array[h]=he; tab->array[h]=he;
tab->n_keys++; tab->n_keys++;
if (tab->n_keys > tab->arraysize) { if (tab->n_keys > tab->arraysize) {
return toku_hash_rehash_everything(tab, tab->arraysize*2); return toku_hash_rehash_everything(tab, +1);
} }
return BRT_OK; return BRT_OK;
} }
@ -121,8 +124,8 @@ int toku_hash_delete (HASHTABLE tab, const void *key, ITEMLEN keylen) {
toku_free_n(he, sizeof(*he)+he->keylen+he->vallen); toku_free_n(he, sizeof(*he)+he->keylen+he->vallen);
tab->n_keys--; tab->n_keys--;
if ((tab->n_keys * 4 < tab->arraysize) && tab->arraysize>4) { if ((tab->n_keys * 4 < tab->arraysize) && tab->primeidx>0) {
return toku_hash_rehash_everything(tab, tab->arraysize/2); return toku_hash_rehash_everything(tab, -1);
} }
return BRT_OK; return BRT_OK;
} }