github-actions[bot] commented on code in PR #65472: URL: https://github.com/apache/doris/pull/65472#discussion_r3586379572
########## fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/PullUpJoinFromUnionAllTest.java: ########## @@ -0,0 +1,458 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite; + +import org.apache.doris.analysis.TableScanParams; +import org.apache.doris.analysis.TableSnapshot; +import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.KeysType; +import org.apache.doris.catalog.OdbcTable; +import org.apache.doris.catalog.OlapTable; +import org.apache.doris.catalog.Type; +import org.apache.doris.catalog.stream.OlapTableStreamWrapper; +import org.apache.doris.catalog.stream.StreamReadMode; +import org.apache.doris.common.Pair; +import org.apache.doris.datasource.ExternalTable; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.EqualTo; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.Slot; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.plans.JoinType; +import org.apache.doris.nereids.trees.plans.Plan; +import org.apache.doris.nereids.trees.plans.RelationId; +import org.apache.doris.nereids.trees.plans.algebra.SetOperation.Qualifier; +import org.apache.doris.nereids.trees.plans.logical.LogicalFileScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalFilter; +import org.apache.doris.nereids.trees.plans.logical.LogicalJoin; +import org.apache.doris.nereids.trees.plans.logical.LogicalOdbcScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalOlapTableStreamScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalProject; +import org.apache.doris.nereids.trees.plans.logical.LogicalSchemaScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalTestScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalUnion; +import org.apache.doris.nereids.util.MemoTestUtils; +import org.apache.doris.nereids.util.PlanChecker; +import org.apache.doris.nereids.util.PlanConstructor; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +class PullUpJoinFromUnionAllTest { + + @Test + void comparatorRejectsDifferentProjectOutputSizes() { + LogicalOlapScan smallScan = newScan(1, "common_small"); + LogicalOlapScan largeScan = newScan(1, "common_large"); + LogicalProject<LogicalOlapScan> smallProject = project(selectSlots(smallScan.getOutput(), 0), smallScan); + LogicalProject<LogicalOlapScan> largeProject = project(selectSlots(largeScan.getOutput(), 0, 1), largeScan); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(largeProject, smallProject)); + } + + @Test + void comparatorRejectsDifferentFilterChildOutputSizes() { + LogicalFilter<LogicalOlapScan> smallFilter = filter(newCachedOutputScan(1, "common_filter", 0)); + LogicalFilter<LogicalOlapScan> largeFilter = filter(newCachedOutputScan(1, "common_filter", 0, 1)); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(largeFilter, smallFilter)); + } + + @Test + void comparatorRejectsDifferentMaterializedIndexSelections() { + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + LogicalOlapScan baseScan = newScanWithExtraIndex(11, "common_index", 101); + LogicalOlapScan indexScan = baseScan.withMaterializedIndexSelected(101); + + Assertions.assertFalse(comparator.isLogicalEqual(baseScan, indexScan)); + } + + @Test + void comparatorRejectsDifferentManuallySpecifiedPartitions() { + LogicalOlapScan firstPartitionScan = PlanConstructor.newLogicalOlapScanWithSameId( Review Comment: This test still does not exercise the `selectedPartitionIds` comparison. `newLogicalOlapScanWithSameId()` passes these ids as specified partitions, but the test table has no real partitions, and `LogicalOlapScan` filters selected ids to partitions that exist. Both scans therefore end up with empty `selectedPartitionIds`, so this assertion only proves `manuallySpecifiedPartitions` differs. Please add a case with real partitions, or otherwise construct scans whose selected partition ids remain `1` vs `2` while the manual partition list is the same, so the pruned partition-scope guard is covered directly. ########## fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalFileScan.java: ########## @@ -197,6 +197,15 @@ public boolean equals(Object o) { return super.equals(o) && Objects.equals(selectedPartitions, ((LogicalFileScan) o).selectedPartitions); } + @Override + protected boolean hasSameScanState(LogicalCatalogRelation other) { Review Comment: This comparator is also used by `LogicalHudiScan`, which inherits `LogicalFileScan.hasSameScanState()`, but Hudi scans carry an additional resolved `incrementalRelation`. Raw `scanParams` are not enough here: `withScanParams()` resolves missing/`latest` end instants and chooses an Empty/COW/MOR incremental relation from the current Hudi timeline, and the physical Hudi scan forwards that relation to `HudiScanNode` for split selection and fallback behavior. If two same-table Hudi incremental branches have the same raw params but different resolved incremental relation state, this rewrite can keep only the first common scan. Please override `hasSameScanState()` in `LogicalHudiScan` to include the effective incremental relation state, or conservatively reject Hudi scans from this common-side match. ########## fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/PullUpJoinFromUnionAllTest.java: ########## @@ -0,0 +1,458 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite; + +import org.apache.doris.analysis.TableScanParams; +import org.apache.doris.analysis.TableSnapshot; +import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.KeysType; +import org.apache.doris.catalog.OdbcTable; +import org.apache.doris.catalog.OlapTable; +import org.apache.doris.catalog.Type; +import org.apache.doris.catalog.stream.OlapTableStreamWrapper; +import org.apache.doris.catalog.stream.StreamReadMode; +import org.apache.doris.common.Pair; +import org.apache.doris.datasource.ExternalTable; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.EqualTo; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.Slot; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.plans.JoinType; +import org.apache.doris.nereids.trees.plans.Plan; +import org.apache.doris.nereids.trees.plans.RelationId; +import org.apache.doris.nereids.trees.plans.algebra.SetOperation.Qualifier; +import org.apache.doris.nereids.trees.plans.logical.LogicalFileScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalFilter; +import org.apache.doris.nereids.trees.plans.logical.LogicalJoin; +import org.apache.doris.nereids.trees.plans.logical.LogicalOdbcScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalOlapScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalOlapTableStreamScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalProject; +import org.apache.doris.nereids.trees.plans.logical.LogicalSchemaScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalTestScan; +import org.apache.doris.nereids.trees.plans.logical.LogicalUnion; +import org.apache.doris.nereids.util.MemoTestUtils; +import org.apache.doris.nereids.util.PlanChecker; +import org.apache.doris.nereids.util.PlanConstructor; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +class PullUpJoinFromUnionAllTest { + + @Test + void comparatorRejectsDifferentProjectOutputSizes() { + LogicalOlapScan smallScan = newScan(1, "common_small"); + LogicalOlapScan largeScan = newScan(1, "common_large"); + LogicalProject<LogicalOlapScan> smallProject = project(selectSlots(smallScan.getOutput(), 0), smallScan); + LogicalProject<LogicalOlapScan> largeProject = project(selectSlots(largeScan.getOutput(), 0, 1), largeScan); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(largeProject, smallProject)); + } + + @Test + void comparatorRejectsDifferentFilterChildOutputSizes() { + LogicalFilter<LogicalOlapScan> smallFilter = filter(newCachedOutputScan(1, "common_filter", 0)); + LogicalFilter<LogicalOlapScan> largeFilter = filter(newCachedOutputScan(1, "common_filter", 0, 1)); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(largeFilter, smallFilter)); + } + + @Test + void comparatorRejectsDifferentMaterializedIndexSelections() { + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + LogicalOlapScan baseScan = newScanWithExtraIndex(11, "common_index", 101); + LogicalOlapScan indexScan = baseScan.withMaterializedIndexSelected(101); + + Assertions.assertFalse(comparator.isLogicalEqual(baseScan, indexScan)); + } + + @Test + void comparatorRejectsDifferentManuallySpecifiedPartitions() { + LogicalOlapScan firstPartitionScan = PlanConstructor.newLogicalOlapScanWithSameId( + 12, "common_partition", 0, ImmutableList.of(1L)); + LogicalOlapScan secondPartitionScan = PlanConstructor.newLogicalOlapScanWithSameId( + 12, "common_partition", 0, ImmutableList.of(2L)); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(firstPartitionScan, secondPartitionScan)); + } + + @Test + void comparatorRejectsDifferentTableSamples() { + LogicalOlapScan sampleOneScan = newScanWithTableSample(43, "common_sample", + new org.apache.doris.nereids.trees.TableSample(10, true, 0)); + LogicalOlapScan sampleTwoScan = newScanWithTableSample(43, "common_sample", + new org.apache.doris.nereids.trees.TableSample(20, true, 0)); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(sampleOneScan, sampleTwoScan)); + } + + @Test + void comparatorRejectsDifferentOlapScanParams() { + LogicalOlapScan incrementalScan = newScanWithScanParams(44, "common_params", + new TableScanParams(TableScanParams.INCREMENTAL_READ, + ImmutableMap.of("end_ts", "10"), ImmutableList.of())); + LogicalOlapScan differentIncrementalScan = newScanWithScanParams(44, "common_params", + new TableScanParams(TableScanParams.INCREMENTAL_READ, + ImmutableMap.of("end_ts", "20"), ImmutableList.of())); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(incrementalScan, differentIncrementalScan)); + } + + @Test + void comparatorRejectsDifferentStreamReadModes() { + LogicalOlapTableStreamScan snapshotScan = newStreamScanWithOffsets(15, "common_stream", 1000L, 2000L, + KeysType.UNIQUE_KEYS, ImmutableMap.of(1L, Pair.of(10L, 20L))) + .withReadMode(StreamReadMode.SNAPSHOT); + LogicalOlapTableStreamScan resetScan = snapshotScan.withReadMode(StreamReadMode.RESET); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(snapshotScan, resetScan)); + } + + @Test + void comparatorRejectsDifferentStreamOffsets() { + LogicalOlapTableStreamScan left = newStreamScanWithOffsets(45, "common_stream_offset", 1000L, 2000L, + KeysType.UNIQUE_KEYS, ImmutableMap.of(1L, Pair.of(10L, 20L))); + LogicalOlapTableStreamScan right = newStreamScanWithOffsets(45, "common_stream_offset", 1000L, 2000L, + KeysType.UNIQUE_KEYS, ImmutableMap.of(1L, Pair.of(30L, 40L))); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(left, right)); + } + + @Test + void comparatorRejectsDifferentStreamKeysTypes() { + LogicalOlapTableStreamScan uniqueKeyScan = newStreamScanWithOffsets(46, "common_stream_keys", 1000L, 2000L, + KeysType.UNIQUE_KEYS, ImmutableMap.of(1L, Pair.of(10L, 20L))); + LogicalOlapTableStreamScan dupKeyScan = newStreamScanWithOffsets(46, "common_stream_keys", 1000L, 2000L, + KeysType.DUP_KEYS, ImmutableMap.of(1L, Pair.of(10L, 20L))); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(uniqueKeyScan, dupKeyScan)); + } + + @Test + void comparatorRejectsDifferentStreamIdentities() { + LogicalOlapTableStreamScan left = newStreamScanWithOffsets(47, "common_stream_identity", 1000L, 2000L, + KeysType.UNIQUE_KEYS, ImmutableMap.of(1L, Pair.of(10L, 20L))); + LogicalOlapTableStreamScan right = newStreamScanWithOffsets(47, "common_stream_identity", 1000L, 3000L, + KeysType.UNIQUE_KEYS, ImmutableMap.of(1L, Pair.of(10L, 20L))); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(left, right)); + } + + @Test + void comparatorRejectsDifferentFileScanSnapshots() { + LogicalFileScan versionOneScan = newFileScan(17L, TableSnapshot.versionOf("1")); + LogicalFileScan versionTwoScan = newFileScan(17L, TableSnapshot.versionOf("2")); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(versionOneScan, versionTwoScan)); + } + + @Test + void comparatorRejectsDifferentSchemaScanConjuncts() { + LogicalSchemaScan baseScan = newSchemaScan(16, "schema_common"); + LogicalSchemaScan filteredScan = baseScan.withFrontendConjuncts(Optional.of("ctl"), + Optional.of("db"), Optional.of("tbl"), + ImmutableList.of(new EqualTo(baseScan.getOutput().get(0), baseScan.getOutput().get(1)))); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertFalse(comparator.isLogicalEqual(baseScan, filteredScan)); + } + + @Test + void comparatorAcceptsSameOdbcScanWithDifferentRelationIds() { + LogicalOdbcScan left = newOdbcScan(18L, "odbc_common"); + LogicalOdbcScan right = left.withRelationId(PlanConstructor.getNextRelationId()); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertTrue(comparator.isLogicalEqual(left, right)); + } + + @Test + void comparatorAcceptsSameTestScan() { + LogicalTestScan left = newTestScan(19L, "test_common"); + LogicalTestScan right = newTestScan(19L, "test_common"); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertTrue(comparator.isLogicalEqual(left, right)); + } + + @Test + void comparatorAcceptsSameScanWithDifferentRelationIds() { + LogicalOlapScan left = newScan(13, "common_relation_id"); + LogicalOlapScan right = left.withRelationId(PlanConstructor.getNextRelationId()); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertTrue(comparator.isLogicalEqual(left, right)); + } + + @Test + void comparatorAcceptsSameScanWithDifferentTableAliases() { + LogicalOlapScan left = newScan(14, "common_alias").withTableAlias("left_alias"); + LogicalOlapScan right = newScan(14, "common_alias").withTableAlias("right_alias"); + + PullUpJoinFromUnionAll.LogicalPlanComparator comparator = + new PullUpJoinFromUnionAll().new LogicalPlanComparator(); + Assertions.assertTrue(comparator.isLogicalEqual(left, right)); + } + + @Test + void ruleSkipsJoinChildrenWithDifferentFilteredCommonSideOutputs() { + LogicalOlapScan commonSmallScan = newScan(10, "common_small"); + LogicalOlapScan commonLargeScan = newScan(10, "common_large"); + LogicalFilter<LogicalOlapScan> commonSmall = filter(commonSmallScan.withCachedOutput( + selectSlotsAsSlots(commonSmallScan.getOutput(), 0))); + LogicalFilter<LogicalOlapScan> commonLarge = filter(commonLargeScan.withCachedOutput( + selectSlotsAsSlots(commonLargeScan.getOutput(), 0, 1))); + LogicalOlapScan otherLeft = newScan(20, "other_left"); + LogicalOlapScan otherRight = newScan(30, "other_right"); + + LogicalProject<Plan> unionChild1 = outputProject( + join(commonSmall, otherLeft), + "x", commonSmall.getOutput().get(0), + "y", otherLeft.getOutput().get(1)); + LogicalProject<Plan> unionChild2 = outputProject( + join(commonLarge, otherRight), + "x", commonLarge.getOutput().get(0), + "y", otherRight.getOutput().get(1)); + + LogicalUnion union = union(unionChild1, unionChild2); + + Plan rewritten = PlanChecker.from(MemoTestUtils.createConnectContext(), union) + .applyTopDown(new PullUpJoinFromUnionAll()) + .getPlan(); + + Assertions.assertInstanceOf(LogicalUnion.class, rewritten); + LogicalUnion rewrittenUnion = (LogicalUnion) rewritten; + Assertions.assertEquals(2, rewrittenUnion.children().size()); + Assertions.assertInstanceOf(LogicalProject.class, rewrittenUnion.child(0)); + Assertions.assertInstanceOf(LogicalProject.class, rewrittenUnion.child(1)); + } + + @Test + void ruleSkipsJoinChildrenWithDifferentCommonSideTabletScopes() { + LogicalOlapScan commonLeft = newScan(40, "common_tablet").withSelectedTabletIds(ImmutableList.of(1L)); + LogicalOlapScan commonRight = newScan(40, "common_tablet").withSelectedTabletIds(ImmutableList.of(2L)); + LogicalOlapScan otherLeft = newScan(41, "other_left_tablet"); + LogicalOlapScan otherRight = newScan(42, "other_right_tablet"); + + LogicalProject<Plan> unionChild1 = outputProject( + join(commonLeft, otherLeft), + "x", commonLeft.getOutput().get(0), + "y", otherLeft.getOutput().get(1)); + LogicalProject<Plan> unionChild2 = outputProject( + join(commonRight, otherRight), + "x", commonRight.getOutput().get(0), + "y", otherRight.getOutput().get(1)); + + LogicalUnion union = union(unionChild1, unionChild2); + + Plan rewritten = PlanChecker.from(MemoTestUtils.createConnectContext(), union) + .applyTopDown(new PullUpJoinFromUnionAll()) + .getPlan(); + + Assertions.assertInstanceOf(LogicalUnion.class, rewritten); + } + + private static LogicalOlapScan newScan(long tableId, String tableName) { + return PlanConstructor.newLogicalOlapScan(tableId, tableName, 0); + } + + private static LogicalOlapScan newScanWithTableSample(long tableId, String tableName, + org.apache.doris.nereids.trees.TableSample tableSample) { + return new LogicalOlapScan(PlanConstructor.getNextRelationId(), + PlanConstructor.newOlapTable(tableId, tableName, 0), ImmutableList.of("db"), + ImmutableList.of(), ImmutableList.of(), Optional.of(tableSample), ImmutableList.of()); + } + + private static LogicalOlapScan newScanWithScanParams(long tableId, String tableName, TableScanParams scanParams) { + return new LogicalOlapScan(PlanConstructor.getNextRelationId(), + PlanConstructor.newOlapTable(tableId, tableName, 0), ImmutableList.of("db"), + ImmutableList.of(), ImmutableList.of(), Optional.empty(), ImmutableList.of(), + Optional.of(scanParams)); + } + + private static LogicalOlapTableStreamScan newStreamScan(long tableId, String tableName) { + OlapTableStreamWrapper table = Mockito.mock(OlapTableStreamWrapper.class); + Mockito.when(table.getId()).thenReturn(tableId); + Mockito.when(table.getDatabase()).thenReturn(null); + Mockito.when(table.getName()).thenReturn(tableName); + Mockito.when(table.getBaseSchema(false)).thenReturn(ImmutableList.of(new Column("id", Type.INT, true))); + Mockito.when(table.getBaseSchema()).thenReturn(ImmutableList.of(new Column("id", Type.INT, true))); + return new LogicalOlapTableStreamScan(PlanConstructor.getNextRelationId(), + table, ImmutableList.of("db"), + ImmutableList.of(), ImmutableList.of(), Optional.empty(), ImmutableList.of()); + } + + private static LogicalOlapTableStreamScan newStreamScanWithOffsets(long tableId, String tableName, + long streamDbId, long streamId, KeysType keysType, ImmutableMap<Long, Pair<Long, Long>> offsets) { + OlapTable baseTable = Mockito.mock(OlapTable.class); + Mockito.when(baseTable.getId()).thenReturn(tableId); + Mockito.when(baseTable.getDatabase()).thenReturn(null); + Mockito.when(baseTable.getName()).thenReturn(tableName); + + OlapTableStreamWrapper table = Mockito.mock(OlapTableStreamWrapper.class); + Mockito.when(table.getId()).thenReturn(tableId); + Mockito.when(table.getDatabase()).thenReturn(null); + Mockito.when(table.getName()).thenReturn(tableName); + Mockito.when(table.getBaseTable()).thenReturn(baseTable); + Mockito.when(table.getStreamDbId()).thenReturn(streamDbId); + Mockito.when(table.getStreamId()).thenReturn(streamId); + Mockito.when(table.getStreamKeysType()).thenReturn(keysType); + Mockito.when(table.getBaseSchema(false)).thenReturn(ImmutableList.of(new Column("id", Type.INT, true))); Review Comment: This still does not prove the comparator reaches the `readMode` branch. The reset side created by `withReadMode(StreamReadMode.RESET)` recomputes its output, and `LogicalOlapTableStreamScan.computeOutput()` calls `getBaseSchema(true)` for reset mode. This helper only stubs `getBaseSchema(false)` and the no-arg overload, so Mockito returns the default for `true` and the test can fail while building output, before `hasSameScanState()` compares `readMode`. Please stub the `true` overload as well, so the snapshot and reset scans have equal output shape and the assertion fails specifically on `readMode`. -- 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]
