diff options
| -rw-r--r-- | include/ft_global.h | 1 | ||||
| -rw-r--r-- | myisam/ft_boolean_search.c | 5 | ||||
| -rw-r--r-- | myisam/ft_nlq_search.c | 5 | ||||
| -rw-r--r-- | myisam/ft_static.c | 4 |
4 files changed, 2 insertions, 13 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index f08b6cea6ab..9870e0854c1 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -35,7 +35,6 @@ struct _ft_vft { float (*find_relevance)(FT_INFO *, my_off_t, byte *); void (*close_search)(FT_INFO *); float (*get_relevance)(FT_INFO *); - my_off_t (*get_docid)(FT_INFO *); void (*reinit_search)(FT_INFO *); }; diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index da56cd51dce..bda76cb09a8 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -413,11 +413,6 @@ float ft_boolean_get_relevance(FT_INFO *ftb) return ftb->root->cur_weight; } -my_off_t ft_boolean_get_docid(FT_INFO *ftb) -{ - return HA_POS_ERROR; -} - void ft_boolean_reinit_search(FT_INFO *ftb) { _ftb_init_index_search(ftb); diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index a806361fc0a..75249a1432a 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -278,11 +278,6 @@ float ft_nlq_get_relevance(FT_INFO *handler) return handler->doc[handler->curdoc].weight; } -my_off_t ft_nlq_get_docid(FT_INFO *handler) -{ - return handler->doc[handler->curdoc].dpos; -} - void ft_nlq_reinit_search(FT_INFO *handler) { handler->curdoc=-1; diff --git a/myisam/ft_static.c b/myisam/ft_static.c index c9666ea5a65..2bf10c72414 100644 --- a/myisam/ft_static.c +++ b/myisam/ft_static.c @@ -49,11 +49,11 @@ const MI_KEYSEG ft_keysegs[FT_SEGS]={ const struct _ft_vft _ft_vft_nlq = { ft_nlq_read_next, ft_nlq_find_relevance, ft_nlq_close_search, - ft_nlq_get_relevance, ft_nlq_get_docid, ft_nlq_reinit_search + ft_nlq_get_relevance, ft_nlq_reinit_search }; const struct _ft_vft _ft_vft_boolean = { ft_boolean_read_next, ft_boolean_find_relevance, ft_boolean_close_search, - ft_boolean_get_relevance, ft_boolean_get_docid, ft_boolean_reinit_search + ft_boolean_get_relevance, ft_boolean_reinit_search }; FT_INFO *(*_ft_init_vft[2])(MI_INFO *, uint, byte *, uint, my_bool) = |