Merge branch '1.2-dev' into cherry-pick-fix-ww/dup/data-corruption-ca…

…uesed-by-transfer-deletes-by-DN

pkg/frontend/authenticate_test.go

@@ -6643,13 +6643,9 @@ func TestSetGlobalSysVar(t *testing.T) {
 		convey.So(value, convey.ShouldEqual, 0)
 
 		// new session, both GetSession/GlobalSysVar equal 0
-		sql = getSqlForGetSystemVariablesWithAccount(sysAccountID)
-		mrs = newMrsForSystemVariablesOfAccount([][]interface{}{
-			{"autocommit", "0"},
-		})
-		bh.sql2result[sql] = mrs
-
 		ses2 := newSes(nil, ctrl)
+		ses2.sesSysVars.sysVars["autocommit"] = 0
+		ses2.gSysVars.sysVars["autocommit"] = 0
 		value, err = ses2.GetSessionSysVar("autocommit")
 		convey.So(err, convey.ShouldBeNil)
 		convey.So(value, convey.ShouldEqual, 0)
@@ -8210,27 +8206,6 @@ func newMrsForPrivilegeWGO(rows [][]interface{}) *MysqlResultSet {
 	return mrs
 }
 
-func newMrsForSystemVariablesOfAccount(rows [][]interface{}) *MysqlResultSet {
-	mrs := &MysqlResultSet{}
-
-	col1 := &MysqlColumn{}
-	col1.SetName("variable_name")
-	col1.SetColumnType(defines.MYSQL_TYPE_VARCHAR)
-
-	col2 := &MysqlColumn{}
-	col2.SetName("variable_value")
-	col2.SetColumnType(defines.MYSQL_TYPE_VARCHAR)
-
-	mrs.AddColumn(col1)
-	mrs.AddColumn(col2)
-
-	for _, row := range rows {
-		mrs.AddRow(row)
-	}
-
-	return mrs
-}
-
 func newMrsForSystemVariableNameOfAccount(rows [][]interface{}) *MysqlResultSet {
 	mrs := &MysqlResultSet{}
 

pkg/frontend/mysql_cmd_executor.go

@@ -709,14 +709,6 @@ func doSetVar(ses *Session, execCtx *ExecCtx, sv *tree.SetVar, sql string) error
 				return err
 			}
 			runtime.ProcessLevelRuntime().SetGlobalVariables("runtime_filter_limit_bloom_filter", value)
-		} else if name == "refresh_global_sys_vars_mgr" {
-			// refresh the cache of current account in GSysVarsMgr, load the newest data from `mo_mysql_compatibility_mode` table
-			if value.(int64) == 1 {
-				GSysVarsMgr.Put(ses.GetAccountId(), nil)
-				if err = ses.InitSystemVariables(execCtx.reqCtx); err != nil {
-					return err
-				}
-			}
 		} else {
 			err = setVarFunc(assign.System, assign.Global, name, value, sql)
 			if err != nil {

pkg/frontend/query_result_test.go

@@ -20,15 +20,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/prashantv/gostub"
-
-	"github.com/matrixorigin/matrixone/pkg/txn/clock"
-
 	"github.com/BurntSushi/toml"
 	"github.com/golang/mock/gomock"
 	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
-
 	"github.com/matrixorigin/matrixone/pkg/common/mpool"
 	"github.com/matrixorigin/matrixone/pkg/config"
 	"github.com/matrixorigin/matrixone/pkg/container/batch"
@@ -42,8 +36,11 @@ import (
 	"github.com/matrixorigin/matrixone/pkg/sql/parsers/dialect"
 	"github.com/matrixorigin/matrixone/pkg/sql/parsers/tree"
 	"github.com/matrixorigin/matrixone/pkg/testutil"
+	"github.com/matrixorigin/matrixone/pkg/txn/clock"
 	"github.com/matrixorigin/matrixone/pkg/util/trace/impl/motrace"
 	"github.com/matrixorigin/matrixone/pkg/vm/process"
+	"github.com/prashantv/gostub"
+	"github.com/stretchr/testify/assert"
 )
 
 func newLocalETLFS(t *testing.T, fsName string) fileservice.FileService {

pkg/frontend/variables.go

@@ -957,13 +957,15 @@ type GlobalSysVarsMgr struct {
 func (m *GlobalSysVarsMgr) Get(accountId uint32, ses *Session, ctx context.Context) (*SystemVariables, error) {
 	m.Lock()
 	defer m.Unlock()
-	// get from gSysVarsDefs && table if absent
-	if m.accountsGlobalSysVarsMap[accountId] == nil {
-		sysVars, err := ses.getGlobalSysVars(ctx)
-		if err != nil {
-			return nil, err
-		}
 
+	sysVars, err := ses.getGlobalSysVars(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if _, ok := m.accountsGlobalSysVarsMap[accountId]; ok {
+		m.accountsGlobalSysVarsMap[accountId].sysVars = sysVars
+	} else {
 		m.accountsGlobalSysVarsMap[accountId] = &SystemVariables{sysVars: sysVars}
 	}
 	return m.accountsGlobalSysVarsMap[accountId], nil
@@ -3511,14 +3513,6 @@ var gSysVarsDefs = map[string]SystemVariable{
 		Type:              InitSystemVariableBoolType("experimental_master_index"),
 		Default:           int64(0),
 	},
-	"refresh_global_sys_vars_mgr": {
-		Name:              "refresh_global_sys_vars_mgr",
-		Scope:             ScopeBoth,
-		Dynamic:           true,
-		SetVarHintApplies: false,
-		Type:              InitSystemVariableBoolType("refresh_global_sys_vars_mgr"),
-		Default:           int64(0),
-	},
 }
 
 func updateTimeZone(ctx context.Context, sess *Session, sv *SystemVariables, name string, val interface{}) error {

test/distributed/cases/system_variable/lower_case_table_names.result

@@ -12,7 +12,7 @@ a
 2
 3
 select A from t1;
-a
+A
 1
 2
 3
@@ -22,7 +22,7 @@ a
 2
 3
 select A from T1;
-a
+A
 1
 2
 3
@@ -37,33 +37,32 @@ a
 2
 3
 select tmp.aA from (select a as Aa from t1) as tmp;
-aa
+aA
 1
 2
 3
 select tmp.Aa from (select a as Aa from t1) as tmp;
-aa
+Aa
 1
 2
 3
 select TMp.aA from (select a as Aa from t1) as tmp;
-aa
+aA
 1
 2
 3
 select TMp.Aa from (select a as Aa from t1) as tmp;
-aa
+Aa
 1
 2
 3
 set global lower_case_table_names = 0;
-set refresh_global_sys_vars_mgr = 1;
 select @@lower_case_table_names;
 @@lower_case_table_names
 0
 use test;
 select A from t1;
-a
+A
 1
 2
 3
@@ -82,12 +81,12 @@ a
 select TMP.a from t1 as tmp;
 invalid input: missing FROM-clause entry for table 'TMP'
 select tmp.aA from (select a as Aa from t1) as tmp;
-aa
+aA
 1
 2
 3
 select tmp.Aa from (select a as Aa from t1) as tmp;
-aa
+Aa
 1
 2
 3
@@ -96,7 +95,6 @@ invalid input: missing FROM-clause entry for table 'TMp'
 select TMp.Aa from (select a as Aa from t1) as tmp;
 invalid input: missing FROM-clause entry for table 'TMp'
 drop database test;
-set refresh_global_sys_vars_mgr = 1;
 select @@lower_case_table_names;
 @@lower_case_table_names
 0
@@ -110,7 +108,6 @@ a
 2
 3
 set global lower_case_table_names = 1;
-set refresh_global_sys_vars_mgr = 1;
 select @@lower_case_table_names;
 @@lower_case_table_names
 1

test/distributed/cases/system_variable/lower_case_table_names.sql

@@ -25,8 +25,6 @@ set global lower_case_table_names = 0;
 -- @session
 
 -- @session:id=2&user=a1:admin1&password=test123
-# make sure get the newest value
-set refresh_global_sys_vars_mgr = 1;
 # it's 0 now
 select @@lower_case_table_names;
 
@@ -48,8 +46,6 @@ drop database test;
 -- @session
 
 -- @session:id=3&user=a1:admin1&password=test123
-# make sure get the newest value
-set refresh_global_sys_vars_mgr = 1;
 # it's 0 now
 select @@lower_case_table_names;
 
@@ -65,8 +61,6 @@ set global lower_case_table_names = 1;
 -- @session
 
 -- @session:id=4&user=a1:admin1&password=test123
-# make sure get the newest value
-set refresh_global_sys_vars_mgr = 1;
 # it's 1 now
 select @@lower_case_table_names;