OSDN > Find Software > Database > Database Engines/Servers > Tritonn > SCM > SVN > Commit

Tritonn

tritonn: Commit

modified the system variables

*senna_score_sort

--- 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 @@
748	748	#endif
749	749	#ifdef ENABLE_SENNA /* nkjm SFID:10294 */
750	750	int sen_flags;
	751	+ my_bool sen_sort_flags; / yuka wrote 100408 */
751	752	uint sen_connection_id;
752	753	#endif /* nkjm SFID:10294 */
753	754	};

--- 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 @@
360	360	#define SENNA_CREATE_TABLE 0
361	361	#define SENNA_CREATE_TABLE_LIKE (1 << 0)
362	362	#define SENNA_TRUNCATE_TABLE (1 << 1)
	363	+#define SENNA_SCORE_SORT (1 << 0) /* sen_records_sort is on yuka wrote 100407*/
363	364	#endif
364	365
365	366	/* 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 @@
439	439	ftb->sir = sen_records_open(sen_rec_document, sen_rec_none, 0);
440	440	SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_exec: i=%p, q=%p, r=%p", i, q, ftb->sir);
441	441	sen_query_exec(i, q, ftb->sir, sen_sel_or);
442		-//20100324 yuka wrote
	442	+/* yuka wrote 100324 */
443	443	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 */
446	451	SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q);
447	452	sen_query_close(q);
448	453	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 @@
553	553	uint senna_log_level_options;
554	554	uint senna_index_type_options;
555	555	int senna_default_flags;
	556	+uint sen_sort_flags; /* yuka wrote 100428 */
556	557	#endif
557	558
558	559	/* Thread specific variables */

		@@ -5815,10 +5816,10 @@
5815	5816	(gptr) &opt_senna_log_level, (gptr) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG,
5816	5817	0, 0, 0, 0, 0, 0},
5817	5818	{"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",
5819	5820	(gptr*) &global_system_variables.senna_score_sort,
5820	5821	(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 */
5822	5823	#endif
5823	5824	{"secure-file-priv", OPT_SECURE_FILE_PRIV,
5824	5825	"Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory",

		@@ -7764,9 +7765,6 @@
7764	7765	case OPT_SENNA_2IND:
7765	7766	global_system_variables.senna_2ind = 1;
7766	7767	break;
7767		- case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */
7768		- global_system_variables.senna_score_sort=1;
7769		- break; /* end yuka wrote 100324 */
7770	7768	#endif
7771	7769	}
7772	7770	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 @@
1504	1504	extern uint senna_log_level_options;
1505	1505	extern uint senna_index_type_options;
1506	1506	extern int senna_default_flags;
	1507	+extern uint sen_sort_flags; /* yuka wrote 100428 */
1507	1508	#endif
1508	1509
1509	1510	#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 @@
1230	1230	}
1231	1231	#ifdef ENABLE_SENNA
1232	1232	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 */
1233	1234	#endif
1234	1235
1235	1236	/* Connect completed, set read/write timeouts back to tdefault */