statscache: improve stats cache benchmark

statistics/handle/bootstrap.go

@@ -58,7 +58,7 @@
 			Version:  row.GetUint64(0),
 			Name:     getFullTableName(is, tableInfo),
 		}
-		cache.PutFromInternal(physicalID, tbl) // put this table again since it is updated
+		cache.Put(physicalID, tbl) // put this table again since it is updated
 	}
 }
 
@@ -156,7 +156,7 @@
 			}
 			table.Columns[hist.ID] = col
 		}
-		cache.PutFromInternal(tblID, table) // put this table again since it is updated
+		cache.Put(tblID, table) // put this table again since it is updated
 	}
 }
 
@@ -225,7 +225,7 @@
 			lastAnalyzePos.Copy(&col.LastAnalyzePos)
 			table.Columns[hist.ID] = col
 		}
-		cache.PutFromInternal(tblID, table) // put this table again since it is updated
+		cache.Put(tblID, table) // put this table again since it is updated
 	}
 }
 
@@ -293,7 +293,7 @@
 		data := make([]byte, len(row.GetBytes(2)))
 		copy(data, row.GetBytes(2))
 		idx.TopN.AppendTopN(data, row.GetUint64(3))
-		cache.PutFromInternal(table.PhysicalID, table) // put this table again since it is updated
+		cache.Put(table.PhysicalID, table) // put this table again since it is updated
 	}
 	for idx := range affectedIndexes {
 		idx.TopN.Sort()
@@ -346,7 +346,7 @@
 				colStats.FMSketch = fms
 			}
 		}
-		cache.PutFromInternal(table.PhysicalID, table) // put this table again since it is updated
+		cache.Put(table.PhysicalID, table) // put this table again since it is updated
 	}
 }
 
@@ -418,7 +418,7 @@
 			}
 		}
 		hist.AppendBucketWithNDV(&lower, &upper, row.GetInt64(3), row.GetInt64(4), row.GetInt64(7))
-		cache.PutFromInternal(tableID, table) // put this table again since it is updated
+		cache.Put(tableID, table) // put this table again since it is updated
 	}
 }
 
@@ -456,7 +456,7 @@
 			}
 			col.PreCalculateScalar()
 		}
-		cache.PutFromInternal(table.PhysicalID, table) // put this table again since it is updated
+		cache.Put(table.PhysicalID, table) // put this table again since it is updated
 	}
 	return nil
 }

statistics/handle/cache/bench_test.go

@@ -34,15 +34,62 @@ func benchCopyAndUpdate(b *testing.B, c *StatsCachePointer) {
 			defer wg.Done()
 			t1 := testutil.NewMockStatisticsTable(1, 1, true, false, false)
 			t1.PhysicalID = rand.Int63()
-			cache := c.Load()
-			c.Replace(cache.CopyAndUpdate([]*statistics.Table{t1}, nil))
+			c.UpdateStatsCache(c.Load(), []*statistics.Table{t1}, nil)
 		}()
 	}
 	wg.Wait()
 	b.StopTimer()
 }
 
