frontend: optimize SHOW ACCOUNTS account-info SQL#24092
Merged
mergify[bot] merged 3 commits intomatrixorigin:3.0-devfrom Apr 10, 2026
Merged
frontend: optimize SHOW ACCOUNTS account-info SQL#24092mergify[bot] merged 3 commits intomatrixorigin:3.0-devfrom
mergify[bot] merged 3 commits intomatrixorigin:3.0-devfrom
Conversation
Rewrite getSqlForAccountInfo to aggregate database and table counts separately and push exact account filters into those aggregates, removing the mo_tables x mo_database amplification while keeping the existing SHOW ACCOUNTS result shape intact. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Escape single quotes and backslashes when rebuilding the SHOW ACCOUNTS LIKE predicate, and add combined SQL-generation and parser round-trip coverage for quoted and backslash-containing patterns. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
XuPeng-SH
approved these changes
Apr 10, 2026
Contributor
XuPeng-SH
left a comment
XuPeng-SH
left a comment
There was a problem hiding this comment.
Review: SHOW ACCOUNTS SQL Optimization
LGTM. Clean, well-designed optimization.
What this does
- Eliminates cross-product amplification — splits the old
db_tbl_countsCTE (which joinedmo_tables × mo_databaseonaccount_id, creating N_tables × N_databases rows per account) into two independent CTEs:db_countsandtbl_counts. - Pushes account_id filter into CTEs — for single-account
SHOW ACCOUNTS, the filter is applied inside both CTEs, not just in the finalWHEREclause. - Hardens LIKE pattern escaping —
quoteSQLStringLiteral()escapes\→\\\\and'→'', fixing a potential SQL injection in the oldfmt.Sprintf("...like '%s'",...)pattern. - Significantly improved tests — named subtests,
wantContains/wantNotContainsassertions, parser round-trip validation.
Verified
fmt.Sprintfargument ordering matches all 4%splaceholders in the template ✓- Semantic equivalence: both old and new use INNER JOINs, so accounts with zero databases/tables are excluded in both (practically fine — every account has
mo_catalog+ system tables) ✓ quoteSQLStringLiteralcorrectly preserves LIKE pattern semantics through the parse→quote→re-parse cycle ✓- Code is well-factored:
buildAccountInfoClause,buildAccountInfoCountFilters, andquoteSQLStringLiteralare clean, testable functions ✓
Contributor
Merge Queue Status
This pull request spent 11 seconds in the queue, including 1 second running CI. Required conditions to merge
|
LeftHandCold
added a commit
to LeftHandCold/matrixone
that referenced
this pull request
Apr 10, 2026
Address matrixorigin#24091 by rewriting `getSqlForAccountInfo()` so `SHOW ACCOUNTS` computes database and table counts with separate aggregates instead of joining `mo_catalog.mo_tables` and `mo_catalog.mo_database` on `account_id` before `COUNT(DISTINCT ...)`. This removes the `mo_tables x mo_database` amplification that dominated the `getAccountInfo()` CPU flamegraph, pushes exact `account_id` filters into the aggregate CTEs for single-account requests, and keeps the rest of the `SHOW ACCOUNTS` behavior unchanged. As a low-risk follow-up, this PR also hardens reconstruction of the internal `LIKE` predicate by escaping single quotes and backslashes, and adds combined SQL-generation plus parser round-trip coverage. Approved by: @XuPeng-SH
mergify bot
pushed a commit
that referenced
this pull request
Apr 10, 2026
Address #24091 by rewriting `getSqlForAccountInfo()` so `SHOW ACCOUNTS` computes database and table counts with separate aggregates instead of joining `mo_catalog.mo_tables` and `mo_catalog.mo_database` on `account_id` before `COUNT(DISTINCT ...)`. This removes the `mo_tables x mo_database` amplification that dominated the `getAccountInfo()` CPU flamegraph, pushes exact `account_id` filters into the aggregate CTEs for single-account requests, and keeps the rest of the `SHOW ACCOUNTS` behavior unchanged. As a low-risk follow-up, this PR also hardens reconstruction of the internal `LIKE` predicate by escaping single quotes and backslashes, and adds combined SQL-generation plus parser round-trip coverage. Approved by: @XuPeng-SH
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 type of PR is this?
Which issue(s) this PR fixes:
issue #24091
What this PR does / why we need it:
Address #24091 by rewriting
getSqlForAccountInfo()soSHOW ACCOUNTScomputes database and table counts with separate aggregates instead of joiningmo_catalog.mo_tablesandmo_catalog.mo_databaseonaccount_idbeforeCOUNT(DISTINCT ...).This removes the
mo_tables x mo_databaseamplification that dominated thegetAccountInfo()CPU flamegraph, pushes exactaccount_idfilters into the aggregate CTEs for single-account requests, and keeps the rest of theSHOW ACCOUNTSbehavior unchanged.As a low-risk follow-up, this PR also hardens reconstruction of the internal
LIKEpredicate by escaping single quotes and backslashes, and adds combined SQL-generation plus parser round-trip coverage.Testing