Merge branch 'master' into fix-issue-48755

.github/pull_request_template.md

@@ -13,7 +13,7 @@ PR Title Format:
 
 Please create an issue first to describe the problem.
 
-There MUST be one line starting with "Issue Number:  " and 
+There MUST be one line starting with "Issue Number:  " and
 linking the relevant issues via the "close" or "ref".
 
 For more info, check https://pingcap.github.io/tidb-dev-guide/contribute-to-tidb/contribute-code.html#referring-to-an-issue.
@@ -24,7 +24,7 @@ Issue Number: close #xxx
 
 Problem Summary:
 
-### What is changed and how it works?
+### What changed and how does it work?
 
 ### Check List
 
@@ -35,7 +35,7 @@ Tests <!-- At least one of them must be included. -->
 - [ ] Manual test (add detailed scripts or steps below)
 - [ ] No need to test
   > - [ ] I checked and no code files have been changed.
-  > <!-- Or your custom  "No need to test" reasons -->  
+  > <!-- Or your custom  "No need to test" reasons -->
 
 Side effects
 

Makefile

@@ -301,6 +301,7 @@ bench-daily:
 	go test -tags intest github.com/pingcap/tidb/pkg/util/rowcodec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test -tags intest github.com/pingcap/tidb/pkg/util/codec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test -tags intest github.com/pingcap/tidb/pkg/distsql -run TestBenchDaily -bench Ignore --outfile bench_daily.json
+	go test -tags intest github.com/pingcap/tidb/pkg/statistics -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test -tags intest github.com/pingcap/tidb/pkg/util/benchdaily -run TestBenchDaily -bench Ignore \
 		-date `git log -n1 --date=unix --pretty=format:%cd` \
 		-commit `git log -n1 --pretty=format:%h` \

OWNERS_ALIASES

@@ -1,3 +1,4 @@
+# Sort the member alphabetically.
 aliases:
   sig-critical-approvers-tidb-server:
     - yudongusa
@@ -89,6 +90,11 @@ aliases:
     - wjhuang2016
     - ywqzzy
     - zimulala
+  sig-approvers-parser: # approvers for `parser` module.
+    - bb7133
+    - BornChanger
+    - D3Hunter
+    - tangenta
   sig-approvers-resourcemanager: # approvers for resourcemanager pkg
     - Benjamin2037
     - D3Hunter

WORKSPACE

@@ -16,12 +16,12 @@ versions.check(minimum_bazel_version = "6.0.0")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "eff2811014f8b26d91fadda335000cbfce145674368bcd732fbf782adb53a778",
-    strip_prefix = "rules_go-df20c987afcbbc721518c79f9c6489d87d73582c",
+    sha256 = "d6ab6b57e48c09523e93050f13698f708428cfd5e619252e369d377af6597707",
     urls = [
-        "http://bazel-cache.pingcap.net:8080/bazelbuild/rules_go/archive/df20c987afcbbc721518c79f9c6489d87d73582c.zip",
-        "http://ats.apps.svc/bazelbuild/rules_go/archive/df20c987afcbbc721518c79f9c6489d87d73582c.zip",
-        "https://github.com/bazelbuild/rules_go/archive/df20c987afcbbc721518c79f9c6489d87d73582c.zip",
+        "http://bazel-cache.pingcap.net:8080/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
+        "http://ats.apps.svc/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
     ],
 )
 

br/pkg/gluetidb/BUILD.bazel

@@ -18,6 +18,7 @@ go_library(
         "//pkg/parser/model",
         "//pkg/parser/mysql",
         "//pkg/session",
+        "//pkg/session/types",
         "//pkg/sessionctx",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_log//:log",

br/pkg/gluetidb/glue.go

@@ -22,6 +22,7 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/session"
+	sessiontypes "github.com/pingcap/tidb/pkg/session/types"
 	"github.com/pingcap/tidb/pkg/sessionctx"
 	pd "github.com/tikv/pd/client"
 	"go.uber.org/zap"
@@ -58,7 +59,7 @@ type Glue struct {
 }
 
 type tidbSession struct {
-	se session.Session
+	se sessiontypes.Session
 }
 
 // GetDomain implements glue.Glue.
@@ -358,7 +359,7 @@ func (gs *tidbSession) showCreatePlacementPolicy(policy *model.PolicyInfo) strin
 
 // mockSession is used for test.
 type mockSession struct {
-	se         session.Session
+	se         sessiontypes.Session
 	globalVars map[string]string
 }
 
@@ -434,11 +435,11 @@ func (s *mockSession) GetGlobalVariable(name string) (string, error) {
 
 // MockGlue only used for test
 type MockGlue struct {
-	se         session.Session
+	se         sessiontypes.Session
 	GlobalVars map[string]string
 }
 
-func (m *MockGlue) SetSession(se session.Session) {
+func (m *MockGlue) SetSession(se sessiontypes.Session) {
 	m.se = se
 }
 

br/pkg/lightning/backend/external/BUILD.bazel

@@ -9,9 +9,9 @@ go_library(
         "engine.go",
         "file.go",
         "iter.go",
-        "kv_buf.go",
         "kv_reader.go",
         "merge.go",
+        "onefile_writer.go",
         "split.go",
         "stat_reader.go",
         "util.go",
@@ -57,15 +57,15 @@ go_test(
         "engine_test.go",
         "file_test.go",
         "iter_test.go",
-        "kv_buf_test.go",
         "merge_test.go",
+        "onefile_writer_test.go",
         "split_test.go",
         "util_test.go",
         "writer_test.go",
     ],
     embed = [":external"],
     flaky = True,
-    shard_count = 46,
+    shard_count = 49,
     deps = [
         "//br/pkg/lightning/backend/kv",
         "//br/pkg/lightning/common",