This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new f062506b220 [fix](nereids)the preagg state for count(*) is wrong
(#35326)
f062506b220 is described below
commit f062506b22028440f9ab223bbee907a6660100f4
Author: starocean999 <[email protected]>
AuthorDate: Fri May 24 15:23:04 2024 +0800
[fix](nereids)the preagg state for count(*) is wrong (#35326)
---
.../nereids/rules/rewrite/AdjustPreAggStatus.java | 31 ++++++++++++----------
.../nereids/rules/analysis/BindRelationTest.java | 5 ++--
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/AdjustPreAggStatus.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/AdjustPreAggStatus.java
index a0c0b56dd71..8b90e4cdedc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/AdjustPreAggStatus.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/AdjustPreAggStatus.java
@@ -78,7 +78,7 @@ public class AdjustPreAggStatus implements RewriteRuleFactory
{
return ImmutableList.of(
// Aggregate(Scan)
logicalAggregate(logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalOlapScan> agg = ctx.root;
LogicalOlapScan scan = agg.child();
PreAggStatus preAggStatus = checkKeysType(scan);
@@ -96,7 +96,7 @@ public class AdjustPreAggStatus implements RewriteRuleFactory
{
// Aggregate(Filter(Scan))
logicalAggregate(
logicalFilter(logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalFilter<LogicalOlapScan>> agg = ctx.root;
LogicalFilter<LogicalOlapScan> filter =
agg.child();
LogicalOlapScan scan = filter.child();
@@ -117,7 +117,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Project(Scan))
logicalAggregate(logicalProject(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalProject<LogicalOlapScan>> agg =
ctx.root;
LogicalProject<LogicalOlapScan> project =
agg.child();
@@ -141,7 +141,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Project(Filter(Scan)))
logicalAggregate(logicalProject(logicalFilter(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet))))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalProject<LogicalFilter<LogicalOlapScan>>> agg = ctx.root;
LogicalProject<LogicalFilter<LogicalOlapScan>> project = agg.child();
LogicalFilter<LogicalOlapScan> filter =
project.child();
@@ -164,7 +164,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Filter(Project(Scan)))
logicalAggregate(logicalFilter(logicalProject(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet))))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalFilter<LogicalProject<LogicalOlapScan>>> agg = ctx.root;
LogicalFilter<LogicalProject<LogicalOlapScan>> filter =
agg.child();
@@ -189,7 +189,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Repeat(Scan))
logicalAggregate(
logicalRepeat(logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalRepeat<LogicalOlapScan>> agg = ctx.root;
LogicalRepeat<LogicalOlapScan> repeat =
agg.child();
LogicalOlapScan scan = repeat.child();
@@ -209,7 +209,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Repeat(Filter(Scan)))
logicalAggregate(logicalRepeat(logicalFilter(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet))))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalRepeat<LogicalFilter<LogicalOlapScan>>> agg = ctx.root;
LogicalRepeat<LogicalFilter<LogicalOlapScan>> repeat = agg.child();
LogicalFilter<LogicalOlapScan> filter =
repeat.child();
@@ -231,7 +231,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Repeat(Project(Scan)))
logicalAggregate(logicalRepeat(logicalProject(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet))))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalRepeat<LogicalProject<LogicalOlapScan>>> agg = ctx.root;
LogicalRepeat<LogicalProject<LogicalOlapScan>> repeat = agg.child();
LogicalProject<LogicalOlapScan> project =
repeat.child();
@@ -254,7 +254,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Repeat(Project(Filter(Scan))))
logicalAggregate(logicalRepeat(logicalProject(logicalFilter(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)))))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalRepeat<LogicalProject<LogicalFilter<LogicalOlapScan>>>>
agg
= ctx.root;
LogicalRepeat<LogicalProject<LogicalFilter<LogicalOlapScan>>> repeat =
agg.child();
@@ -280,7 +280,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Aggregate(Repeat(Filter(Project(Scan))))
logicalAggregate(logicalRepeat(logicalFilter(logicalProject(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)))))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalAggregate<LogicalRepeat<LogicalFilter<LogicalProject<LogicalOlapScan>>>>
agg
= ctx.root;
LogicalRepeat<LogicalFilter<LogicalProject<LogicalOlapScan>>> repeat =
agg.child();
@@ -307,7 +307,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Filter(Project(Scan))
logicalFilter(logicalProject(
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalFilter<LogicalProject<LogicalOlapScan>> filter = ctx.root;
LogicalProject<LogicalOlapScan> project =
filter.child();
LogicalOlapScan scan = project.child();
@@ -326,7 +326,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// Filter(Scan)
logicalFilter(logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet))
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalFilter<LogicalOlapScan> filter = ctx.root;
LogicalOlapScan scan = filter.child();
PreAggStatus preAggStatus = checkKeysType(scan);
@@ -342,7 +342,7 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
// only scan.
logicalOlapScan().when(LogicalOlapScan::isPreAggStatusUnSet)
- .thenApplyNoThrow(ctx -> {
+ .thenApply(ctx -> {
LogicalOlapScan scan = ctx.root;
PreAggStatus preAggStatus = checkKeysType(scan);
if (preAggStatus == PreAggStatus.unset()) {
@@ -500,7 +500,10 @@ public class AdjustPreAggStatus implements
RewriteRuleFactory {
? PreAggStatus.off("No aggregate on scan.")
: PreAggStatus.on();
for (AggregateFunction aggFunc : aggregateFuncs) {
- if (aggFunc.children().size() == 1 && aggFunc.child(0) instanceof
Slot) {
+ if (aggFunc.children().isEmpty()) {
+ preAggStatus = PreAggStatus.off(
+ String.format("can't turn preAgg on for aggregate
function %s", aggFunc));
+ } else if (aggFunc.children().size() == 1 && aggFunc.child(0)
instanceof Slot) {
Slot aggSlot = (Slot) aggFunc.child(0);
if (aggSlot instanceof SlotReference
&& ((SlotReference) aggSlot).getColumn().isPresent()) {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
index 25d0bb706be..e3011e7f3f5 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
@@ -114,10 +114,11 @@ class BindRelationTest extends TestWithFeService
implements GeneratedPlanPattern
PlanChecker.from(connectContext)
.parse("select * from " + tableName + " as et join db1.t on
et.id = t.a")
.customAnalyzer(Optional.of(customTableResolver)) // analyze
internal relation
- .rewrite()
.matches(
logicalJoin(
- logicalOlapScan().when(r -> r.getTable() ==
externalOlapTable),
+ logicalSubQueryAlias(
+ logicalOlapScan().when(r -> r.getTable() ==
externalOlapTable)
+ ),
logicalOlapScan().when(r ->
r.getTable().getName().equals("t"))
)
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
