Resolve conflicts for RUv2 executor accounting PR

.agents/skills/README.md

@@ -17,6 +17,7 @@ Current operational workflow skills:
 - `tidb-test-guidelines`: test placement, naming, writing conventions, and shard_count guidance.
 - `tidb-issue-metadata-guard`: create or update TiDB issues without breaking required templates, labels, or issue metadata conventions.
 - `tidb-pr-metadata-guard`: create or update TiDB PR descriptions without breaking PR title scope conventions, required templates, HTML comments, or bot-parsed checklist sections.
+- `tidb-change-instruction-critic`: evaluate user/reviewer-prescribed code-change instructions critically, compare alternatives, and ask clarification questions before proceeding when risk or ambiguity exists.
 
 Use `AGENTS.md` for repository policy, validation/reporting requirements, and the pre-flight checklist.
 Use `docs/agents/testing-flow.md` for canonical build/test command playbooks.

.agents/skills/tidb-bazel-prepare-gate/SKILL.md

@@ -20,23 +20,34 @@ git status --short
 git diff --name-status
 git diff --name-status --cached
 git ls-files --others --exclude-standard
-git diff -U0 -- '*_test.go'
-git diff -U0 --cached -- '*_test.go'
+git diff -U0 -- '*.go'
+git diff -U0 --cached -- '*.go'
 ```
 
 ## Decision Rules
 
 Trigger conditions are defined in `AGENTS.md` -> `Build Flow` -> `When make bazel_prepare is required`.
 Compare the output from the commands above against those conditions.
 
-For the top-level test-function trigger in existing `*_test.go` files, inspect added lines in the
-`git diff -U0` output for patterns like:
+For the top-level test-function trigger in existing `*_test.go` files, inspect added lines in
+`git diff -U0 -- '*.go'` and `git diff -U0 --cached -- '*.go'` output for patterns like:
 
 ```diff
 +func TestXxx(t *testing.T) {
 ```
 
 and treat that as requiring `make bazel_prepare`.
 
+For import-section changes in existing Go files, inspect `git diff -U0 -- '*.go'` and
+`git diff -U0 --cached -- '*.go'` for added/removed import lines, for example:
+
+```diff
++import (
+-import "fmt"
++	"context"
+```
+
+and treat those changes as requiring `make bazel_prepare`.
+
 If any condition matches, run `make bazel_prepare`.
 If none of the rules match, continue without `make bazel_prepare` and report the evidence.

.agents/skills/tidb-change-instruction-critic/SKILL.md

@@ -0,0 +1,63 @@
+---
+name: tidb-change-instruction-critic
+description: Use when implementing a user- or reviewer-prescribed code change (including review comments with suggested fixes or options), especially when the requested edit may be risky, incomplete, ambiguous, or misaligned with TiDB correctness and compatibility constraints.
+---
+
+# TiDB Change Instruction Critic
+
+## Trigger
+
+Use this skill when:
+
+- The request specifies a concrete implementation direction (for example: "change it this way", "use option B", "just follow this patch idea").
+- The task is to address review comments that include direct fix instructions or multiple solution options.
+- The requested approach might be correct, but the risk or tradeoff is unclear.
+
+## Principle
+
+Treat every implementation instruction as a hypothesis, not a command to apply blindly.
+First validate problem understanding and constraints, then select the solution that best preserves correctness and contract intent; use risk as a secondary filter.
+
+## Workflow
+
+1. Decompose the instruction.
+   - Separate `intent` (what problem is being solved), `constraints` (must-have boundaries), and `proposed method` (how to solve it).
+   - Mark each item as either `mandatory` or `negotiable`.
+2. Reconstruct the actual problem before coding.
+   - Locate concrete evidence in code/tests/review context for the defect or concern.
+   - Restate the issue in one or two precise sentences before implementation.
+3. Evaluate solution candidates.
+   - Always evaluate the requested approach.
+   - When feasible, compare with at least one alternative.
+   - Judge by correctness, compatibility, performance, maintenance cost, and validation coverage.
+4. Choose and justify.
+   - Prioritize correctness and behavior-contract fit over mechanical risk minimization.
+   - Use lower-risk preference only when multiple candidates satisfy the same contract and intent.
+   - If the requested method is weaker than an alternative, explain why and propose the better option.
+5. Share analysis summary before coding.
+   - Provide a short self-analysis summary: reconstructed problem, compared options, chosen solution, and why alternatives were rejected.
+6. Challenge gate before implementation.
+   Ask the user for clarification before coding when any condition holds:
+   - Requirement or review intent is ambiguous or internally conflicting.
+   - Requested change may alter SQL semantics, compatibility, or distributed behavior in non-obvious ways.
+   - Requested change increases blast radius (broad refactor, cross-module behavior shift, fragile workaround).
+   - Validation plan cannot prove safety with scoped tests.
+   Keep questions concise and decision-enabling; do not proceed on assumptions.
+7. Implement after alignment.
+   - Keep diff minimal and focused on agreed intent.
+   - Add or update regression coverage when behavior changes or bugs are fixed.
+   - Report residual risks explicitly if any tradeoff remains.
+
+## Question Patterns
+
+- "The requested fix and current behavior contract conflict on `<constraint>`. Which priority is correct?"
+- "I can implement `<requested approach>`, but `<alternative>` better matches `<contract>` with acceptable risk. Which should we proceed with?"
+- "This change may impact `<scope>`. Should I keep scope limited to `<safe scope>` in this patch?"
+
+## Output Checklist
+
+- Clear problem statement confirmed from evidence.
+- Chosen solution and reason for rejecting alternatives.
+- Short self-analysis summary shared before implementation.
+- Any user-confirmed risk decisions captured before coding.
+- Validation scope aligned with change risk.

.agents/skills/tidb-test-guidelines/references/bindinfo-case-map.md

@@ -11,7 +11,7 @@
 ### Tests
 - `pkg/bindinfo/binding_auto_test.go` - Tests plan generation with stmt ctx.
 - `pkg/bindinfo/binding_cache_test.go` - Tests cross-DB binding cache.
-- `pkg/bindinfo/binding_operator_test.go` - Tests binding cache.
+- `pkg/bindinfo/binding_operator_test.go` - Tests binding operators, normalization digests, and redundant-parentheses restore behavior for binding SQL.
 - `pkg/bindinfo/binding_plan_evolution_test.go` - Tests rule-based plan performance predictor.
 - `pkg/bindinfo/binding_plan_generation_test.go` - Tests fix control adjustments.
 - `pkg/bindinfo/main_test.go` - Configures default goleak settings and registers testdata.

AGENTS.md

@@ -36,7 +36,7 @@ When writing complex features or significant refactors, use an ExecPlan from des
 
 | Task | Required action |
 | --- | --- |
-| Added/moved/renamed/removed Go files, added a new top-level Go test function matching `func TestXxx(t *testing.T)` in an existing `*_test.go` file, changed Bazel files, updated Bazel test targets, or changed `go.mod`/`go.sum` | MUST run `make bazel_prepare` and include resulting Bazel metadata changes in the PR (for example `BUILD.bazel`, `**/*.bazel`, and `**/*.bzl`). |
+| Added/moved/renamed/removed Go files, changed the import section of an existing Go file, added a new top-level Go test function matching `func TestXxx(t *testing.T)` in an existing `*_test.go` file, changed Bazel files, updated Bazel test targets, or changed `go.mod`/`go.sum` | MUST run `make bazel_prepare` and include resulting Bazel metadata changes in the PR (for example `BUILD.bazel`, `**/*.bazel`, and `**/*.bzl`). |
 | Running package unit tests | SHOULD run targeted tests and avoid full-package runs unless needed (see `docs/agents/testing-flow.md` -> `Unit tests`). |
 | Unit tests in a package that uses failpoints | MUST enable failpoints before tests and disable afterward (see `docs/agents/testing-flow.md` -> `Failpoint decision for unit tests`). |
 | Recording integration tests | MUST use the recording command in `docs/agents/testing-flow.md` -> `Integration tests` (not `-record`; `-record` is for unit-test suites that explicitly support it). |
@@ -97,6 +97,7 @@ Run `make bazel_prepare` before building when any of the following is true:
 - New workspace or fresh clone.
 - Bazel-related files changed (for example `WORKSPACE`, `DEPS.bzl`, `BUILD.bazel`, `MODULE.bazel`, `MODULE.bazel.lock`).
 - Any Go source file is added/removed/renamed/moved in the PR.
+- The import section changed in any existing Go source file (including `*_test.go`).
 - A code change adds a new top-level Go test function matching `func TestXxx(t *testing.T)` in an existing `*_test.go` file.
 - Go module dependencies changed (for example `go.mod`, `go.sum`), including adding third-party dependencies.
 - Bazel test targets were updated (for example `shard_count` changed, test `srcs` list edited, or `tests/realtikvtest/**/BUILD.bazel` modified).

DEPS.bzl

@@ -5528,11 +5528,11 @@ def go_deps():
         name = "com_github_pingcap_kvproto",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/pingcap/kvproto",
-        sha256 = "c92084d6f9f39398a997ae0530e9e4a8acfc82b98ab17a1178c414293909f4fc",
-        strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20260414083400-4388bfaaedab",
+        sha256 = "a3d3fd4f25b1de97c28f87b7faf4ba9fd86cae30b15e6007d76e66b6820089d7",
+        strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20260601035955-b2b3bb492278",
         urls = [
-            "https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260414083400-4388bfaaedab.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260414083400-4388bfaaedab.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260601035955-b2b3bb492278.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260601035955-b2b3bb492278.zip",
         ],
     )
     go_repository(
@@ -6596,23 +6596,23 @@ def go_deps():
         build_tags = ["nextgen", "intest"],
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/client-go/v2",
-        sha256 = "c141a99a743835252241ccc913861f671f4aec654e4c5c1920ab1bdf4c3586b7",
-        strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20260511022933-fb7ee09992a7",
+        sha256 = "472a85fb7dccdeb0f69c6a96666a62fb41dacb73c15415707f323b9e82ba8378",
+        strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20260602013621-8804d7c60a7e",
         urls = [
-            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260511022933-fb7ee09992a7.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260511022933-fb7ee09992a7.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260602013621-8804d7c60a7e.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260602013621-8804d7c60a7e.zip",
         ],
     )
     go_repository(
         name = "com_github_tikv_pd_client",
         build_tags = ["nextgen", "intest"],
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/pd/client",
-        sha256 = "82bae6c124099e1dd0cc921c8512f5581ace19506f9ab816d0c8eda35a7d316b",
-        strip_prefix = "github.com/tikv/pd/client@v0.0.0-20260404141330-8a6813497b52",
+        sha256 = "8f82128d68f3765fc4d71fa69b7f537cee62173968544b360786d480d6b17230",
+        strip_prefix = "github.com/tikv/pd/client@v0.0.0-20260601035915-3ef6a3b10c84",
         urls = [
-            "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20260404141330-8a6813497b52.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20260404141330-8a6813497b52.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20260601035915-3ef6a3b10c84.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20260601035915-3ef6a3b10c84.zip",
         ],
     )
     go_repository(

Dockerfile

@@ -16,7 +16,7 @@
 # production environment, please refer to https://github.com/PingCAP-QE/artifacts/blob/main/dockerfiles/cd/builders/tidb/Dockerfile.
 
 # Builder image
-FROM golang:1.25.9 as builder
+FROM golang:1.25.10 as builder
 WORKDIR /tidb
 
 COPY . .

Dockerfile.enterprise

@@ -14,7 +14,7 @@
 
 # The current dockerfile is only used for development purposes.
 # Builder image
-FROM golang:1.25.9 as builder
+FROM golang:1.25.10 as builder
 WORKDIR /tidb
 
 COPY . .

Makefile

@@ -348,11 +348,11 @@ failpoint-disable: tools/bin/failpoint-ctl
 
 .PHONY: bazel-failpoint-enable
 bazel-failpoint-enable:
-	find $$PWD/ -mindepth 1 -maxdepth 1 -type d | grep -vE "(\.git|\.idea|tools)" | xargs bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) @com_github_pingcap_failpoint//failpoint-ctl:failpoint-ctl -- enable
+	BAZEL_GLOBAL_CONFIG="$(BAZEL_GLOBAL_CONFIG)" BAZEL_CMD_CONFIG="$(BAZEL_CMD_CONFIG)" ./tools/check/failpoint-state.sh enable bazel
 
 .PHONY: bazel-failpoint-disable
 bazel-failpoint-disable:
-	find $$PWD/ -mindepth 1 -maxdepth 1 -type d | grep -vE "(\.git|\.idea|tools)" | xargs bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) @com_github_pingcap_failpoint//failpoint-ctl:failpoint-ctl -- disable
+	BAZEL_GLOBAL_CONFIG="$(BAZEL_GLOBAL_CONFIG)" BAZEL_CMD_CONFIG="$(BAZEL_CMD_CONFIG)" ./tools/check/failpoint-state.sh disable bazel
 
 .PHONY: tools/bin/ut
 tools/bin/ut: tools/check/ut.go tools/check/longtests.go

Makefile.common

@@ -78,8 +78,8 @@ FILES_TIDB_TESTS := $$(find $$($(PACKAGE_DIRECTORIES_TIDB_TESTS)) -name "*.go" -
 UNCONVERT_PACKAGES_LIST := go list ./...| grep -vE "lightning/checkpoints|lightning/manual|lightning/common|tidb-binlog/proto/go-binlog"
 UNCONVERT_PACKAGES := $$($(UNCONVERT_PACKAGES_LIST))
 
-FAILPOINT_ENABLE  := find $$PWD/ -mindepth 1 -maxdepth 1 -type d | grep -vE "(\.git|\.idea|tools)" | xargs tools/bin/failpoint-ctl enable
-FAILPOINT_DISABLE := find $$PWD/ -mindepth 1 -maxdepth 1 -type d | grep -vE "(\.git|\.idea|tools)" | xargs tools/bin/failpoint-ctl disable
+FAILPOINT_ENABLE  := ./tools/check/failpoint-state.sh enable go
+FAILPOINT_DISABLE := ./tools/check/failpoint-state.sh disable go
 
 GITHASH := $(shell git rev-parse HEAD)
 GITBRANCH := $(shell git rev-parse --abbrev-ref HEAD)

OWNERS_ALIASES

@@ -40,19 +40,23 @@ aliases:
     - windtalker
     - XuHuaiyu
     - zanmato1984
+    - gengliqi
   sig-approvers-executor-import:
     - D3Hunter
     - gmhdbjd
     - Benjamin2037
+    - joechenrh
   sig-approvers-expression:
     - windtalker
     - XuHuaiyu
     - zanmato1984
+    - gengliqi
   sig-approvers-lightning:
     - Benjamin2037
     - D3Hunter
     - gmhdbjd
     - OliverS929
+    - joechenrh
   sig-approvers-domain:
     - D3Hunter
     - gmhdbjd
@@ -74,15 +78,17 @@ aliases:
     - xhebox
     - tiancaiamao
     - YangKeao
-  sig-approvers-disttask:
+  sig-approvers-dxf:
     - Benjamin2037
     - D3Hunter
     - gmhdbjd
     - wjhuang2016
+    - joechenrh
   sig-approvers-dumpling:
     - Benjamin2037
     - gmhdbjd
     - D3Hunter
+    - joechenrh
   sig-approvers-infoschema:
     - wjhuang2016
     - D3Hunter
@@ -120,6 +126,10 @@ aliases:
     - Benjamin2037
     - BornChanger
     - D3Hunter
+    - winoros
+    - time-and-fate
+    - AilinKid
+    - qw4990
   sig-approvers-resourcemanager:
     - Benjamin2037
     - D3Hunter
@@ -177,6 +187,7 @@ aliases:
     - fengou1
     - fzzf678
     - gengliqi
+    - ghazalfamilyusa
     - henrybw
     - iamxy
     - js00070
@@ -191,6 +202,7 @@ aliases:
     - spongedu
     - tangwz
     - tsthght
+    - wddevries
     - xzhangxian1008
     - yibin87
     - zhangjinpeng1987
@@ -249,6 +261,7 @@ aliases:
     - ekexium
     - elsa0520
     - eurekaka
+    - fixdb
     - francis0407
     - fzhedu
     - glorv
@@ -311,7 +324,7 @@ aliases:
     - xhebox
     - xiongjiwei
     - xuyifangreeneyes
-    - YangKeao
+    - yangkeao
     - you06
     - youjiali1995
     - ywqzzy

WORKSPACE

@@ -96,7 +96,7 @@ go_download_sdk(
         "https://mirrors.aliyun.com/golang/{}",
         "https://dl.google.com/go/{}",
     ],
-    version = "1.25.9",
+    version = "1.25.10",
 )
 
 gazelle_dependencies(go_sdk = "go_sdk")

br/cmd/br/debug.go

@@ -415,7 +415,7 @@ func setPDConfigCommand() *cobra.Command {
 				return errors.Trace(err)
 			}
 
-			mgr, err := task.NewMgr(ctx, tidbGlue, cfg.PD, cfg.TLS, task.GetKeepalive(&cfg),
+			mgr, err := task.NewMgr(ctx, tidbGlue, cfg.KeyspaceName, cfg.PD, cfg.TLS, task.GetKeepalive(&cfg),
 				cfg.CheckRequirements, false, conn.NormalVersionChecker)
 			if err != nil {
 				return errors.Trace(err)

br/metrics/grafana/crr_checkpoint_advancer.json

@@ -1350,6 +1350,6 @@
       ]
    },
    "timezone": "browser",
-   "title": "Test-Cluster-CRR-Checkpoint-Advancer",
+   "title": "Test-Cluster-CRPiTR",
    "version": 0
 }

br/pkg/conn/conn.go

@@ -152,6 +152,7 @@ func checkStoresAlive(ctx context.Context,
 func NewMgr(
 	ctx context.Context,
 	g glue.Glue,
+	keyspaceName string,
 	pdAddrs []string,
 	tlsConf *tls.Config,
 	securityOption pd.SecurityOption,
@@ -169,7 +170,7 @@ func NewMgr(
 
 	log.Info("new mgr", zap.Strings("pdAddrs", pdAddrs))
 
-	controller, err := pdutil.NewPdController(ctx, pdAddrs, tlsConf, securityOption)
+	controller, err := pdutil.NewPdController(ctx, keyspaceName, pdAddrs, tlsConf, securityOption)
 	if err != nil {
 		log.Error("failed to create pd controller", zap.Error(err))
 		return nil, errors.Trace(err)
@@ -203,7 +204,7 @@ func NewMgr(
 	// Disable GC because TiDB enables GC already.
 	path := fmt.Sprintf(
 		"tikv://%s?disableGC=true&keyspaceName=%s",
-		strings.Join(pdAddrs, ","), config.GetGlobalKeyspaceName(),
+		strings.Join(pdAddrs, ","), keyspaceName,
 	)
 	storage, err := g.Open(path, securityOption)
 	if err != nil {