database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

made fulltext search aware of concurrent inserts

Browse Source
This commit is contained in:
serg@serg.mylan
2004-04-05 11:36:30 +02:00
parent 56169c74d5
commit a6c6bfe7e9
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
myisam/ft_boolean_search.c
View File

@ -262,8 +262,14 @@ static void _ftb_init_index_search(FT_INFO *ftb)
else else
reset_tree(& ftb->no_dupes); reset_tree(& ftb->no_dupes);
} }
r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len, for (
SEARCH_FIND | SEARCH_BIGGER, keyroot); r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,
SEARCH_FIND | SEARCH_BIGGER, keyroot) ;
!r && info->lastpos >= info->state->data_file_length;
r=_mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length,
SEARCH_BIGGER, keyroot)
);
if (!r) if (!r)
{ {
r=_mi_compare_text(ftb->charset, r=_mi_compare_text(ftb->charset,
@ -488,8 +494,13 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record)
_ftb_climb_the_tree(ftb, ftbw, 0); _ftb_climb_the_tree(ftb, ftbw, 0);
/* update queue */ /* update queue */
r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY, for (
SEARCH_BIGGER , keyroot); r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY,
SEARCH_BIGGER, keyroot) ;
!r && info->lastpos >= info->state->data_file_length ;
r=_mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length,
SEARCH_BIGGER, keyroot)
);
if (!r) if (!r)
{ {
r=_mi_compare_text(ftb->charset, r=_mi_compare_text(ftb->charset,

14
myisam/ft_nlq_search.c
View File

@ -85,8 +85,13 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
doc_cnt=0; doc_cnt=0;
r=_mi_search(aio->info, aio->keyinfo, aio->keybuff, keylen, for (
SEARCH_FIND | SEARCH_PREFIX, aio->key_root); 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() */ aio->info->update|= HA_STATE_AKTIV; /* for _mi_test_if_changed() */
while (!r && gweight) 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, r=_mi_search(aio->info, aio->keyinfo, aio->info->lastkey,
aio->info->lastkey_length, SEARCH_BIGGER, aio->info->lastkey_length, SEARCH_BIGGER,
aio->key_root); 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; word->weight=gweight;