database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](nereids) the project node is lost when creating PhysicalStorageLayerAggregate node (#15467)

Browse Source
This commit is contained in:
starocean999
2022-12-30 16:33:24 +08:00
committed by GitHub
parent 08d4dcefff
commit 93a25e1af5
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/AggregateStrategies.java
View File

@ -284,10 +284,16 @@ public class AggregateStrategies implements ImplementationRuleFactory {
.build()
.transform(olapScan, cascadesContext)
.get(0);
return aggregate.withChildren(ImmutableList.of(
new PhysicalStorageLayerAggregate(physicalOlapScan, mergeOp)
));
if (project != null) {
return aggregate.withChildren(ImmutableList.of(
project.withChildren(
ImmutableList.of(new PhysicalStorageLayerAggregate(physicalOlapScan, mergeOp)))
));
} else {
return aggregate.withChildren(ImmutableList.of(
new PhysicalStorageLayerAggregate(physicalOlapScan, mergeOp)
));
}
}
/**

12
fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/logical/PhysicalStorageLayerAggregateTest.java
View File

@ -120,7 +120,9 @@ public class PhysicalStorageLayerAggregateTest implements GeneratedPatterns {
.applyImplementation(storageLayerAggregateWithProject())
.matches(
logicalAggregate(
physicalStorageLayerAggregate().when(agg -> agg.getAggOp() == PushDownAggOp.MIN_MAX)
logicalProject(
physicalStorageLayerAggregate().when(agg -> agg.getAggOp() == PushDownAggOp.MIN_MAX)
)
)
);
@ -135,7 +137,9 @@ public class PhysicalStorageLayerAggregateTest implements GeneratedPatterns {
.applyImplementation(storageLayerAggregateWithProject())
.matches(
logicalAggregate(
physicalStorageLayerAggregate().when(agg -> agg.getAggOp() == PushDownAggOp.COUNT)
logicalProject(
physicalStorageLayerAggregate().when(agg -> agg.getAggOp() == PushDownAggOp.COUNT)
)
)
);
@ -152,7 +156,9 @@ public class PhysicalStorageLayerAggregateTest implements GeneratedPatterns {
.applyImplementation(storageLayerAggregateWithProject())
.matches(
logicalAggregate(
physicalStorageLayerAggregate().when(agg -> agg.getAggOp() == PushDownAggOp.MIX)
logicalProject(
physicalStorageLayerAggregate().when(agg -> agg.getAggOp() == PushDownAggOp.MIX)
)
)
);
}