*: cherry-pick statement PRs to release-nextgen-202603#69111
Merged
ti-chi-bot[bot] merged 3 commits intoJun 18, 2026
Merged
Conversation
close pingcap#68865 (cherry picked from commit 279a933)
ref pingcap#67924 (cherry picked from commit 2c307d6)
ref pingcap#67924 (cherry picked from commit 6c43104)
ti-chi-bot
Bot
added
release-note
📝 WalkthroughWalkthroughThis PR introduces per-record LRU eviction persistence and user-dimension grouping for TiDB's statement summaries, alongside system variables, metrics, and comprehensive test coverage. Changes span v1 grouping infrastructure, v2 async eviction logging with metrics, session-state affected-rows fixes, and supporting test updates. ChangesStatement Summary User Grouping and Eviction Persistence
Estimated code review effort🎯 4 (Complex) | ⏱️ ~60 minutes Possibly related PRs
Suggested labels
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 golangci-lint (2.12.2)Command failed Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@pkg/util/stmtsummary/v2/stmtsummary_test.go`:
- Around line 164-174: The test samples persistedBefore too late (after eviction
events are already generated), causing flakiness; move the call to
readCounterValue(metrics.StmtSummaryEvictedLogCounter.WithLabelValues(metrics.StmtSummaryTypeV2,
metrics.StmtSummaryEvictedLogResultPersisted)) so that persistedBefore is
captured before any actions that enqueue evictions or trigger async persistence
(i.e. before creating/inserting summaries and before ss.Close()), then keep the
persistedAfter read after Close and assert persistedAfter - persistedBefore ==
2.0.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 702f48b3-1fa6-44ce-a125-95eacc33f2da
📒 Files selected for processing (19)
pkg/executor/select.gopkg/metrics/metrics.gopkg/metrics/metrics_internal_test.gopkg/metrics/stmtsummary.gopkg/sessionctx/sessionstates/session_states_test.gopkg/sessionctx/vardef/tidb_vars.gopkg/sessionctx/variable/session.gopkg/sessionctx/variable/sysvar.gopkg/util/stmtsummary/BUILD.bazelpkg/util/stmtsummary/evicted_test.gopkg/util/stmtsummary/statement_summary.gopkg/util/stmtsummary/statement_summary_test.gopkg/util/stmtsummary/v2/BUILD.bazelpkg/util/stmtsummary/v2/logger.gopkg/util/stmtsummary/v2/reader.gopkg/util/stmtsummary/v2/reader_test.gopkg/util/stmtsummary/v2/record_test.gopkg/util/stmtsummary/v2/stmtsummary.gopkg/util/stmtsummary/v2/stmtsummary_test.go
Comment on lines
+164
to
+174
| persistedBefore := readCounterValue(t, metrics.StmtSummaryEvictedLogCounter.WithLabelValues( | ||
| metrics.StmtSummaryTypeV2, | ||
| metrics.StmtSummaryEvictedLogResultPersisted, | ||
| )) | ||
| ss.Close() | ||
| persistedAfter := readCounterValue(t, metrics.StmtSummaryEvictedLogCounter.WithLabelValues( | ||
| metrics.StmtSummaryTypeV2, | ||
| metrics.StmtSummaryEvictedLogResultPersisted, | ||
| )) | ||
| require.Equal(t, 2.0, persistedAfter-persistedBefore) | ||
|
|
There was a problem hiding this comment.
Capture the persisted-counter baseline before enqueueing evictions.
On Line 164, persistedBefore is sampled after eviction events are already generated. Since persistence is async, the baseline may already include part of this test’s increments, making persistedAfter - persistedBefore flaky.
🔧 Proposed fix
- ss.Add(GenerateStmtExecInfo4Test("digest1"))
- ss.Add(GenerateStmtExecInfo4Test("digest2"))
- ss.Add(GenerateStmtExecInfo4Test("digest3")) // evicts digest1
- ss.Add(GenerateStmtExecInfo4Test("digest4")) // evicts digest2
persistedBefore := readCounterValue(t, metrics.StmtSummaryEvictedLogCounter.WithLabelValues(
metrics.StmtSummaryTypeV2,
metrics.StmtSummaryEvictedLogResultPersisted,
))
+ ss.Add(GenerateStmtExecInfo4Test("digest1"))
+ ss.Add(GenerateStmtExecInfo4Test("digest2"))
+ ss.Add(GenerateStmtExecInfo4Test("digest3")) // evicts digest1
+ ss.Add(GenerateStmtExecInfo4Test("digest4")) // evicts digest2
ss.Close()🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@pkg/util/stmtsummary/v2/stmtsummary_test.go` around lines 164 - 174, The test
samples persistedBefore too late (after eviction events are already generated),
causing flakiness; move the call to
readCounterValue(metrics.StmtSummaryEvictedLogCounter.WithLabelValues(metrics.StmtSummaryTypeV2,
metrics.StmtSummaryEvictedLogResultPersisted)) so that persistedBefore is
captured before any actions that enqueue evictions or trigger async persistence
(i.e. before creating/inserting summaries and before ss.Close()), then keep the
persistedAfter read after Close and assert persistedAfter - persistedBefore ==
2.0.
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## release-nextgen-202603 #69111 +/- ##
===========================================================
Coverage ? 76.3947%
===========================================================
Files ? 1935
Lines ? 542249
Branches ? 0
===========================================================
Hits ? 414250
Misses ? 127999
Partials ? 0
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
Member
Author
|
/retest |
Member
Author
|
Hi @tenfyzhong, could you approve this cherry-pick for premium? |
terry1purcell
approved these changes
Jun 18, 2026
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: terry1purcell, yibin87 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ti-chi-bot
Bot
added
approved
lgtm
and removed
needs-1-more-lgtm
[LGTM Timeline notifier]Timeline:
|
ti-chi-bot
Bot
merged commit 969ecb5
into
pingcap:release-nextgen-202603
18 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: ref #67924, ref #68865
Problem Summary:
Cherry-pick recent statement-related PRs to
release-nextgen-202603:ROW_COUNTas affected rows.tidb_stmt_summary_group_by_user.tidb_stmt_summary_persist_evicted.What changed and how does it work?
This PR cherry-picks the three upstream commits and resolves release-branch conflicts in statement summary logging/metrics without bringing unrelated master-only channelz or keyspace-observability changes into the release branch.
Check List
Tests
Side effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.
Summary by CodeRabbit
New Features
tidb_stmt_summary_persist_evictedandtidb_stmt_summary_group_by_usersystem variables for statement summary configuration.Bug Fixes
Tests