Fix enumtype system variable check (#16692)

Fix enumtype system variable check Approved by: @daviszhen, @sukki37
matrixorigin · Jun 5, 2024 · e6b2868 · e6b2868
1 parent f900631
commit e6b2868
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/pkg/frontend/types.go b/pkg/frontend/types.go
@@ -733,19 +733,22 @@ func (ses *feSessionImpl) GetGlobalSysVar(name string) (interface{}, error) {
 
 func (ses *Session) SetGlobalSysVar(ctx context.Context, name string, val interface{}) (err error) {
 	name = strings.ToLower(name)
-	if sv, ok := gSysVarsDefs[name]; !ok {
+
+	def, ok := gSysVarsDefs[name]
+	if !ok {
 		return moerr.NewInternalErrorNoCtx(errorSystemVariableDoesNotExist())
-	} else {
-		if sv.Scope == ScopeSession {
-			return moerr.NewInternalErrorNoCtx(errorSystemVariableIsSession())
-		}
-		if !sv.GetDynamic() {
-			return moerr.NewInternalErrorNoCtx(errorSystemVariableIsReadOnly())
-		}
+	}
 
-		if val, err = sv.GetType().Convert(val); err != nil {
-			return err
-		}
+	if def.Scope == ScopeSession {
+		return moerr.NewInternalErrorNoCtx(errorSystemVariableIsSession())
+	}
+
+	if !def.GetDynamic() {
+		return moerr.NewInternalErrorNoCtx(errorSystemVariableIsReadOnly())
+	}
+
+	if val, err = def.GetType().Convert(val); err != nil {
+		return err
 	}
 
 	// save to table first

diff --git a/pkg/frontend/variables.go b/pkg/frontend/variables.go
@@ -594,7 +594,7 @@ func (svet SystemVariableEnumType) String() string {
 
 func (svet SystemVariableEnumType) Convert(value interface{}) (interface{}, error) {
 	cv1 := func(x int) (interface{}, error) {
-		if x >= 0 && x <= len(svet.id2TagName) {
+		if x >= 0 && x < len(svet.id2TagName) {
 			return svet.id2TagName[x], nil
 		}
 		return nil, errorConvertToEnumFailed