Skip to content

[fix](Nereids): fix StatsCalculator compute project. #12539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackwener merged 4 commits into from
Sep 14, 2022
Merged

[fix](Nereids): fix StatsCalculator compute project. #12539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3df797
[fix](Nereids): fix StatsCalculator compute project.
jackwener Sep 13, 2022
9d9fac8
fix commute join type
jackwener Sep 13, 2022
5754ba3
fix type
jackwener Sep 13, 2022
b359a89
add PushdownFilterThroughProject
jackwener Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.doris.nereids.rules.implementation.LogicalTopNToPhysicalTopN;
import org.apache.doris.nereids.rules.rewrite.AggregateDisassemble;
import org.apache.doris.nereids.rules.rewrite.logical.MergeConsecutiveProjects;
import org.apache.doris.nereids.rules.rewrite.logical.PushdownFilterThroughProject;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
Expand All @@ -48,6 +49,7 @@ public class RuleSet {
.add(JoinCommute.OUTER_LEFT_DEEP)
.add(JoinLAsscom.INNER)
.add(JoinLAsscomProject.INNER)
.add(new PushdownFilterThroughProject())
.add(new MergeConsecutiveProjects())
.build();

Expand Down
10 changes: 5 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ public enum RuleType {
// Eliminate plan
ELIMINATE_LIMIT(RuleTypeClass.REWRITE),
ELIMINATE_FILTER(RuleTypeClass.REWRITE),

FIND_HASH_CONDITION_FOR_JOIN(RuleTypeClass.REWRITE),
ROLLUP_AGG_SCAN(RuleTypeClass.REWRITE),
ROLLUP_AGG_FILTER_SCAN(RuleTypeClass.REWRITE),
ROLLUP_AGG_PROJECT_SCAN(RuleTypeClass.REWRITE),
ROLLUP_AGG_PROJECT_FILTER_SCAN(RuleTypeClass.REWRITE),
ROLLUP_AGG_FILTER_PROJECT_SCAN(RuleTypeClass.REWRITE),
OLAP_SCAN_PARTITION_PRUNE(RuleTypeClass.REWRITE),
// Swap plan
SWAP_FILTER_AND_PROJECT(RuleTypeClass.REWRITE),
// Pushdown filter
PUSHDOWN_FILTER_THROUGH_PROJET(RuleTypeClass.REWRITE),
LOGICAL_LIMIT_TO_LOGICAL_EMPTY_RELATION_RULE(RuleTypeClass.REWRITE),
SWAP_LIMIT_PROJECT(RuleTypeClass.REWRITE),
REWRITE_SENTINEL(RuleTypeClass.REWRITE),

Expand Down Expand Up @@ -152,8 +152,8 @@ public RuleTypeClass getRuleTypeClass() {
return ruleTypeClass;
}

public <INPUT_TYPE extends Plan, OUTPUT_TYPE extends Plan> Rule build(
PatternMatcher<INPUT_TYPE, OUTPUT_TYPE> patternMatcher) {
public <INPUT_TYPE extends Plan, OUTPUT_TYPE extends Plan>
Rule build(PatternMatcher<INPUT_TYPE, OUTPUT_TYPE> patternMatcher) {
return patternMatcher.toRule(this);
}

Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinCommute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ enum SwapType {

@Override
public Rule build() {
return innerLogicalJoin()
return logicalJoin()
.when(this::check)
.then(join -> {
LogicalJoin<GroupPlan, GroupPlan> newJoin = new LogicalJoin<>(
join.getJoinType(),
join.getJoinType().swap(),
join.getHashJoinConjuncts(),
join.getOtherJoinCondition(),
join.right(), join.left(),
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/doris/nereids/rules/rewrite/logical/PushdownFilterThroughProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public Rule build() {
project.child()
)
);
}).toRule(RuleType.SWAP_FILTER_AND_PROJECT);
}).toRule(RuleType.PUSHDOWN_FILTER_THROUGH_PROJET);
}
}
17 changes: 13 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

import com.google.common.collect.Maps;

import java.util.AbstractMap;
import java.util.AbstractMap.SimpleEntry;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -341,14 +341,23 @@ private StatsDeriveResult computeProject(Project project) {
StatsDeriveResult statsDeriveResult = groupExpression.getCopyOfChildStats(0);
Map<Slot, ColumnStats> childColumnStats = statsDeriveResult.getSlotToColumnStats();
Map<Slot, ColumnStats> columnsStats = projections.stream().map(projection -> {
ColumnStats value = null;
Set<Slot> slots = projection.getInputSlots();
if (slots.isEmpty()) {
return new AbstractMap.SimpleEntry<>(projection.toSlot(), ColumnStats.createDefaultColumnStats());
value = ColumnStats.createDefaultColumnStats();
} else {
// TODO: just a trick here, need to do real project on column stats
return new AbstractMap.SimpleEntry<>(projection.toSlot(),
childColumnStats.get(slots.iterator().next()));
for (Slot slot : slots) {
if (childColumnStats.containsKey(slot)) {
value = childColumnStats.get(slot);
break;
}
}
if (value == null) {
value = ColumnStats.createDefaultColumnStats();
}
}
return new SimpleEntry<>(projection.toSlot(), value);
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (item1, item2) -> item1));
statsDeriveResult.setSlotToColumnStats(columnsStats);
return statsDeriveResult;
Expand Down