Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: preload load frequent use variable #10463

Merged
merged 5 commits into from
May 29, 2019
Merged

*: preload load frequent use variable #10463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9579716
*: preload load frequent use variable
lysu May 14, 2019
4a42400
*: preload load frequent use variable
lysu May 14, 2019
e0fb4bd
fix test, reset isolation to rr after test.
lysu May 15, 2019
b7d42e8
add comments
lysu May 20, 2019
b3676ea
Merge branch 'master' into dev-prefill-jdbc-common-variable
jackysp May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions executor/set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ func (s *testSuite2) TestSetVar(c *C) {
tk.MustQuery("select @@global.transaction_isolation").Check(testkit.Rows("READ-UNCOMMITTED"))

// test skip isolation level check: reset
tk.MustExec("SET GLOBAL transaction_isolation='REPEATABLE-READ'") // should reset tx_isolation back to rr before reset tidb_skip_isolation_level_check
tk.MustExec("SET GLOBAL tidb_skip_isolation_level_check = 0")
tk.MustExec("SET SESSION tidb_skip_isolation_level_check = 0")

Expand Down
13 changes: 13 additions & 0 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,19 @@ var builtinGlobalVariable = []string{
variable.WaitTimeout,
variable.InteractiveTimeout,
variable.MaxPreparedStmtCount,
variable.InitConnect,
variable.TxnIsolation,
variable.TxReadOnly,
variable.TransactionIsolation,
variable.TransactionReadOnly,
variable.NetBufferLength,
variable.QueryCacheType,
variable.QueryCacheSize,
variable.CharacterSetServer,
variable.AutoIncrementIncrement,
variable.CollationServer,
variable.NetWriteTimeout,

/* TiDB specific global variables: */
variable.TiDBSkipUTF8Check,
variable.TiDBIndexJoinBatchSize,
Expand Down
47 changes: 33 additions & 14 deletions sessionctx/variable/sysvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal, "innodb_max_undo_log_size", ""},
{ScopeGlobal | ScopeSession, "range_alloc_block_size", "4096"},
{ScopeGlobal, ConnectTimeout, "10"},
{ScopeGlobal | ScopeSession, "collation_server", mysql.DefaultCollationName},
{ScopeGlobal | ScopeSession, CollationServer, mysql.DefaultCollationName},
{ScopeNone, "have_rtree_keys", "YES"},
{ScopeGlobal, "innodb_old_blocks_pct", "37"},
{ScopeGlobal, "innodb_file_format", "Antelope"},
Expand Down Expand Up @@ -266,7 +266,7 @@ var defaultSysVars = []*SysVar{
{ScopeNone, "innodb_rollback_on_timeout", "0"},
{ScopeGlobal | ScopeSession, "query_alloc_block_size", "8192"},
{ScopeGlobal, SlaveCompressedProtocol, "0"},
{ScopeGlobal, "init_connect", ""},
{ScopeGlobal | ScopeSession, InitConnect, ""},
{ScopeGlobal, "rpl_semi_sync_slave_trace_level", ""},
{ScopeNone, "have_compress", "YES"},
{ScopeNone, "thread_concurrency", "10"},
Expand Down Expand Up @@ -306,7 +306,7 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal | ScopeSession, "sql_buffer_result", "OFF"},
{ScopeGlobal | ScopeSession, "character_set_filesystem", "binary"},
{ScopeGlobal | ScopeSession, "collation_database", mysql.DefaultCollationName},
{ScopeGlobal | ScopeSession, "auto_increment_increment", "1"},
{ScopeGlobal | ScopeSession, AutoIncrementIncrement, "1"},
{ScopeGlobal | ScopeSession, "max_heap_table_size", "16777216"},
{ScopeGlobal | ScopeSession, "div_precision_increment", "4"},
{ScopeGlobal, "innodb_lru_scan_depth", "1024"},
Expand Down Expand Up @@ -373,7 +373,7 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal, "sha256_password_proxy_users", ""},
{ScopeGlobal | ScopeSession, SQLQuoteShowCreate, "1"},
{ScopeGlobal | ScopeSession, "binlogging_impossible_mode", "IGNORE_ERROR"},
{ScopeGlobal, "query_cache_size", "1048576"},
{ScopeGlobal | ScopeSession, QueryCacheSize, "1048576"},
{ScopeGlobal, "innodb_stats_transient_sample_pages", "8"},
{ScopeGlobal, InnodbStatsOnMetadata, "0"},
{ScopeNone, "server_uuid", "00000000-0000-0000-0000-000000000000"},
Expand Down Expand Up @@ -410,10 +410,10 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal | ScopeSession, "optimizer_trace", "enabled=off,one_line=off"},
{ScopeGlobal | ScopeSession, "read_rnd_buffer_size", "262144"},
{ScopeNone, "version_comment", "MySQL Community Server (Apache License 2.0)"},
{ScopeGlobal | ScopeSession, "net_write_timeout", "60"},
{ScopeGlobal | ScopeSession, NetWriteTimeout, "60"},
{ScopeGlobal, InnodbBufferPoolLoadAbort, "0"},
{ScopeGlobal | ScopeSession, "tx_isolation", "REPEATABLE-READ"},
{ScopeGlobal | ScopeSession, "transaction_isolation", "REPEATABLE-READ"},
{ScopeGlobal | ScopeSession, TxnIsolation, "REPEATABLE-READ"},
{ScopeGlobal | ScopeSession, TransactionIsolation, "REPEATABLE-READ"},
{ScopeGlobal | ScopeSession, "collation_connection", mysql.DefaultCollationName},
{ScopeGlobal, "rpl_semi_sync_master_timeout", ""},
{ScopeGlobal | ScopeSession, "transaction_prealloc_size", "4096"},
Expand Down Expand Up @@ -519,8 +519,8 @@ var defaultSysVars = []*SysVar{
{ScopeNone, "explicit_defaults_for_timestamp", "1"},
{ScopeNone, "performance_schema_events_waits_history_size", "10"},
{ScopeGlobal, "log_syslog_tag", ""},
{ScopeGlobal | ScopeSession, "tx_read_only", "0"},
{ScopeGlobal | ScopeSession, "transaction_read_only", "0"},
{ScopeGlobal | ScopeSession, TxReadOnly, "0"},
{ScopeGlobal | ScopeSession, TransactionReadOnly, "0"},
{ScopeGlobal, "rpl_semi_sync_master_wait_point", ""},
{ScopeGlobal, "innodb_undo_log_truncate", ""},
{ScopeSession, "innodb_create_intrinsic", ""},
Expand Down Expand Up @@ -570,7 +570,7 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal | ScopeSession, InnodbTableLocks, "1"},
{ScopeNone, PerformanceSchema, "0"},
{ScopeNone, "myisam_recover_options", "OFF"},
{ScopeGlobal | ScopeSession, "net_buffer_length", "16384"},
{ScopeGlobal | ScopeSession, NetBufferLength, "16384"},
{ScopeGlobal, "rpl_semi_sync_master_wait_for_slave_count", ""},
{ScopeGlobal | ScopeSession, "binlog_row_image", "FULL"},
{ScopeNone, "innodb_locks_unsafe_for_binlog", "0"},
Expand All @@ -593,14 +593,14 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal | ScopeSession, "character_set_connection", mysql.DefaultCharset},
{ScopeGlobal, MyISAMUseMmap, "0"},
{ScopeGlobal | ScopeSession, "ndb_join_pushdown", ""},
{ScopeGlobal | ScopeSession, "character_set_server", mysql.DefaultCharset},
{ScopeGlobal | ScopeSession, CharacterSetServer, mysql.DefaultCharset},
{ScopeGlobal, "validate_password_special_char_count", "1"},
{ScopeNone, "performance_schema_max_thread_instances", "402"},
{ScopeGlobal, "slave_rows_search_algorithms", "TABLE_SCAN,INDEX_SCAN"},
{ScopeGlobal | ScopeSession, "ndbinfo_show_hidden", ""},
{ScopeGlobal | ScopeSession, "net_read_timeout", "30"},
{ScopeNone, "innodb_page_size", "16384"},
{ScopeGlobal, MaxAllowedPacket, "67108864"},
{ScopeGlobal | ScopeSession, MaxAllowedPacket, "67108864"},
{ScopeNone, "innodb_log_file_size", "50331648"},
{ScopeGlobal, "sync_relay_log_info", "10000"},
{ScopeGlobal | ScopeSession, "optimizer_trace_limit", "1"},
Expand Down Expand Up @@ -709,8 +709,8 @@ func addSynonymsSysVariables(synonyms ...string) {
}

