Skip to content

Commit 194f501

Browse files
winorosBenjamin2037
authored andcommitted
session: set EnableWindowFunction for all SessionVars (pingcap#55991)
close pingcap#55981
1 parent d9f0476 commit 194f501

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

pkg/session/session.go

-4
Original file line numberDiff line numberDiff line change
@@ -1186,10 +1186,6 @@ func createSessionFunc(store kv.Storage) pools.Factory {
11861186
if err != nil {
11871187
return nil, errors.Trace(err)
11881188
}
1189-
err = se.sessionVars.SetSystemVar(variable.TiDBEnableWindowFunction, variable.BoolToOnOff(variable.DefEnableWindowFunction))
1190-
if err != nil {
1191-
return nil, errors.Trace(err)
1192-
}
11931189
err = se.sessionVars.SetSystemVar(variable.TiDBConstraintCheckInPlacePessimistic, variable.On)
11941190
if err != nil {
11951191
return nil, errors.Trace(err)

pkg/sessionctx/variable/session.go

+1
Original file line numberDiff line numberDiff line change
@@ -2213,6 +2213,7 @@ func NewSessionVars(hctx HookContext) *SessionVars {
22132213
DefaultCollationForUTF8MB4: mysql.DefaultCollationName,
22142214
GroupConcatMaxLen: DefGroupConcatMaxLen,
22152215
EnableRedactLog: DefTiDBRedactLog,
2216+
EnableWindowFunction: DefEnableWindowFunction,
22162217
}
22172218
vars.status.Store(uint32(mysql.ServerStatusAutocommit))
22182219
vars.StmtCtx.ResourceGroupName = resourcegroup.DefaultResourceGroupName

pkg/sessionctx/variable/sysvar_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,17 @@ func TestTiDBSchemaCacheSize(t *testing.T) {
17421742
require.Error(t, err)
17431743
}
17441744

1745+
func TestEnableWindowFunction(t *testing.T) {
1746+
vars := NewSessionVars(nil)
1747+
require.Equal(t, vars.EnableWindowFunction, DefEnableWindowFunction)
1748+
require.NoError(t, vars.SetSystemVar(TiDBEnableWindowFunction, "on"))
1749+
require.Equal(t, vars.EnableWindowFunction, true)
1750+
require.NoError(t, vars.SetSystemVar(TiDBEnableWindowFunction, "0"))
1751+
require.Equal(t, vars.EnableWindowFunction, false)
1752+
require.NoError(t, vars.SetSystemVar(TiDBEnableWindowFunction, "1"))
1753+
require.Equal(t, vars.EnableWindowFunction, true)
1754+
}
1755+
17451756
func TestTiDBAutoAnalyzeConcurrencyValidation(t *testing.T) {
17461757
vars := NewSessionVars(nil)
17471758

0 commit comments

Comments
 (0)