Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sysvar: Do not allow set tidb_auto_analyze_ratio to 0 #52190

Merged
merged 10 commits into from
Mar 29, 2024
Merged

sysvar: Do not allow set tidb_auto_analyze_ratio to 0 #52190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
921aa11
sysvar: Do not allow set tidb_auto_analyze_ratio to 0
Rustin170506 Mar 28, 2024
d7e7297
chore: better error message
Rustin170506 Mar 28, 2024
570b222
test: add more tests
Rustin170506 Mar 28, 2024
bdda229
test: fix broken tests
Rustin170506 Mar 28, 2024
9fb8d65
test: fix broken tests
Rustin170506 Mar 28, 2024
ddf1ce1
fix: use 0.5
Rustin170506 Mar 28, 2024
4aa696f
fix
Rustin170506 Mar 28, 2024
e5a7a6c
fix
Rustin170506 Mar 28, 2024
b2bd0b4
test: fix broken test
Rustin170506 Mar 28, 2024
3f48283
test: fix broken tests
Rustin170506 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion pkg/sessionctx/variable/sysvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,27 @@ var defaultSysVars = []*SysVar{
EnableLocalTxn.Store(newVal)
return nil
}},
{Scope: ScopeGlobal, Name: TiDBAutoAnalyzeRatio, Value: strconv.FormatFloat(DefAutoAnalyzeRatio, 'f', -1, 64), Type: TypeFloat, MinValue: 0, MaxValue: math.MaxUint64},
{
Scope: ScopeGlobal,
Name: TiDBAutoAnalyzeRatio,
Value: strconv.FormatFloat(DefAutoAnalyzeRatio, 'f', -1, 64),
Type: TypeFloat,
MinValue: 0,
MaxValue: math.MaxUint64,
// The value of TiDBAutoAnalyzeRatio should be greater than 0.00001 or equal to 0.00001.
Validation: func(vars *SessionVars, normalizedValue string, originalValue string, scope ScopeFlag) (string, error) {
ratio, err := strconv.ParseFloat(normalizedValue, 64)
if err != nil {
return "", err
}
const minRatio = 0.00001
const tolerance = 1e-9
if ratio < minRatio && math.Abs(ratio-minRatio) > tolerance {
return "", errors.Errorf("the value of %s should be greater than or equal to %f", TiDBAutoAnalyzeRatio, minRatio)
}
return normalizedValue, nil
},
},
{Scope: ScopeGlobal, Name: TiDBAutoAnalyzeStartTime, Value: DefAutoAnalyzeStartTime, Type: TypeTime},
{Scope: ScopeGlobal, Name: TiDBAutoAnalyzeEndTime, Value: DefAutoAnalyzeEndTime, Type: TypeTime},
{Scope: ScopeGlobal, Name: TiDBMemQuotaBindingCache, Value: strconv.FormatInt(DefTiDBMemQuotaBindingCache, 10), Type: TypeUnsigned, MaxValue: math.MaxInt32, GetGlobal: func(_ context.Context, sv *SessionVars) (string, error) {
Expand Down
55 changes: 55 additions & 0 deletions pkg/sessionctx/variable/sysvar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,6 +1353,61 @@ func TestTiDBEnableRowLevelChecksum(t *testing.T) {
require.Equal(t, Off, val)
}

func TestTiDBAutoAnalyzeRatio(t *testing.T) {
ctx := context.Background()
vars := NewSessionVars(nil)
mock := NewMockGlobalAccessor4Tests()
mock.SessionVars = vars
vars.GlobalVarsAccessor = mock

// default to 0.5
val, err := mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "0.5", val)

// set to 0.1
err = mock.SetGlobalSysVar(ctx, TiDBAutoAnalyzeRatio, "0.1")
require.NoError(t, err)
val, err = mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "0.1", val)

// set to 1.1
err = mock.SetGlobalSysVar(ctx, TiDBAutoAnalyzeRatio, "1.1")
require.NoError(t, err)
val, err = mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "1.1", val)

// set to 0
err = mock.SetGlobalSysVar(ctx, TiDBAutoAnalyzeRatio, "0")
require.Error(t, err)
val, err = mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "1.1", val)

// set to 0.0000000001
err = mock.SetGlobalSysVar(ctx, TiDBAutoAnalyzeRatio, "0.0000000001")
require.Error(t, err)
val, err = mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "1.1", val)

// set to 0.00001
err = mock.SetGlobalSysVar(ctx, TiDBAutoAnalyzeRatio, "0.00001")
require.NoError(t, err)
val, err = mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "0.00001", val)

// set to 0.000009999
err = mock.SetGlobalSysVar(ctx, TiDBAutoAnalyzeRatio, "0.000009999")
require.Error(t, err)
val, err = mock.GetGlobalSysVar(TiDBAutoAnalyzeRatio)
require.NoError(t, err)
require.Equal(t, "0.00001", val)
}

func TestTiDBTiFlashReplicaRead(t *testing.T) {
vars := NewSessionVars(nil)
mock := NewMockGlobalAccessor4Tests()
Expand Down
3 changes: 1 addition & 2 deletions pkg/statistics/handle/autoanalyze/autoanalyze_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ func TestDisableAutoAnalyze(t *testing.T) {
is := dom.InfoSchema()
require.NoError(t, h.Update(is))

// Set auto analyze ratio to 0.
tk.MustExec("set @@global.tidb_auto_analyze_ratio = 0")
tk.MustExec("set @@global.tidb_enable_auto_analyze = 0")
exec.AutoAnalyzeMinCnt = 0
defer func() {
exec.AutoAnalyzeMinCnt = 1000
Expand Down
6 changes: 4 additions & 2 deletions pkg/statistics/handle/autoanalyze/refresher/refresher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ func TestSkipAnalyzeTableWhenAutoAnalyzeRatioIsZero(t *testing.T) {
)
tk.MustExec("insert into t1 values (1, 1), (2, 2), (3, 3)")
tk.MustExec("insert into t2 values (1, 1), (2, 2), (3, 3)")
// Set the auto analyze ratio to 0.
tk.MustExec("set global tidb_auto_analyze_ratio = 0")
// HACK: Set the auto analyze ratio to 0.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It didn't change the old behavior.

// We don't allow users to set the ratio to 0 anymore, but we still need to test this case.
// Because we need to compilable with the old configuration.
tk.MustExec("update mysql.global_variables set variable_value = '0' where variable_name = 'tidb_auto_analyze_ratio'")
handle := dom.StatsHandle()
require.NoError(t, handle.DumpStatsDeltaToKV(true))
require.NoError(t, handle.Update(dom.InfoSchema()))
Expand Down
6 changes: 3 additions & 3 deletions pkg/statistics/handle/updatetest/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func TestAutoUpdate(t *testing.T) {
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.2")
defer func() {
exec.AutoAnalyzeMinCnt = 1000
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.0")
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.5")
}()

do := dom
Expand Down Expand Up @@ -473,7 +473,7 @@ func TestAutoUpdatePartition(t *testing.T) {
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.6")
defer func() {
exec.AutoAnalyzeMinCnt = 1000
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.0")
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.5")
}()

do := dom
Expand Down Expand Up @@ -806,7 +806,7 @@ func TestAutoUpdatePartitionInDynamicOnlyMode(t *testing.T) {
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.1")
defer func() {
exec.AutoAnalyzeMinCnt = 1000
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.0")
testKit.MustExec("set global tidb_auto_analyze_ratio = 0.5")
}()

require.NoError(t, h.Update(is))
Expand Down