mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-16871 in_predicate_conversion_threshold cannot be set in my.cnf

Browse source
This commit is contained in:
Sergei Golubchik 2019-09-01 15:28:11 +02:00
parent 7e08ac0b41
commit 08b01ace8a
10 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/main/mysqld--help.result
View file

@ -346,6 +346,10 @@ The following specify which files/extra groups are read (specified before remain
Specifies a directory to add to the ignore list when
collecting database names from the datadir. Put a blank
argument to reset the list accumulated so far.
--in-predicate-conversion-threshold=#
The minimum number of scalar elements in the value list
of IN predicate that triggers its conversion to IN
subquery. Set to 0 to disable the conversion.
--init-connect=name Command(s) that are executed for each new connection
(unless the user has SUPER privilege)
--init-file=name Read SQL commands from this file at startup
@ -1442,6 +1446,7 @@ idle-transaction-timeout 0
idle-write-transaction-timeout 0
ignore-builtin-innodb FALSE
ignore-db-dirs
in-predicate-conversion-threshold 1000
init-connect
init-file (No default value)
init-rpl-role MASTER

2
mysql-test/main/mysqld--help.test
View file

@ -30,7 +30,7 @@ perl;
feedback debug temp-pool ssl des-key-file xtradb sequence
thread-concurrency super-large-pages mutex-deadlock-detector
connect null-audit aria oqgraph sphinx thread-handling
test-sql-discovery query-cache-info in-predicate-conversion-threshold
test-sql-discovery query-cache-info
query-response-time metadata-lock-info locales unix-socket
wsrep file-key-management cracklib-password-check user-variables/;

2
mysql-test/main/opt_tvc.test
View file

@ -2,7 +2,7 @@
# MDEV-12176 Transform [NOT] IN predicate with long list of values INTO [NOT] IN subquery
#
source include/have_debug.inc;
--source include/default_optimizer_switch.inc
source include/default_optimizer_switch.inc;
create table t1 (a int, b int);

3
mysql-test/suite/sys_vars/inc/sysvars_server.inc
View file

@ -23,8 +23,7 @@ select VARIABLE_NAME,VARIABLE_SCOPE,VARIABLE_TYPE,VARIABLE_COMMENT,NUMERIC_MIN_V
variable_name not like 'wsrep%' and
variable_name not like 's3%' and
variable_name not in (
'log_tc_size',
'in_predicate_conversion_threshold'
'log_tc_size'
)
order by variable_name;

15
mysql-test/suite/sys_vars/r/sysvars_debug.result
View file

@ -1,6 +1,5 @@
select * from information_schema.system_variables
where variable_name like 'debug%'
or variable_name = 'in_predicate_conversion_threshold'
order by variable_name;
VARIABLE_NAME DEBUG
SESSION_VALUE
@ -86,17 +85,3 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT NULL
VARIABLE_NAME IN_PREDICATE_CONVERSION_THRESHOLD
SESSION_VALUE 1000
GLOBAL_VALUE 1000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1000
VARIABLE_SCOPE SESSION
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL

13
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View file

@ -9,8 +9,7 @@ where variable_name not like 'debug%' and
variable_name not like 'wsrep%' and
variable_name not like 's3%' and
variable_name not in (
'log_tc_size',
'in_predicate_conversion_threshold'
'log_tc_size'
)
order by variable_name;
VARIABLE_NAME ALTER_ALGORITHM
@ -1293,6 +1292,16 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME IN_PREDICATE_CONVERSION_THRESHOLD
VARIABLE_SCOPE SESSION
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery. Set to 0 to disable the conversion.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME IN_TRANSACTION
VARIABLE_SCOPE SESSION ONLY
VARIABLE_TYPE BIGINT UNSIGNED

13
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file

@ -9,8 +9,7 @@ where variable_name not like 'debug%' and
variable_name not like 'wsrep%' and
variable_name not like 's3%' and
variable_name not in (
'log_tc_size',
'in_predicate_conversion_threshold'
'log_tc_size'
)
order by variable_name;
VARIABLE_NAME ALTER_ALGORITHM
@ -1383,6 +1382,16 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME IN_PREDICATE_CONVERSION_THRESHOLD
VARIABLE_SCOPE SESSION
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery. Set to 0 to disable the conversion.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME IN_TRANSACTION
VARIABLE_SCOPE SESSION ONLY
VARIABLE_TYPE BIGINT UNSIGNED

1
mysql-test/suite/sys_vars/t/sysvars_debug.test
View file

@ -4,5 +4,4 @@
--vertical_results
select * from information_schema.system_variables
where variable_name like 'debug%'
or variable_name = 'in_predicate_conversion_threshold'
order by variable_name;

3
sql/sql_tvc.cc
View file

@ -972,7 +972,8 @@ bool Item_func_in::to_be_transformed_into_in_subq(THD *thd)
if (args[1]->type() == Item::ROW_ITEM)
values_count*= ((Item_row *)(args[1]))->cols();
if (values_count < thd->variables.in_subquery_conversion_threshold)
if (thd->variables.in_subquery_conversion_threshold == 0 ||
thd->variables.in_subquery_conversion_threshold > values_count)
return false;
return true;

7
sql/sys_vars.cc
View file

@ -6192,14 +6192,13 @@ static Sys_var_mybool Sys_session_track_state_change(
#endif //EMBEDDED_LIBRARY
#ifndef DBUG_OFF
static Sys_var_uint Sys_in_subquery_conversion_threshold(
"in_predicate_conversion_threshold",
"The minimum number of scalar elements in the value list of "
"IN predicate that triggers its conversion to IN subquery",
SESSION_VAR(in_subquery_conversion_threshold), CMD_LINE(OPT_ARG),
"IN predicate that triggers its conversion to IN subquery. Set to "
"0 to disable the conversion.",
SESSION_VAR(in_subquery_conversion_threshold), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(0, UINT_MAX), DEFAULT(IN_SUBQUERY_CONVERSION_THRESHOLD), BLOCK_SIZE(1));
#endif
static Sys_var_enum Sys_secure_timestamp(
"secure_timestamp", "Restricts direct setting of a session "