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

yet another trunc* bug

Browse Source
This commit is contained in:
unknown
2003-11-20 23:15:07 +01:00
parent d54e1be66b
commit 722a4cc5d6
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
myisam/ft_boolean_search.c
View File

@@ -62,11 +62,12 @@ typedef struct st_ftb_expr FTB_EXPR;
struct st_ftb_expr struct st_ftb_expr
{ {
FTB_EXPR *up; FTB_EXPR *up;
byte *quot, *qend;
float weight; float weight;
uint flags; uint flags;
my_off_t docid[2]; /* for index search and for scan */ my_off_t docid[2];
/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
float cur_weight; float cur_weight;
byte *quot, *qend;
int yesses; /* number of "yes" words matched */ int yesses; /* number of "yes" words matched */
int nos; /* number of "no" words matched */ int nos; /* number of "no" words matched */
int ythresh; /* number of "yes" words in expr */ int ythresh; /* number of "yes" words in expr */
@@ -78,7 +79,8 @@ typedef struct st_ftb_word
FTB_EXPR *up; FTB_EXPR *up;
float weight; float weight;
uint flags; uint flags;
my_off_t docid[2]; /* for index search and for scan */ my_off_t docid[2];
/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
uint ndepth; uint ndepth;
int len; int len;
/* ... docid cache can be added here. SerG */ /* ... docid cache can be added here. SerG */
@@ -217,13 +219,15 @@ static void _ftb_init_index_search(FT_INFO *ftb)
if (ftbw->flags & FTB_FLAG_TRUNC) if (ftbw->flags & FTB_FLAG_TRUNC)
{ {
/* /*
special treatment for truncation operator :(( special treatment for truncation operator
1. +trunc* and there're other (not +trunc*) words 1. there are some (besides this) +words
| no need to search in the index, it can never ADD new rows | no need to search in the index, it can never ADD new rows
| to the result, and to remove half-matched rows we do scan anyway | to the result, and to remove half-matched rows we do scan anyway
2. -trunc* 2. -trunc*
| same as 1. | same as 1.
3. trunc* 3. in 1 and 2, +/- need not be on the same expr. level,
but can be on any upper level, as in +word +(trunc1* trunc2*)
4. otherwise
| We have to index-search for this prefix. | We have to index-search for this prefix.
| It may cause duplicates, as in the index (sorted by <word,docid>) | It may cause duplicates, as in the index (sorted by <word,docid>)
| <aaaa,row1> | <aaaa,row1>
@@ -231,23 +235,32 @@ static void _ftb_init_index_search(FT_INFO *ftb)
| <aacc,row1> | <aacc,row1>
| Searching for "aa*" will find row1 twice... | Searching for "aa*" will find row1 twice...
*/ */
if ( test(ftbw->flags&FTB_FLAG_NO) || /* 2 */ FTB_EXPR *ftbe;
(test(ftbw->flags&FTB_FLAG_YES) && /* 1 */ for (ftbe=(FTB_EXPR*)ftbw;
ftbw->up->ythresh - ftbw->up->yweaks >1)) /* 1 */ ftbe->up && !(ftbe->up->flags & FTB_FLAG_TRUNC);
ftbe->up->flags|= FTB_FLAG_TRUNC, ftbe=ftbe->up)
{ {
if (ftbe->flags & FTB_FLAG_NO || /* 2 */
ftbe->up->ythresh - ftbe->up->yweaks >1) /* 1 */
{
FTB_EXPR *top_ftbe=ftbe->up->up;
ftbw->docid[0]=HA_POS_ERROR; ftbw->docid[0]=HA_POS_ERROR;
ftbw->up->yweaks++; for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)
continue; if (ftbe->flags & FTB_FLAG_YES)
ftbe->yweaks++;
ftbe=0;
break;
} }
else /* 3 */ }
{ if (!ftbe)
continue;
/* 3 */
if (!is_tree_inited(& ftb->no_dupes)) if (!is_tree_inited(& ftb->no_dupes))
init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t), init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),
_ftb_no_dupes_cmp,0,0,0); _ftb_no_dupes_cmp,0,0,0);
else else
reset_tree(& ftb->no_dupes); reset_tree(& ftb->no_dupes);
} }
}
r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len, r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,
SEARCH_FIND | SEARCH_BIGGER, keyroot); SEARCH_FIND | SEARCH_BIGGER, keyroot);
if (!r) if (!r)

3
mysql-test/r/fulltext.result
View File

@@ -147,6 +147,9 @@ aaa20 bbb15
aaa30 bbb10 aaa30 bbb10
select * from t1 where match a against ("+aaa* +ccc*" in boolean mode); select * from t1 where match a against ("+aaa* +ccc*" in boolean mode);
a a
select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);
a
aaa10 bbb20
drop table t1; drop table t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
id int(11), id int(11),

1
mysql-test/t/fulltext.test
View File

@@ -78,6 +78,7 @@ insert t1 values ("aaa10 bbb20"), ("aaa20 bbb15"), ("aaa30 bbb10");
select * from t1 where match a against ("+aaa* +bbb*" in boolean mode); select * from t1 where match a against ("+aaa* +bbb*" in boolean mode);
select * from t1 where match a against ("+aaa* +bbb1*" in boolean mode); select * from t1 where match a against ("+aaa* +bbb1*" in boolean mode);
select * from t1 where match a against ("+aaa* +ccc*" in boolean mode); select * from t1 where match a against ("+aaa* +ccc*" in boolean mode);
select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);
drop table t1; drop table t1;
# #