From svnnotify ¡÷ sourceforge.jp Tue Jun 29 16:39:10 2010 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jun 2010 16:39:10 +0900 Subject: [Tritonn-commit 165] [svn] [181] modified the system variables Message-ID: <1277797150.467815.24846.nullmailer@users.sourceforge.jp> Revision: 181 http://sourceforge.jp/projects/tritonn/svn/view?view=rev&revision=181 Author: myuka Date: 2010-06-29 16:39:10 +0900 (Tue, 29 Jun 2010) Log Message: ----------- modified the system variables *senna_score_sort Modified Paths: -------------- tags/tritonn-1.0.12-mysql-5.0.83/include/my_base.h tags/tritonn-1.0.12-mysql-5.0.83/include/my_pthread.h tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c tags/tritonn-1.0.12-mysql-5.0.83/sql/mysql_priv.h tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_parse.cc -------------- next part -------------- Modified: tags/tritonn-1.0.12-mysql-5.0.83/include/my_base.h =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/include/my_base.h 2010-03-25 03:05:13 UTC (rev 180) +++ tags/tritonn-1.0.12-mysql-5.0.83/include/my_base.h 2010-06-29 07:39:10 UTC (rev 181) @@ -360,6 +360,7 @@ #define SENNA_CREATE_TABLE 0 #define SENNA_CREATE_TABLE_LIKE (1 << 0) #define SENNA_TRUNCATE_TABLE (1 << 1) +#define SENNA_SCORE_SORT (1 << 0) /* sen_records_sort is on yuka wrote 100407*/ #endif /* Errorcodes given by functions */ Modified: tags/tritonn-1.0.12-mysql-5.0.83/include/my_pthread.h =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/include/my_pthread.h 2010-03-25 03:05:13 UTC (rev 180) +++ tags/tritonn-1.0.12-mysql-5.0.83/include/my_pthread.h 2010-06-29 07:39:10 UTC (rev 181) @@ -748,6 +748,7 @@ #endif #ifdef ENABLE_SENNA /* nkjm SFID:10294 */ int sen_flags; + my_bool *sen_sort_flags; /* yuka wrote 100408 */ uint sen_connection_id; #endif /* nkjm SFID:10294 */ }; Modified: tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c 2010-03-25 03:05:13 UTC (rev 180) +++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c 2010-06-29 07:39:10 UTC (rev 181) @@ -439,10 +439,15 @@ ftb->sir = sen_records_open(sen_rec_document, sen_rec_none, 0); SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_exec: i=%p, q=%p, r=%p", i, q, ftb->sir); sen_query_exec(i, q, ftb->sir, sen_sel_or); -//20100324 yuka wrote +/* yuka wrote 100324 */ SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort"); - sen_records_sort(ftb->sir,0,NULL); -//end 20100324 yuka wrote + if ( *(my_thread_var->sen_sort_flags) == 1) { + SEN_LOG(sen_log_info, "!!!!!!!!!!!!!!!!!!!!senna_score_sort !!!!!!!!!!!!!!!!!!!!"); + sen_records_sort(ftb->sir,0,NULL); + } + SEN_LOG(sen_log_info, "ft_init_boolean_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags); + SEN_LOG(sen_log_info, "ft_init_boolean_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT); +/* end yuka wrote 100324 */ SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q); sen_query_close(q); return ftb; Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/mysql_priv.h =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysql_priv.h 2010-03-25 03:05:13 UTC (rev 180) +++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysql_priv.h 2010-06-29 07:39:10 UTC (rev 181) @@ -1504,6 +1504,7 @@ extern uint senna_log_level_options; extern uint senna_index_type_options; extern int senna_default_flags; +extern uint sen_sort_flags; /* yuka wrote 100428 */ #endif #ifndef __WIN__ Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc 2010-03-25 03:05:13 UTC (rev 180) +++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc 2010-06-29 07:39:10 UTC (rev 181) @@ -553,6 +553,7 @@ uint senna_log_level_options; uint senna_index_type_options; int senna_default_flags; +uint sen_sort_flags; /* yuka wrote 100428 */ #endif /* Thread specific variables */ @@ -5815,10 +5816,10 @@ (gptr*) &opt_senna_log_level, (gptr*) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"senna-score-sort", OPT_SENNA_SCORE_SORT, - "Enable sen_records_sort function. Default value is ON", + "Enable sen_records_sort function. Default value is ON. Disable with --skip-senna-score-sort", (gptr*) &global_system_variables.senna_score_sort, (gptr*) &global_system_variables.senna_score_sort, - 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */ + 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */ #endif {"secure-file-priv", OPT_SECURE_FILE_PRIV, "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory", @@ -7764,9 +7765,6 @@ case OPT_SENNA_2IND: global_system_variables.senna_2ind = 1; break; - case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */ - global_system_variables.senna_score_sort=1; - break; /* end yuka wrote 100324 */ #endif } return 0; Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_parse.cc =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_parse.cc 2010-03-25 03:05:13 UTC (rev 180) +++ tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_parse.cc 2010-06-29 07:39:10 UTC (rev 181) @@ -1230,6 +1230,7 @@ } #ifdef ENABLE_SENNA DEBUG_2IND(my_thread_var->sen_flags = (thd->variables.senna_2ind ? SENNA_USE_2IND : 0)); + my_thread_var->sen_sort_flags = &(thd->variables.senna_score_sort); /* yuka wrote 100507 */ #endif /* Connect completed, set read/write timeouts back to tdefault */ From svnnotify ¡÷ sourceforge.jp Wed Jun 30 16:28:35 2010 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 30 Jun 2010 16:28:35 +0900 Subject: [Tritonn-commit 166] [svn] [182] modified the senna_score_sort variables Message-ID: <1277882915.498723.7322.nullmailer@users.sourceforge.jp> Revision: 182 http://sourceforge.jp/projects/tritonn/svn/view?view=rev&revision=182 Author: myuka Date: 2010-06-30 16:28:35 +0900 (Wed, 30 Jun 2010) Log Message: ----------- modified the senna_score_sort variables * using the senn_score_sort both boolean mode and not boolean mode Modified Paths: -------------- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_nlq_search.c -------------- next part -------------- Modified: tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c 2010-06-29 07:39:10 UTC (rev 181) +++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c 2010-06-30 07:28:35 UTC (rev 182) @@ -439,14 +439,13 @@ ftb->sir = sen_records_open(sen_rec_document, sen_rec_none, 0); SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_exec: i=%p, q=%p, r=%p", i, q, ftb->sir); sen_query_exec(i, q, ftb->sir, sen_sel_or); -/* yuka wrote 100324 */ - SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort"); - if ( *(my_thread_var->sen_sort_flags) == 1) { - SEN_LOG(sen_log_info, "!!!!!!!!!!!!!!!!!!!!senna_score_sort !!!!!!!!!!!!!!!!!!!!"); - sen_records_sort(ftb->sir,0,NULL); - } +/* yuka wrote 100324 */ SEN_LOG(sen_log_info, "ft_init_boolean_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags); - SEN_LOG(sen_log_info, "ft_init_boolean_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT); + //SEN_LOG(sen_log_info, "ft_init_boolean_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT); + if ( *(my_thread_var->sen_sort_flags) == 1) { + SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort"); + sen_records_sort(ftb->sir,0,NULL); + } /* end yuka wrote 100324 */ SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q); sen_query_close(q); Modified: tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_nlq_search.c =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_nlq_search.c 2010-06-29 07:39:10 UTC (rev 181) +++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_nlq_search.c 2010-06-30 07:28:35 UTC (rev 182) @@ -437,6 +437,14 @@ SEN_LOG(sen_log_debug, "ft_nlq_reinit_search => sen_records_rewind: r=%p", handler->sir); sen_records_rewind(handler->sir); + /* yuka wrote 100630 */ + SEN_LOG(sen_log_info, "ft_nlq_reinit_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags); + //SEN_LOG(sen_log_info, "ft_nlq_reinit_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT); + if ( *(my_thread_var->sen_sort_flags) == 1) { + SEN_LOG(sen_log_info, "ft_nlq_reinit_search => sen_records_sort"); + sen_records_sort(handler->sir,0,NULL); + } + /* end yuka wrote 100630 */ } #endif /* ENABLE_SENNA */ handler->curdoc=-1;