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

Jump to bottom

config: enable collect execution information by default #18415

Merged
merged 17 commits into from
Jul 13, 2020
Merged

config: enable collect execution information by default #18415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d4f1cf5
config: enable collect execution information by default
crazycs520 Jul 7, 2020
0803628
Merge branch 'master' into enable-collect
crazycs520 Jul 7, 2020
eaa4d7b
Merge branch 'master' into enable-collect
crazycs520 Jul 8, 2020
f1aa1f8
Merge branch 'master' into enable-collect
crazycs520 Jul 8, 2020
3940204
Merge branch 'master' into enable-collect
crazycs520 Jul 8, 2020
53c6ebc
Merge branch 'master' into enable-collect
crazycs520 Jul 10, 2020
dcfe047
Merge branch 'master' into enable-collect
crazycs520 Jul 10, 2020
6398053
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
72e4fd1
make test stable
crazycs520 Jul 13, 2020
a6913fb
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
14b8687
fix test
crazycs520 Jul 13, 2020
33e7fea
Merge branch 'enable-collect' of https://github.com/crazycs520/tidb i…
crazycs520 Jul 13, 2020
755e7e0
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
be57857
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
0236192
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
f56d4e8
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
a736394
Merge branch 'master' into enable-collect
crazycs520 Jul 13, 2020
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
2 changes: 1 addition & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ var defaultConf = Config{
Experimental: Experimental{
AllowsExpressionIndex: false,
},
EnableCollectExecutionInfo: false,
EnableCollectExecutionInfo: true,
EnableTelemetry: true,
}

Expand Down
2 changes: 1 addition & 1 deletion distsql/select_result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func (r *selectResult) readFromChunk(ctx context.Context, chk *chunk.Chunk) erro

func (r *selectResult) updateCopRuntimeStats(detail *execdetails.ExecDetails, respTime time.Duration) {
callee := detail.CalleeAddress
if r.ctx.GetSessionVars().StmtCtx.RuntimeStatsColl == nil || callee == "" {
if r.rootPlanID == nil || r.ctx.GetSessionVars().StmtCtx.RuntimeStatsColl == nil || callee == "" {
return
}
if len(r.selectResp.GetExecutionSummaries()) != len(r.copPlanIDs) {
Expand Down
1 change: 1 addition & 0 deletions infoschema/tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,7 @@ func (s *testTableSuite) TestFormatVersion(c *C) {
func (s *testTableSuite) TestStmtSummaryTable(c *C) {
tk := s.newTestKitWithRoot(c)

tk.MustExec("set @@tidb_enable_collect_execution_info=0;")
tk.MustQuery("select column_comment from information_schema.columns " +
"where table_name='STATEMENTS_SUMMARY' and column_name='STMT_TYPE'",
).Check(testkit.Rows("Statement type"))
Expand Down
2 changes: 1 addition & 1 deletion sessionctx/variable/sysvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ var defaultSysVars = []*SysVar{
{ScopeSession, TiDBQueryLogMaxLen, strconv.Itoa(logutil.DefaultQueryLogMaxLen)},
{ScopeSession, TiDBCheckMb4ValueInUTF8, BoolToIntStr(config.GetGlobalConfig().CheckMb4ValueInUTF8)},
{ScopeSession, TiDBFoundInPlanCache, BoolToIntStr(DefTiDBFoundInPlanCache)},
{ScopeSession, TiDBEnableCollectExecutionInfo, BoolToIntStr(logutil.DefaultTiDBEnableSlowLog)},
{ScopeSession, TiDBEnableCollectExecutionInfo, BoolToIntStr(DefTiDBEnableCollectExecutionInfo)},
{ScopeSession, TiDBAllowAutoRandExplicitInsert, boolToOnOff(DefTiDBAllowAutoRandExplicitInsert)},
{ScopeGlobal | ScopeSession, TiDBEnableClusteredIndex, BoolToIntStr(DefTiDBEnableClusteredIndex)},
{ScopeGlobal, TiDBSlowLogMasking, BoolToIntStr(DefTiDBSlowLogMasking)},
Expand Down
2 changes: 1 addition & 1 deletion sessionctx/variable/tidb_vars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ const (
DefTiDBMetricSchemaStep = 60 // 60s
DefTiDBMetricSchemaRangeDuration = 60 // 60s
DefTiDBFoundInPlanCache = false
DefTidbEnableCollectExecutionInfo = false
DefTiDBEnableCollectExecutionInfo = true
DefTiDBAllowAutoRandExplicitInsert = false
DefTiDBEnableClusteredIndex = false
DefTiDBSlowLogMasking = false
Expand Down