merge master

Author: tiancaiamao

DEPS.bzl

@@ -7792,13 +7792,13 @@ def go_deps():
         build_tags = ["nextgen", "intest"],
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/client-go/v2",
-        sha256 = "4be6ba1edf6018767ec313880f3a05a0df1d9c715a9d7a1677f8f7cd4469cc7a",
-        strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20251023143337-dcb62bb1215d",
+        sha256 = "fa11c83fe209e61cafe818e89b3085b70ab62ebc1b74fc37a263c178ad3afefe",
+        strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20251028065425-b7d4dfd8520e",
         urls = [
-            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251023143337-dcb62bb1215d.zip",
-            "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251023143337-dcb62bb1215d.zip",
-            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251023143337-dcb62bb1215d.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251023143337-dcb62bb1215d.zip",
+            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251028065425-b7d4dfd8520e.zip",
+            "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251028065425-b7d4dfd8520e.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251028065425-b7d4dfd8520e.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251028065425-b7d4dfd8520e.zip",
         ],
     )
     go_repository(

Makefile

@@ -405,12 +405,14 @@ bench-daily:
 	go test github.com/pingcap/tidb/pkg/executor/test/splittest -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/expression -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/planner/core/tests/partition -run TestBenchDaily -bench Ignore --outfile bench_daily.json
+	go test github.com/pingcap/tidb/pkg/planner/core/casetest/tpcds -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/planner/core/casetest/tpch -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/session -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/statistics -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/table/tables -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/tablecodec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/util/codec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
+	go test github.com/pingcap/tidb/pkg/util/ranger -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/util/rowcodec -run TestBenchDaily -bench Ignore --outfile bench_daily.json
 	go test github.com/pingcap/tidb/pkg/util/benchdaily -run TestBenchDaily -bench Ignore \
 		-date `git log -n1 --date=unix --pretty=format:%cd` \

OWNERS_ALIASES

@@ -1,6 +1,11 @@
 # See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/#owners_aliases
 # The members of 'sig-community-*' are synced from memberships defined in repository: https://github.com/pingcap/community.
 aliases:
+  sig-approvers-stats:
+    - mjonss
+    - 0xPoe
+    - time-and-fate
+    - terry1purcell
   sig-critical-approvers-tidb-server:
     - yudongusa
     - BenMeadowcroft
@@ -145,6 +150,7 @@ aliases:
     - fzzf678
     - gengliqi
     - ghazalfamilyusa
+    - henrybw
     - iamxy
     - js00070
     - lamxTyler
@@ -158,6 +164,7 @@ aliases:
     - spongedu
     - tangwz
     - tsthght
+    - wddevries
     - xzhangxian1008
     - yibin87
     - zhangjinpeng1987
@@ -184,6 +191,7 @@ aliases:
     - Leavrth
     - Little-Wallace
     - MyonKeminta
+    - OliverS929
     - Reminiscent
     - SunRunAway
     - Tammyxia

br/pkg/streamhelper/basic_lib_for_test.go

@@ -789,7 +789,7 @@ func (t *testEnv) putTask() {
 	t.taskCh <- tsk
 }
 
-func (t *testEnv) ScanLocksInOneRegion(bo *tikv.Backoffer, key []byte, maxVersion uint64, limit uint32) ([]*txnlock.Lock, *tikv.KeyLocation, error) {
+func (t *testEnv) ScanLocksInOneRegion(bo *tikv.Backoffer, key []byte, endKey []byte, maxVersion uint64, limit uint32) ([]*txnlock.Lock, *tikv.KeyLocation, error) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
 	if t.maxTs != maxVersion {

build/nogo_config.json

@@ -511,6 +511,7 @@
   "misspell": {
     "exclude_files": {
       "pkg/parser/parser.go": "parser/parser.go code",
+      "pkg/planner/core/casetest/tpcds/main_test.go": "ignore code",
       "/cgo/": "ignore cgo code",
       "external/": "no need to vet third party code",
       "$GOROOT/": "ignore GOROOT code",

cmd/tidb-server/main.go

@@ -881,6 +881,8 @@ func setGlobalVars() {
 	{
 		setInstanceVar(vardef.TiDBStmtSummaryMaxStmtCount, strconv.FormatUint(cfg.Instance.StmtSummaryMaxStmtCount, 10))
 		setInstanceVar(vardef.TiDBServerMemoryLimit, cfg.Instance.ServerMemoryLimit)
+		setInstanceVar(vardef.TiDBMemArbitratorMode, cfg.Instance.MemArbitratorMode)
+		setInstanceVar(vardef.TiDBMemArbitratorSoftLimit, cfg.Instance.MemArbitratorSoftLimit)
 		setInstanceVar(vardef.TiDBServerMemoryLimitGCTrigger, cfg.Instance.ServerMemoryLimitGCTrigger)
 		setInstanceVar(vardef.TiDBInstancePlanCacheMaxMemSize, cfg.Instance.InstancePlanCacheMaxMemSize)
 		setInstanceVar(vardef.TiDBStatsCacheMemQuota, strconv.FormatUint(cfg.Instance.StatsCacheMemQuota, 10))

docs/design/2023-09-12-grouping-sets.md

@@ -157,7 +157,7 @@ Multi Distinct Aggregation is not strong dependent on grouping sets and expand o
 
 From the explanation result above, we could find that, aggregation has been pull as long as 3 stages.
 
-- `HashAgg_24` is used to group underlying data with a unified group expressions (a,b), while actually for a specified data replica from level-projection expressions: like [a, null], group-by(a,b) is functioned as group(a), which is exactly what `count(distint a)` wants.
+- `HashAgg_24` is used to group underlying data with a unified group expressions (a,b), while actually for a specified data replica from level-projection expressions: like [a, null], group-by(a,b) is functioned as group(a), which is exactly what `count(distinct a)` wants.
 - `HashAgg_28` is used to firstly count(distinct x) partial result after data shuffled by [gid, a, b]
 - `HashAgg_26` is used to secondly collect all partial result as final result after distributing intensive computation task out and data are pass through to single node again.
 

docs/design/2024-01-09-pipelined-DML.md

@@ -215,7 +215,7 @@ We choose option 2 for its simplicity and more predictable delivery.
 
 The interface remains unchanged. Users of the new mem buffer see no difference between normal and large transactions.
 
-After every write opertion to memdb, trigger a check to start flush. The check condition can be based on the number of keys in current memdb, or the current total size of memdb.
+After every write operation to memdb, trigger a check to start flush. The check condition can be based on the number of keys in current memdb, or the current total size of memdb.
 
 If the mutable memdb becomes too large and the last flush has not finished, the write is blocked until the last flush finishes.
 
@@ -343,7 +343,7 @@ A read request meets a lock written by the large txn.
 
 - read_ts < start_ts of the large txn, ignore lock
 - read_ts >= start_ts of the large txn. Similar to old large transactions, it calls `check_txn_status` on the PK, trying to push its `min_commit_ts` so that `min_commit_ts` > `read_ts` of the read request. If `min_commit_ts` is successfully pushed, the read request can ignore the lock.
-  - If `min_commit_ts` is continuously pushed, the large txn may have difficuly in committing. It is also bad practice to have read-write conflict.
+  - If `min_commit_ts` is continuously pushed, the large txn may have difficulty in committing. It is also bad practice to have read-write conflict.
 
 **Large-read x normal write**
 

docs/tidb_http_api.md

@@ -571,7 +571,7 @@ timezone.*
      curl http://{TiDBIP}:10080/ddl/history
      ```
 
-     **Note**: When the DDL history is very very long, system table may containg too many jobs. This interface will get a maximum of 2048 history ddl jobs by default. If you want get more jobs, consider adding `start_job_id` and `limit`.
+     **Note**: When the DDL history is very very long, system table may containing too many jobs. This interface will get a maximum of 2048 history ddl jobs by default. If you want get more jobs, consider adding `start_job_id` and `limit`.
 
 26. Get count {number} TiDB DDL job history information.
 

dumpling/log/log.go

@@ -60,7 +60,7 @@ func NewAppLogger(logger *zap.Logger) Logger {
 	return Logger{logger}
 }
 
-// ShortError contructs a field which only records the error message without the
+// ShortError constructs a field which only records the error message without the
 // verbose text (i.e. excludes the stack trace).
 func ShortError(err error) zap.Field {
 	if err == nil {