Skip to content

Commit

Permalink
lf_hash_iterate() function
Browse files Browse the repository at this point in the history
  • Loading branch information
@vuvova
vuvova authored and Sergey Vojtovich committed Dec 28, 2014
1 parent 48430e4 commit 8883c54
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 17 deletions.
2 changes: 2 additions & 0 deletions include/lf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ void lf_hash_destroy(LF_HASH *hash);
int lf_hash_insert(LF_HASH *hash, LF_PINS *pins, const void *data);
void *lf_hash_search(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen);
int lf_hash_delete(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen);
int lf_hash_iterate(LF_HASH *hash, LF_PINS *pins,
my_hash_walk_action action, void *argument);
/*
shortcut macros to access underlying pinbox functions from an LF_HASH
see _lf_pinbox_get_pins() and _lf_pinbox_put_pins()
Expand Down
83 changes: 71 additions & 12 deletions mysys/lf_hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <my_global.h>
#include <m_string.h>
#include <my_sys.h>
#include <mysys_err.h>
#include <my_bit.h>
#include <lf.h>

Expand Down Expand Up @@ -57,27 +58,44 @@ typedef struct {
#define PTR(V) (LF_SLIST *)((V) & (~(intptr)1))
#define DELETED(V) ((V) & 1)

/*
DESCRIPTION
/** walk the list, searching for an element or invoking a callback
Search for hashnr/key/keylen in the list starting from 'head' and
position the cursor. The list is ORDER BY hashnr, key
RETURN
0 - not found
1 - found
@param head start walking the list from this node
@param cs charset for comparing keys, NULL if callback is used
@param hashnr hash number to search for
@param key key to search for OR data for the callback
@param keylen length of the key to compare, 0 if callback is used
@param cursor for returning the found element
@param pins see lf_alloc-pin.c
@param callback callback action, invoked for every element
NOTE
@note
cursor is positioned in either case
pins[0..2] are used, they are NOT removed on return
callback might see some elements twice (because of retries)
@return
if find: 0 - not found
1 - found
if callback:
0 - ok
1 - error (callbck returned 1)
*/
static int lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,
const uchar *key, uint keylen, CURSOR *cursor, LF_PINS *pins)
const uchar *key, uint keylen, CURSOR *cursor, LF_PINS *pins,
my_hash_walk_action callback)
{
uint32 cur_hashnr;
const uchar *cur_key;
uint cur_keylen;
intptr link;

DBUG_ASSERT(!cs || !callback); /* should not be set both */
DBUG_ASSERT(!keylen || !callback); /* should not be set both */

retry:
cursor->prev= (intptr *)head;
do { /* PTR() isn't necessary below, head is a dummy node */
Expand All @@ -102,7 +120,12 @@ static int lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,

if (!DELETED(link))
{
if (cur_hashnr >= hashnr)
if (unlikely(callback))
{
if (callback(cursor->curr + 1, (void*)key))
return 1;
}
else if (cur_hashnr >= hashnr)
{
int r= 1;
if (cur_hashnr > hashnr ||
Expand Down Expand Up @@ -153,7 +176,7 @@ static LF_SLIST *linsert(LF_SLIST * volatile *head, CHARSET_INFO *cs,
for (;;)
{
if (lfind(head, cs, node->hashnr, node->key, node->keylen,
&cursor, pins) &&
&cursor, pins, 0) &&
(flags & LF_HASH_UNIQUE))
{
res= 0; /* duplicate found */
Expand Down Expand Up @@ -204,7 +227,7 @@ static int ldelete(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,

for (;;)
{
if (!lfind(head, cs, hashnr, key, keylen, &cursor, pins))
if (!lfind(head, cs, hashnr, key, keylen, &cursor, pins, 0))
{
res= 1; /* not found */
break;
Expand All @@ -228,7 +251,7 @@ static int ldelete(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,
(to ensure the number of "set DELETED flag" actions
is equal to the number of "remove from the list" actions)
*/
lfind(head, cs, hashnr, key, keylen, &cursor, pins);
lfind(head, cs, hashnr, key, keylen, &cursor, pins, 0);
}
res= 0;
break;
Expand Down Expand Up @@ -259,7 +282,7 @@ static LF_SLIST *lsearch(LF_SLIST * volatile *head, CHARSET_INFO *cs,
LF_PINS *pins)
{
CURSOR cursor;
int res= lfind(head, cs, hashnr, key, keylen, &cursor, pins);
int res= lfind(head, cs, hashnr, key, keylen, &cursor, pins, 0);
if (res)
_lf_pin(pins, 2, cursor.curr);
else
Expand Down Expand Up @@ -462,6 +485,42 @@ void *lf_hash_search(LF_HASH *hash, LF_PINS *pins, const void *key, uint keylen)
return found ? found+1 : 0;
}


/**
Iterate over all elements in hash and call function with the element
@note
If one of 'action' invocations returns 1 the iteration aborts.
'action' might see some elements twice!
@retval 0 ok
@retval 1 error (action returned 1)
@retval EE_OUTOFMEMORY
*/
int lf_hash_iterate(LF_HASH *hash, LF_PINS *pins,
my_hash_walk_action action, void *argument)
{
CURSOR cursor;
uint bucket= 0;
int res;
LF_SLIST * volatile *el;

lf_rwlock_by_pins(pins);
el= _lf_dynarray_lvalue(&hash->array, bucket);
if (unlikely(!el))
return EE_OUTOFMEMORY;
if (*el == NULL && unlikely(initialize_bucket(hash, el, bucket, pins)))
return EE_OUTOFMEMORY;

res= lfind(el, 0, 0, (uchar*)argument, 0, &cursor, pins, action);

_lf_unpin(pins, 2);
_lf_unpin(pins, 1);
_lf_unpin(pins, 0);
lf_rwunlock_by_pins(pins);
return res;
}

static const uchar *dummy_key= (uchar*)"";

/*
Expand Down
23 changes: 18 additions & 5 deletions unittest/mysys/lf-t.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,18 @@ pthread_handler_t test_lf_alloc(void *arg)
return 0;
}

my_bool do_sum(void *num, void *acc)
{
*(int *)acc += *(int *)num;
return 0;
}


#define N_TLH 1000
pthread_handler_t test_lf_hash(void *arg)
{
int m= (*(int *)arg)/(2*N_TLH);
int32 x,y,z,sum= 0, ins= 0;
int32 x,y,z,sum= 0, ins= 0, scans= 0;
LF_PINS *pins;

if (with_my_thread_init)
Expand All @@ -138,6 +145,12 @@ pthread_handler_t test_lf_hash(void *arg)
sum+= z;
ins++;
}
else
{
int unused= 0;
lf_hash_iterate(&lf_hash, pins, do_sum, &unused);
scans++;
}
}
for (i= 0; i < N_TLH; i++)
{
Expand All @@ -154,9 +167,9 @@ pthread_handler_t test_lf_hash(void *arg)

if (--N == 0)
{
diag("%d mallocs, %d pins in stack, %d hash size, %d inserts",
diag("%d mallocs, %d pins in stack, %d hash size, %d inserts, %d scans",
lf_hash.alloc.mallocs, lf_hash.alloc.pinbox.pins_in_array,
lf_hash.size, inserts);
lf_hash.size, inserts, scans);
bad|= lf_hash.count;
}
if (!--running_threads) pthread_cond_signal(&cond);
Expand All @@ -181,12 +194,12 @@ void do_tests()
with_my_thread_init= 1;
test_concurrently("lf_pinbox (with my_thread_init)", test_lf_pinbox, N= THREADS, CYCLES);
test_concurrently("lf_alloc (with my_thread_init)", test_lf_alloc, N= THREADS, CYCLES);
test_concurrently("lf_hash (with my_thread_init)", test_lf_hash, N= THREADS, CYCLES/10);
test_concurrently("lf_hash (with my_thread_init)", test_lf_hash, N= THREADS, CYCLES);

with_my_thread_init= 0;
test_concurrently("lf_pinbox (without my_thread_init)", test_lf_pinbox, N= THREADS, CYCLES);
test_concurrently("lf_alloc (without my_thread_init)", test_lf_alloc, N= THREADS, CYCLES);
test_concurrently("lf_hash (without my_thread_init)", test_lf_hash, N= THREADS, CYCLES/10);
test_concurrently("lf_hash (without my_thread_init)", test_lf_hash, N= THREADS, CYCLES);

lf_hash_destroy(&lf_hash);
lf_alloc_destroy(&lf_allocator);
Expand Down

0 comments on commit 8883c54

Please sign in to comment.