Commit bfc6a29d authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

cleanup

parent e3849552

include/ft_global.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);

};

myisam/ft_boolean_search.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

myisam/ft_nlq_search.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

myisam/ft_static.c

+2 −2
Original line number Diff line number Diff line
@@ -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) =