mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
query expansion for fulltext search
myisam/ft_boolean_search.c: assert.h and queues.h moved to ftdefs.h myisam/ft_parser.c: ft_parse() with alloc myisam/ft_static.c: api changes, ft_max_word_len_for_sort variable removed myisam/ft_update.c: ft_parse() with alloc myisam/ftdefs.h: variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT api changes, ft_max_word_len_for_sort variable removed ft_parse() with alloc myisam/mi_check.c: variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT myisam/myisamchk.c: ft_max_word_len_for_sort removed mysql-test/r/fulltext.result: query expansion tests mysql-test/r/fulltext_var.result: ft_max_word_len_for_sort removed mysql-test/t/fulltext.test: query expansion tests sql/ha_myisam.h: ft api changes for query expansion sql/mysqld.cc: ft_max_word_len_for_sort removed ft_query_expansion_limit added sql/set_var.cc: ft_max_word_len_for_sort removed ft_query_expansion_limit added sql/sql_yacc.yy: EXPANSION added to keyword: rule
This commit is contained in:
@ -20,7 +20,7 @@
|
||||
|
||||
ulong ft_min_word_len=4;
|
||||
ulong ft_max_word_len=HA_FT_MAXLEN;
|
||||
ulong ft_max_word_len_for_sort=20;
|
||||
ulong ft_query_expansion_limit=5;
|
||||
const char *ft_boolean_syntax="+ -><()~*:\"\"&|";
|
||||
|
||||
const HA_KEYSEG ft_keysegs[FT_SEGS]={
|
||||
@ -53,14 +53,13 @@ const struct _ft_vft _ft_vft_boolean = {
|
||||
ft_boolean_get_relevance, ft_boolean_reinit_search
|
||||
};
|
||||
|
||||
FT_INFO *(*_ft_init_vft[2])(MI_INFO *, uint, byte *, uint, uint) =
|
||||
{ ft_init_nlq_search, ft_init_boolean_search };
|
||||
|
||||
FT_INFO *ft_init_search(uint flags, void *info, uint keynr,
|
||||
byte *query, uint query_len)
|
||||
byte *query, uint query_len, byte *record)
|
||||
{
|
||||
return (*_ft_init_vft[ flags&1 ])((MI_INFO *)info, keynr,
|
||||
query, query_len, flags);
|
||||
if (flags & FT_BOOL)
|
||||
ft_init_boolean_search((MI_INFO *)info, keynr, query, query_len);
|
||||
else
|
||||
ft_init_nlq_search((MI_INFO *)info, keynr, query, query_len, flags, record);
|
||||
}
|
||||
|
||||
const char *ft_stopword_file = 0;
|
||||
|
Reference in New Issue
Block a user