statistics: refactor test package

pkg/statistics/handle/globalstats/BUILD.bazel

@@ -34,17 +34,28 @@ go_library(
 go_test(
     name = "globalstats_test",
     timeout = "short",
-    srcs = ["topn_bench_test.go"],
-    embed = [":globalstats"],
+    srcs = [
+        "globalstats_test.go",
+        "main_test.go",
+        "topn_bench_test.go",
+    ],
     flaky = True,
+    shard_count = 14,
     deps = [
+        ":globalstats",
+        "//pkg/config",
+        "//pkg/parser/model",
         "//pkg/parser/mysql",
         "//pkg/sessionctx/stmtctx",
         "//pkg/statistics",
+        "//pkg/testkit",
+        "//pkg/testkit/testsetup",
         "//pkg/types",
         "//pkg/util/chunk",
         "//pkg/util/codec",
+        "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_stretchr_testify//require",
         "@com_github_tiancaiamao_gp//:gp",
+        "@org_uber_go_goleak//:goleak",
     ],
 )

pkg/statistics/handle/handletest/globalstats/globalstats_test.go → pkg/statistics/handle/globalstats/globalstats_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package globalstats
+package globalstats_test
 
 import (
 	"fmt"

pkg/statistics/handle/globalstats/main_test.go

@@ -0,0 +1,33 @@
+// Copyright 2023 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package globalstats_test
+
+import (
+	"testing"
+
+	"github.com/pingcap/tidb/pkg/testkit/testsetup"
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	opts := []goleak.Option{
+		goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"),
+		goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
+		goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
+		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
+	}
+	testsetup.SetupForCommonTest()
+	goleak.VerifyTestMain(m, opts...)
+}

pkg/statistics/handle/globalstats/topn_bench_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package globalstats
+package globalstats_test
 
 import (
 	"fmt"
@@ -22,6 +22,7 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/pkg/statistics"
+	"github.com/pingcap/tidb/pkg/statistics/handle/globalstats"
 	"github.com/pingcap/tidb/pkg/types"
 	"github.com/pingcap/tidb/pkg/util/chunk"
 	"github.com/pingcap/tidb/pkg/util/codec"
@@ -123,20 +124,20 @@ func benchmarkMergeGlobalStatsTopNByConcurrencyWithHists(partitions int, b *test
 		h.Buckets = append(h.Buckets, statistics.Bucket{Repeat: 10, Count: 40})
 		hists = append(hists, h)
 	}
-	wrapper := NewStatsWrapper(hists, topNs)
+	wrapper := globalstats.NewStatsWrapper(hists, topNs)
 	const mergeConcurrency = 4
 	batchSize := len(wrapper.AllTopN) / mergeConcurrency
 	if batchSize < 1 {
 		batchSize = 1
-	} else if batchSize > MaxPartitionMergeBatchSize {
-		batchSize = MaxPartitionMergeBatchSize
+	} else if batchSize > globalstats.MaxPartitionMergeBatchSize {
+		batchSize = globalstats.MaxPartitionMergeBatchSize
 	}
 	gpool := gp.New(mergeConcurrency, 5*time.Minute)
 	defer gpool.Close()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		// Benchmark merge 10 topN.
-		_, _, _, _ = MergeGlobalStatsTopNByConcurrency(gpool, mergeConcurrency, batchSize, wrapper, loc, version, 10, false, &isKilled)
+		_, _, _, _ = globalstats.MergeGlobalStatsTopNByConcurrency(gpool, mergeConcurrency, batchSize, wrapper, loc, version, 10, false, &isKilled)
 	}
 }
 

pkg/statistics/handle/lockstats/BUILD.bazel

@@ -25,6 +25,7 @@ go_test(
     timeout = "short",
     srcs = [
         "lock_stats_test.go",
+        "main_test.go",
         "query_lock_test.go",
         "unlock_stats_test.go",
     ],
@@ -36,13 +37,15 @@ go_test(
         "//pkg/parser/mysql",
         "//pkg/sessionctx",
         "//pkg/statistics/handle/util",
+        "//pkg/testkit/testsetup",
         "//pkg/types",
         "//pkg/util/chunk",
         "//pkg/util/mock",
         "//pkg/util/sqlexec/mock",
         "@com_github_pingcap_errors//:errors",
         "@com_github_stretchr_testify//require",
         "@com_github_tikv_client_go_v2//util",
+        "@org_uber_go_goleak//:goleak",
         "@org_uber_go_mock//gomock",
     ],
 )

pkg/statistics/handle/handletest/globalstats/main_test.go → pkg/statistics/handle/lockstats/main_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package globalstats
+package lockstats
 
 import (
 	"testing"