summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--storage/spider/spd_conn.cc15
-rw-r--r--storage/spider/spd_db_conn.cc4
-rw-r--r--storage/spider/spd_include.h3
-rw-r--r--storage/spider/spd_param.cc43
-rw-r--r--storage/spider/spd_param.h15
-rw-r--r--storage/spider/spd_table.cc15
6 files changed, 26 insertions, 69 deletions
diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc
index 91c6b91af30..c10f97083bb 100644
--- a/storage/spider/spd_conn.cc
+++ b/storage/spider/spd_conn.cc
@@ -1710,8 +1710,7 @@ int spider_set_conn_bg_param(
THD *thd = wide_handler->trx->thd;
DBUG_ENTER("spider_set_conn_bg_param");
DBUG_PRINT("info",("spider spider=%p", spider));
- bgs_mode =
- spider_param_bgs_mode(thd, share->bgs_mode);
+ bgs_mode= spider_param_bgs_mode(thd);
if (bgs_mode == 0)
result_list->bgs_phase = 0;
else if (
@@ -1733,15 +1732,11 @@ int spider_set_conn_bg_param(
result_list->bgs_second_read = result_list->bgs_split_read;
} else {
DBUG_PRINT("info",("spider use_pre_call=FALSE"));
- result_list->bgs_first_read =
- spider_param_bgs_first_read(thd, share->bgs_first_read);
- result_list->bgs_second_read =
- spider_param_bgs_second_read(thd, share->bgs_second_read);
+ result_list->bgs_first_read= spider_param_bgs_first_read(thd);
+ result_list->bgs_second_read= spider_param_bgs_second_read(thd);
}
- DBUG_PRINT("info",("spider bgs_split_read=%lld",
- result_list->bgs_split_read));
- DBUG_PRINT("info",("spider bgs_first_read=%lld", share->bgs_first_read));
- DBUG_PRINT("info",("spider bgs_second_read=%lld", share->bgs_second_read));
+ DBUG_PRINT("info",
+ ("spider bgs_split_read=%lld", result_list->bgs_split_read));
result_list->split_read =
result_list->bgs_first_read > 0 ?
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
index c29e9253b3f..2992983a19e 100644
--- a/storage/spider/spd_db_conn.cc
+++ b/storage/spider/spd_db_conn.cc
@@ -5769,7 +5769,7 @@ int spider_db_simple_action(
DBUG_ENTER("spider_db_simple_action");
if (pre_call)
{
- if (spider_param_bgs_mode(thd, spider->share->bgs_mode))
+ if (spider_param_bgs_mode(thd))
{
if ((error_num = spider_check_and_get_casual_read_conn(thd, spider,
link_idx)))
@@ -5794,7 +5794,7 @@ int spider_db_simple_action(
conn = spider->conns[link_idx];
if (spider->use_pre_action)
{
- if (spider_param_bgs_mode(thd, spider->share->bgs_mode))
+ if (spider_param_bgs_mode(thd))
{
spider_bg_conn_wait(conn);
error_num = spider->result_list.bgs_error;
diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h
index f08545b5639..54c1682cb2d 100644
--- a/storage/spider/spd_include.h
+++ b/storage/spider/spd_include.h
@@ -840,9 +840,6 @@ typedef struct st_spider_share
int low_mem_read;
int table_count_mode;
int select_column_mode;
- int bgs_mode;
- longlong bgs_first_read;
- longlong bgs_second_read;
longlong first_read;
longlong second_read;
int auto_increment_mode;
diff --git a/storage/spider/spd_param.cc b/storage/spider/spd_param.cc
index 4bbfdb1f565..e7f07ff4aca 100644
--- a/storage/spider/spd_param.cc
+++ b/storage/spider/spd_param.cc
@@ -1419,21 +1419,17 @@ static MYSQL_THDVAR_INT(
bgs_mode, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Mode of background search", /* comment */
- NULL, /* check */
- spider_use_table_value_deprecated, /* update */
+ nullptr, /* check */
+ nullptr, /* update */
0, /* def */
- -1, /* min */
+ 0, /* min */
3, /* max */
0 /* blk */
);
-int spider_param_bgs_mode(
- THD *thd,
- int bgs_mode
-) {
+int spider_param_bgs_mode(THD *thd) {
DBUG_ENTER("spider_param_bgs_mode");
- DBUG_RETURN(THDVAR(thd, bgs_mode) < 0 ?
- bgs_mode : THDVAR(thd, bgs_mode));
+ DBUG_RETURN(THDVAR(thd, bgs_mode));
}
/*
@@ -1445,21 +1441,17 @@ static MYSQL_THDVAR_LONGLONG(
bgs_first_read, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Number of first read records when background search is used", /* comment */
- NULL, /* check */
- spider_use_table_value_deprecated, /* update */
+ nullptr, /* check */
+ nullptr, /* update */
2, /* def */
- -1, /* min */
+ 0, /* min */
9223372036854775807LL, /* max */
0 /* blk */
);
-longlong spider_param_bgs_first_read(
- THD *thd,
- longlong bgs_first_read
-) {
+longlong spider_param_bgs_first_read(THD *thd) {
DBUG_ENTER("spider_param_bgs_first_read");
- DBUG_RETURN(THDVAR(thd, bgs_first_read) < 0 ?
- bgs_first_read : THDVAR(thd, bgs_first_read));
+ DBUG_RETURN(THDVAR(thd, bgs_first_read));
}
/*
@@ -1471,21 +1463,18 @@ static MYSQL_THDVAR_LONGLONG(
bgs_second_read, /* name */
PLUGIN_VAR_RQCMDARG, /* opt */
"Number of second read records when background search is used", /* comment */
- NULL, /* check */
- spider_use_table_value_deprecated, /* update */
+ nullptr, /* check */
+ nullptr, /* update */
100, /* def */
- -1, /* min */
+ 0, /* min */
9223372036854775807LL, /* max */
0 /* blk */
);
-longlong spider_param_bgs_second_read(
- THD *thd,
- longlong bgs_second_read
-) {
+longlong spider_param_bgs_second_read(THD *thd)
+{
DBUG_ENTER("spider_param_bgs_second_read");
- DBUG_RETURN(THDVAR(thd, bgs_second_read) < 0 ?
- bgs_second_read : THDVAR(thd, bgs_second_read));
+ DBUG_RETURN(THDVAR(thd, bgs_second_read));
}
/*
diff --git a/storage/spider/spd_param.h b/storage/spider/spd_param.h
index 0c5392e302a..6ca9f0ba6ef 100644
--- a/storage/spider/spd_param.h
+++ b/storage/spider/spd_param.h
@@ -182,18 +182,9 @@ int spider_param_select_column_mode(
THD *thd,
int select_column_mode
);
-int spider_param_bgs_mode(
- THD *thd,
- int bgs_mode
-);
-longlong spider_param_bgs_first_read(
- THD *thd,
- longlong bgs_first_read
-);
-longlong spider_param_bgs_second_read(
- THD *thd,
- longlong bgs_second_read
-);
+int spider_param_bgs_mode(THD *thd);
+longlong spider_param_bgs_first_read(THD *thd);
+longlong spider_param_bgs_second_read(THD *thd);
longlong spider_param_first_read(
THD *thd,
longlong first_read
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index 8292f8f5c24..aebe230ed85 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -2078,9 +2078,6 @@ int spider_parse_connect_info(
share->low_mem_read = -1;
share->table_count_mode = -1;
share->select_column_mode = -1;
- share->bgs_mode = -1;
- share->bgs_first_read = -1;
- share->bgs_second_read = -1;
share->first_read = -1;
share->second_read = -1;
share->auto_increment_mode = -1;
@@ -2219,9 +2216,6 @@ int spider_parse_connect_info(
SPIDER_PARAM_INT_WITH_MAX("aim", auto_increment_mode, 0, 3);
SPIDER_PARAM_INT("alc", active_link_count, 1);
SPIDER_PARAM_INT("bfz", buffer_size, 0);
- SPIDER_PARAM_LONGLONG("bfr", bgs_first_read, 0);
- SPIDER_PARAM_INT("bmd", bgs_mode, 0);
- SPIDER_PARAM_LONGLONG("bsr", bgs_second_read, 0);
SPIDER_PARAM_STR("bke", bka_engine);
SPIDER_PARAM_INT_WITH_MAX("bkm", bka_mode, 0, 2);
SPIDER_PARAM_INT("bsz", bulk_size, 0);
@@ -2385,7 +2379,6 @@ int spider_parse_connect_info(
SPIDER_PARAM_DEPRECATED_WARNING("crd_type");
SPIDER_PARAM_INT_WITH_MAX("crd_type", crd_type, 0, 2);
SPIDER_PARAM_LONGLONG("priority", priority, 0);
- SPIDER_PARAM_INT("bgs_mode", bgs_mode, 0);
SPIDER_PARAM_STR_LIST("ssl_cert", tgt_ssl_certs);
SPIDER_PARAM_INT_WITH_MAX("bka_mode", bka_mode, 0, 2);
error_num = connect_string_parse.print_param_error();
@@ -2434,7 +2427,6 @@ int spider_parse_connect_info(
case 14:
SPIDER_PARAM_DEPRECATED_WARNING("internal_limit");
SPIDER_PARAM_LONGLONG("internal_limit", internal_limit, 0);
- SPIDER_PARAM_LONGLONG("bgs_first_read", bgs_first_read, 0);
SPIDER_PARAM_INT_WITH_MAX("read_only_mode", read_only_mode, 0, 1);
SPIDER_PARAM_LONG_LIST_WITH_MAX("access_balance", access_balances, 0,
2147483647);
@@ -2450,7 +2442,6 @@ int spider_parse_connect_info(
SPIDER_PARAM_INT_WITH_MAX("semi_table_lock", semi_table_lock, 0, 1);
SPIDER_PARAM_LONGLONG("quick_page_byte", quick_page_byte, 0);
SPIDER_PARAM_LONGLONG("quick_page_size", quick_page_size, 0);
- SPIDER_PARAM_LONGLONG("bgs_second_read", bgs_second_read, 0);
SPIDER_PARAM_LONG_LIST_WITH_MAX("monitoring_flag", monitoring_flag, 0, 1);
SPIDER_PARAM_LONG_LIST_WITH_MAX("monitoring_kind", monitoring_kind, 0, 3);
SPIDER_PARAM_DOUBLE("semi_split_read", semi_split_read, 0);
@@ -3906,12 +3897,6 @@ int spider_set_connect_info_default(
share->table_count_mode = 0;
if (share->select_column_mode == -1)
share->select_column_mode = 1;
- if (share->bgs_mode == -1)
- share->bgs_mode = 0;
- if (share->bgs_first_read == -1)
- share->bgs_first_read = 2;
- if (share->bgs_second_read == -1)
- share->bgs_second_read = 100;
if (share->first_read == -1)
share->first_read = 0;
if (share->second_read == -1)
View Lorry Controller Status