Repository navigation
[fix](fe) Remove the duplicated normalizeStreamRead helper from ExplainTableStreamPlanTest - #69809
Merged
Merged
Conversation
…inTableStreamPlanTest ### What problem does this PR solve? Issue Number: None Related PR: apache#69778, apache#69785 Problem Summary: apache#69778 and apache#69785 each added the same private helper `normalizeStreamRead(String, long, Optional<IvmRewriteContext>)` to `ExplainTableStreamPlanTest`, at different places in the file. Each PR compiled on its own, and they were merged 41 seconds apart without a rebase onto each other, so master now declares the method twice, which javac rejects as already defined. `build.sh --fe` passes `-DskipTests`, which still compiles the test sources, so the whole FE build fails on master, not only the FE unit tests. This removes the second copy, the one apache#69785 added after its own tests. The two copies are identical, so the tests of both PRs keep calling the same code. ### Release note None ### Check List (For Author) - Test: Unit Test - On master `5b3d2244210` plus this commit, fe-core compiles (main and test sources), checkstyle passes, and all 32 cases of `ExplainTableStreamPlanTest`, from both PRs, pass. - Behavior changed: No - Does this need documentation: No Co-Authored-By: Claude Opus 5.5 <[email protected]>
morningman
requested review from
924060929,
englefly and
morrySnow
as code owners
October 29, 2026 05:12
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
skip buildall |
924060929
approved these changes
Oct 29, 2026
924060929
left a comment
924060929
left a comment
Contributor
There was a problem hiding this comment.
The stream-plan tests parse SQL, initialize the statement reference TSO, analyze the query, install the IVM context, and apply NormalizeOlapTableStreamScan. The merge base contains two identical normalizeStreamRead declarations; this PR removes the second declaration and preserves the shared helper, all four callers, and their assertions.
APPROVE: no introduced P0/P1/P2 issues found in the FE static review. The fix is minimal and preserves test behavior without changing production code or FE/BE interfaces. No builds or tests were run. Reported successful checks do not establish actual execution or required-check coverage, particularly given the skip buildall comment; no prior approval or substantive AI review was provided.
Automated FE-focused static review (GPT-6.1 Sol, medium). No build or tests were run.
morrySnow
approved these changes
Oct 29, 2026
morrySnow
approved these changes
Oct 29, 2026
Contributor
|
PR approved by anyone and no changes requested. |
github-actions
Bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
Gabriel39
added a commit
to Gabriel39/incubator-doris
that referenced
this pull request
Oct 29, 2026
### What problem does this PR solve? Issue Number: N/A Related PR: apache#69672 Problem Summary: CheckStyle ran against a master merge snapshot containing a duplicate normalizeStreamRead test helper. Master removed the duplicate in apache#69809. Refresh pull request validation against the repaired baseline with an identical source tree. ### Release note None ### Check List (For Author) - Test: Confirmed the baseline repair and unchanged source tree; fresh remote CheckStyle validation follows this commit. - Behavior changed: No - Does this need documentation: No
11 tasks done
CalvinKirs
added a commit
to CalvinKirs/incubator-doris
that referenced
this pull request
Nov 2, 2026
### What problem does this PR solve? Issue Number: None Related PR: apache#69805 Problem Summary: The PR merge commit contained a duplicate normalizeStreamRead helper after master added the same method. Master removed the duplicate in apache#69809. Sync master so the PR merge passes CheckStyle. ### Release note None ### Check List (For Author) - Test: Manual test: mvn clean checkstyle:check in fe (passed) - Behavior changed: No - Does this need documentation: No
CalvinKirs
added a commit
to raghav-reglobe/doris
that referenced
this pull request
Nov 12, 2026
### What problem does this PR solve? Related PR: apache#66115 Problem Summary: The previous CI merge inherited duplicate normalizeStreamRead helpers from master. Merge current master, which includes apache#69809, to use the upstream fix and validate the current integration result. ### Release note None ### Check List (For Author) - Test: Checkstyle validation follows this merge; no behavior changes introduced by the integration commit. - Behavior changed: No additional behavior beyond upstream master. - Does this need documentation: No
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
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: None
Related PR: #69778, #69785
Problem Summary:
In short: the FE build on master fails, because
ExplainTableStreamPlanTestnow declares the same private method twice. This PR deletes the second copy; nothing else changes.#69778 and #69785 each added the same private helper
normalizeStreamRead(String, long, Optional<IvmRewriteContext>)toExplainTableStreamPlanTest, at different places in the file. Each PR compiled on its own, and they were merged 41 seconds apart without a rebase onto each other, so master has both copies, and javac rejects the file:build.sh --fepasses-DskipTests, which skips running the tests but still compiles them, so this fails the whole FE build on master and on every PR based on it, not only the FE unit tests.The fix removes the copy #69785 added after its own tests. The two copies are identical, so the tests of both PRs keep calling the same code.
Release note
None
Check List (For Author)
Test
On master
5b3d2244210plus this commit, fe-core compiles from scratch (main and test sources), checkstyle reports 0 violations, and all 32 cases ofExplainTableStreamPlanTest, from both PRs, pass. The branch was then rebased ontod420f9c41bb; the two commits that brings in do not touch this file.Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)