variable: unifiy MaxExecuteTime usage and fix some problem (#50915) (#…

…52618) close #50872, close #50914
pingcap · Nov 11, 2024 · c6f28f0 · c6f28f0
1 parent 051f12c
commit c6f28f0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/executor/adapter.go b/executor/adapter.go
@@ -341,7 +341,7 @@ func (a *ExecStmt) PointGet(ctx context.Context) (*recordSet, error) {
 	if raw, ok := sctx.(processinfoSetter); ok {
 		pi = raw
 		sql := a.OriginText()
-		maxExecutionTime := getMaxExecutionTime(sctx)
+		maxExecutionTime := sctx.GetSessionVars().GetMaxExecutionTime()
 		// Update processinfo, ShowProcess() will use it.
 		pi.SetProcessInfo(sql, time.Now(), cmd, maxExecutionTime)
 		if sctx.GetSessionVars().StmtCtx.StmtType == "" {
@@ -545,7 +545,7 @@ func (a *ExecStmt) Exec(ctx context.Context) (_ sqlexec.RecordSet, err error) {
 				sql = ss.SecureText()
 			}
 		}
-		maxExecutionTime := getMaxExecutionTime(sctx)
+		maxExecutionTime := sctx.GetSessionVars().GetMaxExecutionTime()
 		// Update processinfo, ShowProcess() will use it.
 		if a.Ctx.GetSessionVars().StmtCtx.StmtType == "" {
 			a.Ctx.GetSessionVars().StmtCtx.StmtType = ast.GetStmtLabel(a.StmtNode)
@@ -804,14 +804,6 @@ func isNoResultPlan(p plannercore.Plan) bool {
 	return false
 }
 
-// getMaxExecutionTime get the max execution timeout value.
-func getMaxExecutionTime(sctx sessionctx.Context) uint64 {
-	if sctx.GetSessionVars().StmtCtx.HasMaxExecutionTime {
-		return sctx.GetSessionVars().StmtCtx.MaxExecutionTime
-	}
-	return sctx.GetSessionVars().MaxExecutionTime
-}
-
 type chunkRowRecordSet struct {
 	rows     []chunk.Row
 	idx      int

diff --git a/expression/builtin_info.go b/expression/builtin_info.go
@@ -922,7 +922,7 @@ func (b *builtinTiDBDecodeSQLDigestsSig) evalString(row chunk.Row) (string, bool
 
 	// Querying may take some time and it takes a context.Context as argument, which is not available here.
 	// We simply create a context with a timeout here.
-	timeout := time.Duration(b.ctx.GetSessionVars().MaxExecutionTime) * time.Millisecond
+	timeout := time.Duration(b.ctx.GetSessionVars().GetMaxExecutionTime()) * time.Millisecond
 	if timeout == 0 || timeout > 20*time.Second {
 		timeout = 20 * time.Second
 	}

diff --git a/planner/core/plan_stats.go b/planner/core/plan_stats.go
@@ -84,7 +84,7 @@ func RequestLoadStats(ctx sessionctx.Context, neededHistItems []model.TableItemI
 	if hintMaxExecutionTime <= 0 {
 		hintMaxExecutionTime = maxDuration
 	}
-	sessMaxExecutionTime := int64(ctx.GetSessionVars().MaxExecutionTime)
+	sessMaxExecutionTime := int64(ctx.GetSessionVars().GetMaxExecutionTime())
 	if sessMaxExecutionTime <= 0 {
 		sessMaxExecutionTime = maxDuration
 	}

diff --git a/session/sessiontest/session_test.go b/session/sessiontest/session_test.go
@@ -3195,7 +3195,7 @@ func TestGlobalVarAccessor(t *testing.T) {
 	tk1.MustExec("set @@global.max_execution_time = 100")
 	tk2 := testkit.NewTestKit(t, store)
 	tk2.MustExec("use test")
-	require.Equal(t, uint64(100), tk2.Session().GetSessionVars().MaxExecutionTime)
+	require.Equal(t, uint64(100), tk2.Session().GetSessionVars().GetMaxExecutionTime())
 	tk1.MustExec("set @@global.max_execution_time = 0")
 
 	result := tk.MustQuery("show global variables  where variable_name='sql_select_limit';")

diff --git a/sessionctx/variable/session.go b/sessionctx/variable/session.go
@@ -1716,6 +1716,14 @@ func (s *SessionVars) AllocNewPlanID() int {
 	return int(s.PlanID.Add(1))
 }
 
+// GetMaxExecutionTime returns the max execution time of the current session. If it's hinted, return the hinted value.
+func (s *SessionVars) GetMaxExecutionTime() uint64 {
+	if s.StmtCtx.HasMaxExecutionTime {
+		return s.StmtCtx.MaxExecutionTime
+	}
+	return s.MaxExecutionTime
+}
+
 const (
 	// PlacementModeStrict indicates all placement operations should be checked strictly in ddl
 	PlacementModeStrict string = "STRICT"