fix

winoros · Aug 26, 2022 · ede49bb · ede49bb
1 parent 9cbd94b
commit ede49bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/executor/adapter.go b/executor/adapter.go
@@ -453,8 +453,8 @@ func (a *ExecStmt) Exec(ctx context.Context) (_ sqlexec.RecordSet, err error) {
 			concurrency, err3 := strconv.ParseInt(sVal, 10, 64)
 			terror.Log(err3)
 			sctx.GetSessionVars().SetDistSQLScanConcurrency(int(concurrency))
-			sctx.GetSessionVars().SetIndexSerialScanConcurrency(int(concurrency))
 		}
+		sctx.GetSessionVars().SetIndexSerialScanConcurrency(1)
 		terror.Log(sctx.GetSessionVars().SetSystemVar(variable.TxnIsolation, ast.ReadCommitted))
 		defer func() {
 			terror.Log(sctx.GetSessionVars().SetSystemVar(variable.TiDBBuildStatsConcurrency, oriStats))

diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go
@@ -869,7 +869,7 @@ var defaultSysVars = []*SysVar{
 	}, GetGlobal: func(s *SessionVars) (string, error) {
 		return BoolToOnOff(EnableTmpStorageOnOOM.Load()), nil
 	}},
-	{Scope: ScopeGlobal, Name: TiDBAutoBuildStatsConcurrency, Value: strconv.Itoa(DefAutoBuildStatsConcurrency), Type: TypeInt, MinValue: 1, MaxValue: MaxConfigurableConcurrency},
+	{Scope: ScopeGlobal, Name: TiDBAutoBuildStatsConcurrency, Value: strconv.Itoa(DefTiDBAutoBuildStatsConcurrency), Type: TypeInt, MinValue: 1, MaxValue: MaxConfigurableConcurrency},
 	{Scope: ScopeGlobal, Name: TiDBSysProcScanConcurrency, Value: strconv.Itoa(DefTiDBSysProcScanConcurrency), Type: TypeInt, MinValue: 1, MaxValue: MaxConfigurableConcurrency},
 
 	/* The system variables below have GLOBAL and SESSION scope  */

diff --git a/sessionctx/variable/tidb_vars.go b/sessionctx/variable/tidb_vars.go
@@ -1021,11 +1021,11 @@ const (
 	DefTiDBEnableGeneralPlanCache                  = false
 	DefTiDBGeneralPlanCacheSize                    = 100
 	// MaxDDLReorgBatchSize is exported for testing.
-	MaxDDLReorgBatchSize           int32  = 10240
-	MinDDLReorgBatchSize           int32  = 32
-	MinExpensiveQueryTimeThreshold uint64 = 10 // 10s
-	DefAutoBuildStatsConcurrency                   = 1
-	DefTiDBSysProcScanConcurrency                  = 1
+	MaxDDLReorgBatchSize             int32  = 10240
+	MinDDLReorgBatchSize             int32  = 32
+	MinExpensiveQueryTimeThreshold   uint64 = 10 // 10s
+	DefTiDBAutoBuildStatsConcurrency        = 1
+	DefTiDBSysProcScanConcurrency           = 1
 )
 
 // Process global variables.