Skip to content

statistics: Remove the ineffective dirty IDs from the row count cache #56287

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

Merged
merged 6 commits into from
Mar 2, 2025
Merged

statistics: Remove the ineffective dirty IDs from the row count cache #56287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5e8c85
statistics: Do not refresh the modification time if only update for o…
0xPoe Sep 25, 2024
42e028c
refactor: remove modifyTime and dirtyIDs from StatsTableRowCache
0xPoe Feb 12, 2025
fd2844d
refactor: remove cache dependency from statistics handle packages
0xPoe Feb 12, 2025
b61039b
fix: update index_length for table 't' in information_schema.result
0xPoe Feb 13, 2025
9f5dda4
fix: correct index_length for table 't' in information_schema.result
0xPoe Feb 13, 2025
f3b75ac
refactor: ensure stats cache updates for main table in partitioned ta…
0xPoe Feb 28, 2025
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
14 changes: 8 additions & 6 deletions pkg/executor/infoschema_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,12 +682,14 @@ func (e *memtableRetriever) setDataFromOneTable(

var rowCount, avgRowLength, dataLength, indexLength uint64
if useStatsCache {
if table.GetPartitionInfo() == nil {
err := cache.TableRowStatsCache.UpdateByID(sctx, table.ID)
if err != nil {
return rows, err
}
} else {
// Even for partitioned tables, we must update the stats cache for the main table itself.
// This is necessary because the global index length from the table also needs to be included.
// For further details, see: https://github.com/pingcap/tidb/issues/54173
err := cache.TableRowStatsCache.UpdateByID(sctx, table.ID)
if err != nil {
return rows, err
}
if table.GetPartitionInfo() != nil {
// needs to update all partitions for partition table.
for _, pi := range table.GetPartitionInfo().Definitions {
err := cache.TableRowStatsCache.UpdateByID(sctx, pi.ID)
Expand Down
48 changes: 5 additions & 43 deletions pkg/statistics/handle/cache/stats_table_row_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,9 @@ type tableHistID struct {

// StatsTableRowCache is used to cache the count of table rows.
type StatsTableRowCache struct {
modifyTime time.Time
tableRows map[int64]uint64
colLength map[tableHistID]uint64
dirtyIDs []int64
mu syncutil.RWMutex
}

// Invalidate invalidates the cache of the table with id.
func (c *StatsTableRowCache) Invalidate(tblID int64) {
c.mu.Lock()
defer c.mu.Unlock()
// To prevent the cache from becoming too large,
// we only record the latest 100 dirty tables that have been modified.
if len(c.dirtyIDs) < 100 {
c.dirtyIDs = append(c.dirtyIDs, tblID)
}
tableRows map[int64]uint64
colLength map[tableHistID]uint64
mu syncutil.RWMutex
}

// GetTableRows gets the count of table rows.
Expand All @@ -77,34 +64,8 @@ func (c *StatsTableRowCache) GetColLength(id tableHistID) uint64 {
return c.colLength[id]
}

func (c *StatsTableRowCache) updateDirtyIDs(sctx sessionctx.Context) error {
if len(c.dirtyIDs) > 0 {
tableRows, err := getRowCountTables(sctx, c.dirtyIDs...)
if err != nil {
return err
}
for id, tr := range tableRows {
c.tableRows[id] = tr
}
colLength, err := getColLengthTables(sctx, c.dirtyIDs...)
if err != nil {
return err
}
for id, cl := range colLength {
c.colLength[id] = cl
}
c.dirtyIDs = c.dirtyIDs[:0]
}
return nil
}

// UpdateByID tries to update the cache by table ID.
func (c *StatsTableRowCache) UpdateByID(sctx sessionctx.Context, id int64) error {
c.mu.Lock()
defer c.mu.Unlock()
if time.Since(c.modifyTime) < tableStatsCacheExpiry {
return c.updateDirtyIDs(sctx)
}
tableRows, err := getRowCountTables(sctx, id)
if err != nil {
return err
Expand All @@ -113,11 +74,12 @@ func (c *StatsTableRowCache) UpdateByID(sctx sessionctx.Context, id int64) error
if err != nil {
return err
}
c.mu.Lock()
defer c.mu.Unlock()
c.tableRows[id] = tableRows[id]
for k, v := range colLength {
c.colLength[k] = v
}
c.modifyTime = time.Now()
return nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/statistics/handle/history/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ go_library(
deps = [
"//pkg/meta/model",
"//pkg/sessionctx",
"//pkg/statistics/handle/cache",
"//pkg/statistics/handle/logutil",
"//pkg/statistics/handle/storage",
"//pkg/statistics/handle/types",
Expand Down
2 changes: 0 additions & 2 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 @@ -21,7 +21,6 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/statistics/handle/cache"
statslogutil "github.com/pingcap/tidb/pkg/statistics/handle/logutil"
"github.com/pingcap/tidb/pkg/statistics/handle/storage"
"github.com/pingcap/tidb/pkg/statistics/handle/types"
Expand Down Expand Up @@ -172,7 +171,6 @@ func RecordHistoricalStatsMeta(
); err != nil {
return errors.Trace(err)
}
cache.TableRowStatsCache.Invalidate(tableID)

return nil
}
Expand Down
1 change: 0 additions & 1 deletion pkg/statistics/handle/lockstats/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/sessionctx",
"//pkg/statistics/handle/cache",
"//pkg/statistics/handle/logutil",
"//pkg/statistics/handle/types",
"//pkg/statistics/handle/util",
Expand Down
4 changes: 0 additions & 4 deletions pkg/statistics/handle/lockstats/unlock_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/statistics/handle/cache"
statslogutil "github.com/pingcap/tidb/pkg/statistics/handle/logutil"
"github.com/pingcap/tidb/pkg/statistics/handle/types"
"github.com/pingcap/tidb/pkg/statistics/handle/util"
Expand Down Expand Up @@ -169,7 +168,6 @@ func updateStatsAndUnlockTable(sctx sessionctx.Context, tid int64) error {
if err := updateDelta(sctx, count, modifyCount, tid); err != nil {
return err
}
cache.TableRowStatsCache.Invalidate(tid)

_, _, err = util.ExecRows(
sctx,
Expand All @@ -188,11 +186,9 @@ func updateStatsAndUnlockPartition(sctx sessionctx.Context, partitionID int64, t
if err := updateDelta(sctx, count, modifyCount, partitionID); err != nil {
return err
}
cache.TableRowStatsCache.Invalidate(partitionID)
if err := updateDelta(sctx, count, modifyCount, tid); err != nil {
return err
}
cache.TableRowStatsCache.Invalidate(tid)

_, _, err = util.ExecRows(
sctx,
Expand Down
1 change: 0 additions & 1 deletion pkg/statistics/handle/storage/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ go_library(
"//pkg/sessionctx/variable",
"//pkg/statistics",
"//pkg/statistics/asyncload",
"//pkg/statistics/handle/cache",
"//pkg/statistics/handle/lockstats",
"//pkg/statistics/handle/logutil",
"//pkg/statistics/handle/metrics",
Expand Down
2 changes: 0 additions & 2 deletions pkg/statistics/handle/storage/gc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/sessionctx/vardef"
"github.com/pingcap/tidb/pkg/statistics"
"github.com/pingcap/tidb/pkg/statistics/handle/cache"
"github.com/pingcap/tidb/pkg/statistics/handle/lockstats"
"github.com/pingcap/tidb/pkg/statistics/handle/types"
"github.com/pingcap/tidb/pkg/statistics/handle/util"
Expand Down Expand Up @@ -308,7 +307,6 @@ func gcTableStats(sctx sessionctx.Context,
if err != nil {
return errors.Trace(err)
}
cache.TableRowStatsCache.Invalidate(physicalID)
return nil
}

Expand Down
4 changes: 0 additions & 4 deletions pkg/statistics/handle/storage/save.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/pingcap/tidb/pkg/parser/terror"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/statistics"
"github.com/pingcap/tidb/pkg/statistics/handle/cache"
statslogutil "github.com/pingcap/tidb/pkg/statistics/handle/logutil"
"github.com/pingcap/tidb/pkg/statistics/handle/util"
"github.com/pingcap/tidb/pkg/types"
Expand Down Expand Up @@ -236,7 +235,6 @@ func SaveTableStatsToStorage(sctx sessionctx.Context,
}
statsVer = version
}
cache.TableRowStatsCache.Invalidate(tableID)
// 2. Save histograms.
for _, result := range results.Ars {
for i, hg := range result.Hist {
Expand Down Expand Up @@ -338,7 +336,6 @@ func SaveStatsToStorage(
// If the count is less than 0, then we do not want to update the modify count and count.
if count >= 0 {
_, err = util.Exec(sctx, "replace into mysql.stats_meta (version, table_id, count, modify_count) values (%?, %?, %?, %?)", version, tableID, count, modifyCount)
cache.TableRowStatsCache.Invalidate(tableID)
} else {
_, err = util.Exec(sctx, "update mysql.stats_meta set version = %? where table_id = %?", version, tableID)
}
Expand Down Expand Up @@ -389,7 +386,6 @@ func SaveMetaToStorage(
}
_, err = util.Exec(sctx, "replace into mysql.stats_meta (version, table_id, count, modify_count) values (%?, %?, %?, %?)", version, tableID, count, modifyCount)
statsVer = version
cache.TableRowStatsCache.Invalidate(tableID)
return
}

Expand Down
6 changes: 0 additions & 6 deletions pkg/statistics/handle/storage/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/sessionctx/variable"
"github.com/pingcap/tidb/pkg/statistics"
"github.com/pingcap/tidb/pkg/statistics/handle/cache"
"github.com/pingcap/tidb/pkg/statistics/handle/types"
statsutil "github.com/pingcap/tidb/pkg/statistics/handle/util"
)
Expand Down Expand Up @@ -159,11 +158,6 @@ func UpdateStatsMeta(
}
}

// Invalidate cache for all unlocked tables
for _, id := range cacheInvalidateIDs {
cache.TableRowStatsCache.Invalidate(id)
}

return nil
}

Expand Down