From ebec1ecae0f4284d38732a3dbe4203297c1efc39 Mon Sep 17 00:00:00 2001 From: crazycs Date: Mon, 13 Jul 2020 20:35:37 +0800 Subject: [PATCH] cherry pick #18415 to release-4.0 Signed-off-by: ti-srebot --- config/config.go | 2 +- distsql/select_result.go | 2 +- infoschema/tables_test.go | 1 + sessionctx/variable/sysvar.go | 6 ++++++ sessionctx/variable/tidb_vars.go | 6 ++++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 3841b2a955fb5..6fcf2083c392f 100644 --- a/config/config.go +++ b/config/config.go @@ -681,7 +681,7 @@ var defaultConf = Config{ AllowAutoRandom: false, AllowsExpressionIndex: false, }, - EnableCollectExecutionInfo: false, + EnableCollectExecutionInfo: true, EnableTelemetry: true, } diff --git a/distsql/select_result.go b/distsql/select_result.go index ab21ec00fc3e3..ae0244dbd4d1b 100644 --- a/distsql/select_result.go +++ b/distsql/select_result.go @@ -235,7 +235,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) { diff --git a/infoschema/tables_test.go b/infoschema/tables_test.go index 531c339ef4184..754e96085665e 100644 --- a/infoschema/tables_test.go +++ b/infoschema/tables_test.go @@ -880,6 +880,7 @@ func (s *testTableSuite) TestSelectHiddenColumn(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")) diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index 98d31a12868cf..ab444f9051dc5 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -720,6 +720,12 @@ var defaultSysVars = []*SysVar{ {ScopeSession, TiDBQueryLogMaxLen, strconv.Itoa(logutil.DefaultQueryLogMaxLen)}, {ScopeSession, TiDBCheckMb4ValueInUTF8, BoolToIntStr(config.GetGlobalConfig().CheckMb4ValueInUTF8)}, {ScopeSession, TiDBFoundInPlanCache, BoolToIntStr(DefTiDBFoundInPlanCache)}, +<<<<<<< HEAD +======= + {ScopeSession, TiDBEnableCollectExecutionInfo, BoolToIntStr(DefTiDBEnableCollectExecutionInfo)}, + {ScopeSession, TiDBAllowAutoRandExplicitInsert, boolToOnOff(DefTiDBAllowAutoRandExplicitInsert)}, + {ScopeGlobal | ScopeSession, TiDBEnableClusteredIndex, BoolToIntStr(DefTiDBEnableClusteredIndex)}, +>>>>>>> 5574e1a... config: enable collect execution information by default (#18415) {ScopeGlobal, TiDBSlowLogMasking, BoolToIntStr(DefTiDBSlowLogMasking)}, {ScopeSession, TiDBEnableCollectExecutionInfo, BoolToIntStr(DefTiDBEnableCollectExecutionInfo)}, {ScopeGlobal, TiDBEnableTelemetry, BoolToIntStr(DefTiDBEnableTelemetry)}, diff --git a/sessionctx/variable/tidb_vars.go b/sessionctx/variable/tidb_vars.go index e96faa395f49d..40458c7d0cd8a 100644 --- a/sessionctx/variable/tidb_vars.go +++ b/sessionctx/variable/tidb_vars.go @@ -492,6 +492,12 @@ const ( DefTiDBMetricSchemaStep = 60 // 60s DefTiDBMetricSchemaRangeDuration = 60 // 60s DefTiDBFoundInPlanCache = false +<<<<<<< HEAD +======= + DefTiDBEnableCollectExecutionInfo = true + DefTiDBAllowAutoRandExplicitInsert = false + DefTiDBEnableClusteredIndex = false +>>>>>>> 5574e1a... config: enable collect execution information by default (#18415) DefTiDBSlowLogMasking = false DefTiDBEnableCollectExecutionInfo = false DefTiDBEnableTelemetry = true