Skip to content

[to dev/1.3] [Query] Fix result-column OOM diagnostics - #18667

Merged
jt2594838 merged 1 commit into
apache:dev/1.3from
Caideyipi:cp-25bf38eb-dev-1.3
Sep 21, 2026
Merged

jt2594838 merged 1 commit into
apache:dev/1.3from
Caideyipi:cp-25bf38eb-dev-1.3

Conversation

@Caideyipi

Copy link
Copy Markdown
Collaborator

Description

Backport #18661 (25bf38e) to dev/1.3.

  • Preserve the rejected operator-memory batch size and free-memory snapshot, so result-column diagnostics use the actual failed allocation rather than the last expression reservation.
  • Report an estimated column-equivalent shortage when matched source columns have already been expanded, without claiming that unexpanded source columns exist.
  • Adapt to the dev/1.3 operator pool and MemoryNotEnoughException; retain the branch's existing status mapping.
  • Include the two required English/Chinese message constants and DataNode source-selection/formatting configuration.

Verification

  • English DataNode dependency reactor and MPPQueryContextTest: passed, 5 tests, 0 failures/errors/skips. Includes matched == expanded, matched == expanded + 1, the 760 / 1,048,840 / 702,452-byte discrepancy, and the existing 1.3 exception-to-status mapping.
  • mvn -o test-compile -DskipTests -P with-zh-locale: passed, all 44 reactor modules.
  • Spotless, English/Chinese constant-key and format-specifier parity, and git diff --check: passed.
  • Full English reactor compilation was attempted but stopped in the unchanged ConfigNode module without a completion summary despite process exit code 0; full-English-reactor success is not claimed.
  • No cluster-level reproduction was run.

@jt2594838
jt2594838 merged commit 414aa9e into apache:dev/1.3 Sep 21, 2026
15 of 16 checks passed
@jt2594838
jt2594838 deleted the cp-25bf38eb-dev-1.3 branch September 21, 2026 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants