diff options
| author | unknown <serg@serg.mylan> | 2003-10-23 15:21:06 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-23 15:21:06 +0200 |
| commit | aa98f58bae74bc25a557d146b7a1bae80217c342 (patch) | |
| tree | 2ce015b91940f6ae6e70f56ba571010c4c8eb3f0 /myisam/ftdefs.h | |
| parent | fd85cc84e4cad1f40e09af35265f47cf57750c49 (diff) | |
| download | mariadb-git-aa98f58bae74bc25a557d146b7a1bae80217c342.tar.gz | |
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
Diffstat (limited to 'myisam/ftdefs.h')
| -rw-r--r-- | myisam/ftdefs.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h index 2079a60f47d..a97485ec021 100644 --- a/myisam/ftdefs.h +++ b/myisam/ftdefs.h @@ -21,11 +21,15 @@ #include "fulltext.h" #include <m_ctype.h> #include <my_tree.h> +#include <queues.h> +#include <assert.h> #define true_word_char(s,X) (my_isalnum(s,X) || (X)=='_') #define misc_word_char(X) ((X)=='\'') #define word_char(s,X) (true_word_char(s,X) || misc_word_char(X)) +#define FT_MAX_WORD_LEN_FOR_SORT 20 + #define COMPILE_STOPWORDS_IN /* Interested readers may consult SMART @@ -122,13 +126,15 @@ void _mi_ft_segiterator_dummy_init(const byte *, uint, FT_SEG_ITERATOR *); uint _mi_ft_segiterator(FT_SEG_ITERATOR *); void ft_parse_init(TREE *, CHARSET_INFO *); -int ft_parse(TREE *, byte *, int); +int ft_parse(TREE *, byte *, int, my_bool); FT_WORD * ft_linearize(TREE *); FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, const byte *); -uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record); +uint _mi_ft_parse(TREE *, MI_INFO *, uint, const byte *, my_bool); + +FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, uint, byte *); +FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint); extern const struct _ft_vft _ft_vft_nlq; -FT_INFO *ft_init_nlq_search(MI_INFO *, uint, byte *, uint, uint); int ft_nlq_read_next(FT_INFO *, char *); float ft_nlq_find_relevance(FT_INFO *, byte *, uint); void ft_nlq_close_search(FT_INFO *); @@ -137,10 +143,10 @@ my_off_t ft_nlq_get_docid(FT_INFO *); void ft_nlq_reinit_search(FT_INFO *); extern const struct _ft_vft _ft_vft_boolean; -FT_INFO *ft_init_boolean_search(MI_INFO *, uint, byte *, uint, uint); int ft_boolean_read_next(FT_INFO *, char *); float ft_boolean_find_relevance(FT_INFO *, byte *, uint); void ft_boolean_close_search(FT_INFO *); float ft_boolean_get_relevance(FT_INFO *); my_off_t ft_boolean_get_docid(FT_INFO *); void ft_boolean_reinit_search(FT_INFO *); + |