morningman opened a new pull request, #69809:
URL: https://github.com/apache/doris/pull/69809
### What problem does this PR solve?
Issue Number: None
Related PR: #69778, #69785
Problem Summary:
**In short:** the FE build on master fails, because
`ExplainTableStreamPlanTest` now 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>)` 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 has both copies, and javac rejects the file:
```
ExplainTableStreamPlanTest.java:843: error: method
normalizeStreamRead(String,long,Optional<IvmRewriteContext>) is already defined
in class ExplainTableStreamPlanTest
```
`build.sh --fe` passes `-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 <!-- At least one of them must be included. -->
- [ ] Regression test
- [x] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
On master `5b3d2244210` plus this commit, fe-core compiles from scratch
(main and test sources), checkstyle reports 0 violations, and all 32 cases of
`ExplainTableStreamPlanTest`, from both PRs, pass. The branch was then rebased
onto `d420f9c41bb`; the two commits that brings in do not touch this file.
- Behavior changed:
- [x] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR should
merge into -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
