This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 76011dff913 [fix](fe) Remove the duplicated normalizeStreamRead helper
from ExplainTableStreamPlanTest (#69809)
76011dff913 is described below
commit 76011dff913fa96f9ffd62cca59612bf918e4920
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Thu Oct 29 07:08:09 2026 +0000
[fix](fe) Remove the duplicated normalizeStreamRead helper from
ExplainTableStreamPlanTest (#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.
---
.../nereids/trees/plans/ExplainTableStreamPlanTest.java | 12 ------------
1 file changed, 12 deletions(-)
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/ExplainTableStreamPlanTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/ExplainTableStreamPlanTest.java
index 9b25c8d442c..699507c3ff0 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/ExplainTableStreamPlanTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/ExplainTableStreamPlanTest.java
@@ -840,18 +840,6 @@ public class ExplainTableStreamPlanTest extends
TestWithFeService {
exception.getMessage());
}
- private Plan normalizeStreamRead(String sql, long referenceTso,
Optional<IvmRewriteContext> ivmRewriteContext) {
- PlanChecker checker = PlanChecker.from(connectContext).parse(sql);
- StatementContext statementContext =
checker.getCascadesContext().getStatementContext();
- // Direct rewrite tests bypass the planner's statement reference
initialization.
- statementContext.getOrRegisterChangelogReferenceTso(() ->
referenceTso);
- checker.analyze();
- // Installed after the analysis, whose IVM rules would rewrite the
query as an MV's: only how the stream
- // read treats its offset inside an IVM statement is under test.
- statementContext.setIvmRewriteContext(ivmRewriteContext);
- return checker.applyTopDown(new
NormalizeOlapTableStreamScan()).getCascadesContext().getRewritePlan();
- }
-
@Test
public void testChangelogTtlDisablesQueryCache() throws Exception {
ConnectContext ctx = createDefaultCtx();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