-func BenchmarkStatsCacheLRUCopyAndUpdate(b *testing.B) {
+func benchPutGet(b *testing.B, c *StatsCachePointer) {
+	var wg sync.WaitGroup
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		wg.Add(1)
+		go func(i int) {
+			defer wg.Done()
+			t1 := testutil.NewMockStatisticsTable(1, 1, true, false, false)
+			t1.PhysicalID = rand.Int63()
+			c.UpdateStatsCache(c.Load(), []*statistics.Table{t1}, nil)
+		}(i)
+	}
+	for i := 0; i < b.N; i++ {
+		wg.Add(1)
+		go func(i int) {
+			defer wg.Done()
+			c.Load().GetFromUser(int64(i))
+		}(i)
+	}
+	wg.Wait()
+	b.StopTimer()
+}
+
+func benchGet(b *testing.B, c *StatsCachePointer) {
+	var w sync.WaitGroup
+	for i := 0; i < b.N; i++ {
+		w.Add(1)
+		go func(i int) {
+			defer w.Done()
+			t1 := testutil.NewMockStatisticsTable(1, 1, true, false, false)
+			t1.PhysicalID = rand.Int63()
+			c.UpdateStatsCache(c.Load(), []*statistics.Table{t1}, nil)
+		}(i)
+	}
+	w.Wait()
+	b.ResetTimer()
+	var wg sync.WaitGroup
+	for i := 0; i < b.N; i++ {
+		wg.Add(1)
+		go func(i int) {
+			defer wg.Done()
+			c.Load().GetFromUser(int64(i))
+		}(i)
+	}
+	wg.Wait()
+	b.StopTimer()
+}
+
+func BenchmarkStatsCacheLFUCopyAndUpdate(b *testing.B) {
 	restore := config.RestoreFunc()
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
@@ -68,9 +115,65 @@ func BenchmarkStatsCacheMapCacheCopyAndUpdate(b *testing.B) {
 	benchCopyAndUpdate(b, cache)
 }
 
-func TestBenchDaily(t *testing.T) {
+func BenchmarkLFUCachePutGet(b *testing.B) {
+	restore := config.RestoreFunc()
+	defer restore()
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.Performance.EnableStatsCacheMemQuota = true
+	})
+	cache, err := NewStatsCachePointer()
+	if err != nil {
+		b.Fail()
+	}
+	benchPutGet(b, cache)
+}
+
+func BenchmarkMapCachePutGet(b *testing.B) {
+	restore := config.RestoreFunc()
+	defer restore()
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.Performance.EnableStatsCacheMemQuota = false
+	})
+	cache, err := NewStatsCachePointer()
+	if err != nil {
+		b.Fail()
+	}
+	benchPutGet(b, cache)
+}
+
+func BenchmarkLFUCacheGet(b *testing.B) {
+	restore := config.RestoreFunc()
+	defer restore()
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.Performance.EnableStatsCacheMemQuota = true
+	})
+	cache, err := NewStatsCachePointer()
+	if err != nil {
+		b.Fail()
+	}
+	benchGet(b, cache)
+}
+
+func BenchmarkMapCacheGet(b *testing.B) {
+	restore := config.RestoreFunc()
+	defer restore()
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.Performance.EnableStatsCacheMemQuota = false
+	})
+	cache, err := NewStatsCachePointer()
+	if err != nil {
+		b.Fail()
+	}
+	benchGet(b, cache)
+}
+
+func TestBenchDaily(*testing.T) {
 	benchdaily.Run(
-		BenchmarkStatsCacheLRUCopyAndUpdate,
+		BenchmarkStatsCacheLFUCopyAndUpdate,
 		BenchmarkStatsCacheMapCacheCopyAndUpdate,
+		BenchmarkLFUCachePutGet,
+		BenchmarkMapCachePutGet,
+		BenchmarkLFUCacheGet,
+		BenchmarkMapCacheGet,
 	)
 }

statistics/handle/cache/internal/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "cache",
@@ -15,17 +15,3 @@ go_library(
     visibility = ["//statistics/handle/cache:__subpackages__"],
     deps = ["//statistics"],
 )
-
-go_test(
-    name = "internal_test",
-    timeout = "short",
-    srcs = ["bench_test.go"],
-    flaky = True,
-    deps = [
-        ":internal",
-        "//statistics/handle/cache/internal/lfu",
-        "//statistics/handle/cache/internal/mapcache",
-        "//statistics/handle/cache/internal/testutil",
-        "//util/benchdaily",
-    ],
-)

statistics/handle/cache/internal/inner.go

@@ -26,7 +26,7 @@ type StatsCacheInner interface {
 	// Get gets the cache.
 	Get(tid int64, moveFront bool) (*statistics.Table, bool)
 	// Put puts a cache.
-	Put(tid int64, tbl *statistics.Table, moveLRUFront bool) bool
+	Put(tid int64, tbl *statistics.Table) bool
 	// Del deletes a cache.
 	Del(int64)
 	// Cost returns the memory usage of the cache.

statistics/handle/cache/internal/lfu/lfu_cache.go

@@ -73,12 +73,7 @@ func (s *LFU) Get(tid int64, _ bool) (*statistics.Table, bool) {
 }
 
 // Put implements statsCacheInner
-func (s *LFU) Put(tblID int64, tbl *statistics.Table, _ bool) bool {
-	return s.put(tblID, tbl)
-}
-
-// Put implements statsCacheInner
-func (s *LFU) put(tblID int64, tbl *statistics.Table) bool {
+func (s *LFU) Put(tblID int64, tbl *statistics.Table) bool {
 	ok := s.cache.Set(tblID, tbl, tbl.MemoryUsage().TotalTrackingMemUsage())
 	if ok { // NOTE: `s.cache` and `s.resultKeySet` may be inconsistent since the update operation is not atomic, but it's acceptable for our scenario
 		s.resultKeySet.Add(tblID)