diff options
| author | unknown <serg@serg.mylan> | 2004-04-05 11:36:30 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-05 11:36:30 +0200 |
| commit | 76b882c272a8d25eedcf94d8382ca71fa95c436f (patch) | |
| tree | a3871d619a310292d639432e823085b68c31dec3 /myisam/ft_nlq_search.c | |
| parent | 43db12f631a487a9bca7d812e9adcfac6a2491d9 (diff) | |
| download | mariadb-git-76b882c272a8d25eedcf94d8382ca71fa95c436f.tar.gz | |
made fulltext search aware of concurrent inserts
Diffstat (limited to 'myisam/ft_nlq_search.c')
| -rw-r--r-- | myisam/ft_nlq_search.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index f426b88d77d..3ad983f0a37 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -85,8 +85,13 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) doc_cnt=0; - r=_mi_search(aio->info, aio->keyinfo, aio->keybuff, keylen, - SEARCH_FIND | SEARCH_PREFIX, aio->key_root); + for ( + r=_mi_search(aio->info, aio->keyinfo, aio->keybuff, keylen, + SEARCH_FIND | SEARCH_PREFIX, aio->key_root) ; + !r && aio->info->lastpos >= aio->info->state->data_file_length ; + r=_mi_search_next(aio->info, aio->keyinfo, aio->info->lastkey, + aio->info->lastkey_length, SEARCH_BIGGER, aio->key_root) + ); aio->info->update|= HA_STATE_AKTIV; /* for _mi_test_if_changed() */ while (!r && gweight) @@ -132,6 +137,11 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) r=_mi_search(aio->info, aio->keyinfo, aio->info->lastkey, aio->info->lastkey_length, SEARCH_BIGGER, aio->key_root); + + while (!r && aio->info->lastpos >= aio->info->state->data_file_length) + r=_mi_search(aio->info, aio->keyinfo, aio->info->lastkey, + aio->info->lastkey_length, SEARCH_BIGGER, + aio->key_root); } word->weight=gweight; |