diff options
| author | unknown <serg@serg.mysql.com> | 2002-02-26 12:42:22 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-02-26 12:42:22 +0000 |
| commit | d80d1797b5ec61a8822b76ea47bb04d69e6c54c3 (patch) | |
| tree | 05767aa0b4e0ba92fe53b4003779eed04af5382c /myisam/ft_boolean_search.c | |
| parent | 4f861c22dee84ceff11c16c667f3cb044cf2a739 (diff) | |
| download | mariadb-git-d80d1797b5ec61a8822b76ea47bb04d69e6c54c3.tar.gz | |
ft_boolean_search - minor simplification
manual: News updated
Docs/manual.texi:
News updated
myisam/ft_boolean_search.c:
algorithm (somewhat) simplified
Diffstat (limited to 'myisam/ft_boolean_search.c')
| -rw-r--r-- | myisam/ft_boolean_search.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index e0ec5d0a906..e4f8d474236 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -96,7 +96,7 @@ int FTB_WORD_cmp(void *v __attribute__((unused)), byte *a, byte *b) } void _ftb_parse_query(FTB *ftb, byte **start, byte *end, - FTB_EXPR *up, uint ndepth, uint depth) + FTB_EXPR *up, uint depth) { byte res; FTB_PARAM param; @@ -125,7 +125,7 @@ void _ftb_parse_query(FTB *ftb, byte **start, byte *end, ftbw->weight=weight; ftbw->up=up; ftbw->docid=HA_POS_ERROR; - ftbw->ndepth= param.yesno<0 ? depth : ndepth; + ftbw->ndepth= (param.yesno<0) + depth; memcpy(ftbw->word+1, w.pos, w.len); ftbw->word[0]=w.len; if (ftbw->yesno > 0) up->ythresh++; @@ -139,8 +139,7 @@ void _ftb_parse_query(FTB *ftb, byte **start, byte *end, ftbe->ythresh=0; ftbe->docid=HA_POS_ERROR; if (ftbe->yesno > 0) up->ythresh++; - _ftb_parse_query(ftb, start, end, ftbe, depth+1, - (param.yesno<0 ? depth+1 : ndepth)); + _ftb_parse_query(ftb, start, end, ftbe, depth+1); break; case 3: /* right bracket */ return; @@ -224,7 +223,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, ftbe->ythresh=0; ftbe->docid=HA_POS_ERROR; ftb->root=ftbe; - _ftb_parse_query(ftb, &query, query+query_len, ftbe, 0, 0); + _ftb_parse_query(ftb, &query, query+query_len, ftbe, 0); ftb->state=READY; return ftb; } |