svnno****@sourc*****
svnno****@sourc*****
2007年 10月 10日 (水) 12:40:55 JST
Revision: 27 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=27 Author: mir Date: 2007-10-10 12:40:55 +0900 (Wed, 10 Oct 2007) Log Message: ----------- refactering ft_init_boolean_search for performance improvement. Modified Paths: -------------- mysql-5.0.45-tritonn-1.0.7/myisam/ft_boolean_search.c Modified: mysql-5.0.45-tritonn-1.0.7/myisam/ft_boolean_search.c =================================================================== --- mysql-5.0.45-tritonn-1.0.7/myisam/ft_boolean_search.c 2007-10-10 02:21:52 UTC (rev 26) +++ mysql-5.0.45-tritonn-1.0.7/myisam/ft_boolean_search.c 2007-10-10 03:40:55 UTC (rev 27) @@ -415,7 +415,6 @@ { sen_index *i; sen_query *q; - sen_encoding e; const char *rest; unsigned int rest_len; if (keynr==NO_SUCH_KEY || @@ -424,10 +423,10 @@ my_free((gptr)ftb,MYF(0)); return 0; } - sen_index_info(i, NULL, NULL, NULL, &e, NULL, NULL, NULL, NULL, NULL, NULL); SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_open: str='%s', str_len=%d, max_exprs=%d", query, query_len, SENNA_MAX_N_EXPR); - if (!(q = sen_query_open(query, query_len, sen_sel_or, SENNA_MAX_N_EXPR, e))) { + if (!(q = sen_query_open(query, query_len, sen_sel_or, SENNA_MAX_N_EXPR, + info->s->keyinfo[keynr].senna_encoding))) { SEN_LOG(sen_log_error, "ft_init_boolean_serch: sen_query_open returned error"); my_free((gptr)ftb,MYF(0)); return 0;