OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

tritonn: Commit


Commit MetaInfo

Revision181 (tree)
Time2010-06-29 16:39:10
Authormyuka

Log Message

modified the system variables

*senna_score_sort

Change Summary

Incremental Difference

--- tags/tritonn-1.0.12-mysql-5.0.83/include/my_pthread.h (revision 180)
+++ tags/tritonn-1.0.12-mysql-5.0.83/include/my_pthread.h (revision 181)
@@ -748,6 +748,7 @@
748748 #endif
749749 #ifdef ENABLE_SENNA /* nkjm SFID:10294 */
750750 int sen_flags;
751+ my_bool *sen_sort_flags; /* yuka wrote 100408 */
751752 uint sen_connection_id;
752753 #endif /* nkjm SFID:10294 */
753754 };
--- tags/tritonn-1.0.12-mysql-5.0.83/include/my_base.h (revision 180)
+++ tags/tritonn-1.0.12-mysql-5.0.83/include/my_base.h (revision 181)
@@ -360,6 +360,7 @@
360360 #define SENNA_CREATE_TABLE 0
361361 #define SENNA_CREATE_TABLE_LIKE (1 << 0)
362362 #define SENNA_TRUNCATE_TABLE (1 << 1)
363+#define SENNA_SCORE_SORT (1 << 0) /* sen_records_sort is on yuka wrote 100407*/
363364 #endif
364365
365366 /* Errorcodes given by functions */
--- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c (revision 180)
+++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c (revision 181)
@@ -439,10 +439,15 @@
439439 ftb->sir = sen_records_open(sen_rec_document, sen_rec_none, 0);
440440 SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_exec: i=%p, q=%p, r=%p", i, q, ftb->sir);
441441 sen_query_exec(i, q, ftb->sir, sen_sel_or);
442-//20100324 yuka wrote
442+/* yuka wrote 100324 */
443443 SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort");
444- sen_records_sort(ftb->sir,0,NULL);
445-//end 20100324 yuka wrote
444+ if ( *(my_thread_var->sen_sort_flags) == 1) {
445+ SEN_LOG(sen_log_info, "!!!!!!!!!!!!!!!!!!!!senna_score_sort !!!!!!!!!!!!!!!!!!!!");
446+ sen_records_sort(ftb->sir,0,NULL);
447+ }
448+ SEN_LOG(sen_log_info, "ft_init_boolean_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags);
449+ SEN_LOG(sen_log_info, "ft_init_boolean_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT);
450+/* end yuka wrote 100324 */
446451 SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q);
447452 sen_query_close(q);
448453 return ftb;
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc (revision 180)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc (revision 181)
@@ -553,6 +553,7 @@
553553 uint senna_log_level_options;
554554 uint senna_index_type_options;
555555 int senna_default_flags;
556+uint sen_sort_flags; /* yuka wrote 100428 */
556557 #endif
557558
558559 /* Thread specific variables */
@@ -5815,10 +5816,10 @@
58155816 (gptr*) &opt_senna_log_level, (gptr*) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG,
58165817 0, 0, 0, 0, 0, 0},
58175818 {"senna-score-sort", OPT_SENNA_SCORE_SORT,
5818- "Enable sen_records_sort function. Default value is ON",
5819+ "Enable sen_records_sort function. Default value is ON. Disable with --skip-senna-score-sort",
58195820 (gptr*) &global_system_variables.senna_score_sort,
58205821 (gptr*) &global_system_variables.senna_score_sort,
5821- 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */
5822+ 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */
58225823 #endif
58235824 {"secure-file-priv", OPT_SECURE_FILE_PRIV,
58245825 "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory",
@@ -7764,9 +7765,6 @@
77647765 case OPT_SENNA_2IND:
77657766 global_system_variables.senna_2ind = 1;
77667767 break;
7767- case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */
7768- global_system_variables.senna_score_sort=1;
7769- break; /* end yuka wrote 100324 */
77707768 #endif
77717769 }
77727770 return 0;
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysql_priv.h (revision 180)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysql_priv.h (revision 181)
@@ -1504,6 +1504,7 @@
15041504 extern uint senna_log_level_options;
15051505 extern uint senna_index_type_options;
15061506 extern int senna_default_flags;
1507+extern uint sen_sort_flags; /* yuka wrote 100428 */
15071508 #endif
15081509
15091510 #ifndef __WIN__
--- tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_parse.cc (revision 180)
+++ tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_parse.cc (revision 181)
@@ -1230,6 +1230,7 @@
12301230 }
12311231 #ifdef ENABLE_SENNA
12321232 DEBUG_2IND(my_thread_var->sen_flags = (thd->variables.senna_2ind ? SENNA_USE_2IND : 0));
1233+ my_thread_var->sen_sort_flags = &(thd->variables.senna_score_sort); /* yuka wrote 100507 */
12331234 #endif
12341235
12351236 /* Connect completed, set read/write timeouts back to tdefault */
Show on old repository browser