func initSynonymsSysVariables() {
addSynonymsSysVariables("tx_isolation", "transaction_isolation")
addSynonymsSysVariables("tx_read_only", "transaction_read_only")
addSynonymsSysVariables(TxnIsolation, TransactionIsolation)
addSynonymsSysVariables(TxReadOnly, TransactionReadOnly)
}

// SetNamesVariables is the system variable names related to set names statements.
Expand Down Expand Up @@ -933,6 +933,25 @@ const (
InnodbTableLocks = "innodb_table_locks"
// InnodbStatusOutput is the name for 'innodb_status_output' system variable.
InnodbStatusOutput = "innodb_status_output"

// NetBufferLength is the name for 'net_buffer_length' system variable.
NetBufferLength = "net_buffer_length"
// QueryCacheSize is the name of 'query_cache_size' system variable.
QueryCacheSize = "query_cache_size"
// TxReadOnly is the name of 'tx_read_only' system variable.
TxReadOnly = "tx_read_only"
// TransactionReadOnly is the name of 'transaction_read_only' system variable.
TransactionReadOnly = "transaction_read_only"
// CharacterSetServer is the name of 'character_set_server' system variable.
CharacterSetServer = "character_set_server"
// AutoIncrementIncrement it the name of 'auto_increment_increment' system variable.
AutoIncrementIncrement = "auto_increment_increment"
// InitConnect is the name of 'init_connect' system variable.
InitConnect = "init_connect"
// CollationServer is the name of 'collation_server' variable.
CollationServer = "collation_server"
// NetWriteTimeout is the name of 'net_write_timeout' variable.
NetWriteTimeout = "net_write_timeout"
)

// GlobalVarAccessor is the interface for accessing global scope system and status variables.
Expand Down