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

Jump to bottom

statistics: update stats_history table when it meets duplicate #54315

Merged
merged 4 commits into from
Jul 1, 2024
Merged

statistics: update stats_history table when it meets duplicate #54315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
369b023
statistics: update stats_history table when it meets duplicate
Defined2014 Jun 28, 2024
2c502a1
update
Defined2014 Jun 28, 2024
585a061
upate comment
Defined2014 Jun 28, 2024
de8cd7f
update
Defined2014 Jun 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
2 changes: 1 addition & 1 deletion pkg/statistics/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ go_test(
data = glob(["testdata/**"]),
embed = [":statistics"],
flaky = True,
shard_count = 37,
shard_count = 38,
deps = [
"//pkg/config",
"//pkg/parser/ast",
Expand Down
10 changes: 4 additions & 6 deletions pkg/statistics/handle/history/history_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,7 @@ func RecordHistoricalStatsToStorage(sctx sessionctx.Context, physicalID int64, j
version = js.Version
} else {
for _, p := range js.Partitions {
version = p.Version
if version != 0 {
break
}
version = max(version, p.Version)
}
}
blocks, err := storage.JSONTableToBlocks(js, maxColumnSize)
Expand All @@ -148,9 +145,10 @@ func RecordHistoricalStatsToStorage(sctx sessionctx.Context, physicalID int64, j
}

ts := time.Now().Format("2006-01-02 15:04:05.999999")
const sql = "INSERT INTO mysql.stats_history(table_id, stats_data, seq_no, version, create_time) VALUES (%?, %?, %?, %?, %?)"
const sql = "INSERT INTO mysql.stats_history(table_id, stats_data, seq_no, version, create_time) VALUES (%?, %?, %?, %?, %?)" +
"ON DUPLICATE KEY UPDATE stats_data=%?, create_time=%?"
for i := 0; i < len(blocks); i++ {
if _, err := util.Exec(sctx, sql, physicalID, blocks[i], i, version, ts); err != nil {
if _, err = util.Exec(sctx, sql, physicalID, blocks[i], i, version, ts, blocks[i], ts); err != nil {
return 0, errors.Trace(err)
}
}
Expand Down
28 changes: 28 additions & 0 deletions pkg/statistics/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,3 +575,31 @@ func TestTableLastAnalyzeVersion(t *testing.T) {
require.True(t, found)
require.NotEqual(t, uint64(0), statsTbl.LastAnalyzeVersion)
}

func TestGlobalIndexWithAnalyzeVersion1AndHistoricalStats(t *testing.T) {
store, dom := testkit.CreateMockStoreAndDomain(t)
tk := testkit.NewTestKit(t, store)

tk.MustExec("set tidb_enable_global_index = true")
tk.MustExec("set tidb_analyze_version = 1")
tk.MustExec("set global tidb_enable_historical_stats = true")
defer tk.MustExec("set global tidb_enable_historical_stats = default")

tk.MustExec("use test")
tk.MustExec(`CREATE TABLE t ( a int, b int, c int default 0)
PARTITION BY RANGE (a) (
PARTITION p0 VALUES LESS THAN (10),
PARTITION p1 VALUES LESS THAN (20),
PARTITION p2 VALUES LESS THAN (30),
PARTITION p3 VALUES LESS THAN (40))`)
tk.MustExec("ALTER TABLE t ADD UNIQUE INDEX idx(b)")
tk.MustExec("INSERT INTO t(a, b) values(1, 1), (2, 2), (3, 3), (15, 15), (25, 25), (35, 35)")

tblID := dom.MustGetTableID(t, "test", "t")

for i := 0; i < 10; i++ {
tk.MustExec("analyze table t")
}
// Each analyze will only generate one record
tk.MustQuery(fmt.Sprintf("select count(*) from mysql.stats_history where table_id=%d", tblID)).Equal(testkit.Rows("10"))
}