From 3810f6421ad397ad161b6ffdd2353cd58f3d9a16 Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Thu, 12 Oct 2023 17:53:01 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #47568 Signed-off-by: ti-chi-bot --- pkg/statistics/handle/storage/read.go | 18 +++++++++ statistics/handle/storage/BUILD.bazel | 56 +++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 statistics/handle/storage/BUILD.bazel diff --git a/pkg/statistics/handle/storage/read.go b/pkg/statistics/handle/storage/read.go index 6c1e4318dc21d..fddeec01bda2d 100644 --- a/pkg/statistics/handle/storage/read.go +++ b/pkg/statistics/handle/storage/read.go @@ -23,6 +23,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" +<<<<<<< HEAD:pkg/statistics/handle/storage/read.go "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/parser/ast" "github.com/pingcap/tidb/pkg/parser/model" @@ -37,6 +38,23 @@ import ( "github.com/pingcap/tidb/pkg/util/mathutil" "github.com/pingcap/tidb/pkg/util/memory" "github.com/pingcap/tidb/pkg/util/sqlexec" +======= + "github.com/pingcap/tidb/config" + "github.com/pingcap/tidb/parser/ast" + "github.com/pingcap/tidb/parser/model" + "github.com/pingcap/tidb/parser/mysql" + "github.com/pingcap/tidb/sessionctx" + "github.com/pingcap/tidb/sessionctx/stmtctx" + "github.com/pingcap/tidb/statistics" + "github.com/pingcap/tidb/statistics/handle/cache" + "github.com/pingcap/tidb/statistics/handle/util" + "github.com/pingcap/tidb/types" + "github.com/pingcap/tidb/util/chunk" + "github.com/pingcap/tidb/util/logutil" + "github.com/pingcap/tidb/util/mathutil" + "github.com/pingcap/tidb/util/memory" + "github.com/pingcap/tidb/util/sqlexec" +>>>>>>> f1670ba6130 (statistics: check Killed in the TableStatsFromStorage (#47568)):statistics/handle/storage/read.go "go.uber.org/zap" ) diff --git a/statistics/handle/storage/BUILD.bazel b/statistics/handle/storage/BUILD.bazel new file mode 100644 index 0000000000000..1b15d4eb398e3 --- /dev/null +++ b/statistics/handle/storage/BUILD.bazel @@ -0,0 +1,56 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "storage", + srcs = [ + "gc.go", + "json.go", + "read.go", + "save.go", + "update.go", + ], + importpath = "github.com/pingcap/tidb/statistics/handle/storage", + visibility = ["//visibility:public"], + deps = [ + "//config", + "//infoschema", + "//parser/ast", + "//parser/model", + "//parser/mysql", + "//parser/terror", + "//sessionctx", + "//sessionctx/stmtctx", + "//sessionctx/variable", + "//statistics", + "//statistics/handle/cache", + "//statistics/handle/lockstats", + "//statistics/handle/util", + "//types", + "//util/chunk", + "//util/compress", + "//util/logutil", + "//util/mathutil", + "//util/memory", + "//util/sqlexec", + "@com_github_klauspost_compress//gzip", + "@com_github_pingcap_errors//:errors", + "@com_github_pingcap_failpoint//:failpoint", + "@com_github_pingcap_tipb//go-tipb", + "@com_github_tikv_client_go_v2//oracle", + "@org_uber_go_zap//:zap", + ], +) + +go_test( + name = "storage_test", + timeout = "short", + srcs = ["read_test.go"], + flaky = True, + deps = [ + "//parser/model", + "//planner/cardinality", + "//testkit", + "//types", + "@com_github_stretchr_testify//require", + ], +) From 2275398151a5c63b90147bfe477b479328fc1d15 Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Mon, 30 Oct 2023 16:08:21 +0800 Subject: [PATCH 2/2] update Signed-off-by: Weizhen Wang --- pkg/statistics/handle/storage/read.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkg/statistics/handle/storage/read.go b/pkg/statistics/handle/storage/read.go index fddeec01bda2d..6c1e4318dc21d 100644 --- a/pkg/statistics/handle/storage/read.go +++ b/pkg/statistics/handle/storage/read.go @@ -23,7 +23,6 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" -<<<<<<< HEAD:pkg/statistics/handle/storage/read.go "github.com/pingcap/tidb/pkg/config" "github.com/pingcap/tidb/pkg/parser/ast" "github.com/pingcap/tidb/pkg/parser/model" @@ -38,23 +37,6 @@ import ( "github.com/pingcap/tidb/pkg/util/mathutil" "github.com/pingcap/tidb/pkg/util/memory" "github.com/pingcap/tidb/pkg/util/sqlexec" -======= - "github.com/pingcap/tidb/config" - "github.com/pingcap/tidb/parser/ast" - "github.com/pingcap/tidb/parser/model" - "github.com/pingcap/tidb/parser/mysql" - "github.com/pingcap/tidb/sessionctx" - "github.com/pingcap/tidb/sessionctx/stmtctx" - "github.com/pingcap/tidb/statistics" - "github.com/pingcap/tidb/statistics/handle/cache" - "github.com/pingcap/tidb/statistics/handle/util" - "github.com/pingcap/tidb/types" - "github.com/pingcap/tidb/util/chunk" - "github.com/pingcap/tidb/util/logutil" - "github.com/pingcap/tidb/util/mathutil" - "github.com/pingcap/tidb/util/memory" - "github.com/pingcap/tidb/util/sqlexec" ->>>>>>> f1670ba6130 (statistics: check Killed in the TableStatsFromStorage (#47568)):statistics/handle/storage/read.go "go.uber.org/zap" )