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

[ehancement](planner) Support filter the output of set operation node (#16666)

Browse Source
This commit is contained in:
AKIRA
2023-02-21 19:22:09 +08:00
committed by GitHub
parent ed05f3b480
commit a95f47ac0a
5 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
View File

@ -397,6 +397,8 @@ public class Analyzer {
private final Set<TupleId> markTupleIdsNotProcessed = Sets.newHashSet();
private final Map<InlineViewRef, Set<Expr>> migrateFailedConjuncts = Maps.newHashMap();
public GlobalState(Env env, ConnectContext context) {
this.env = env;
this.context = context;
@ -1204,6 +1206,15 @@ public class Analyzer {
}
}
public void registerMigrateFailedConjuncts(InlineViewRef ref, Expr e) {
Set<Expr> exprSet = globalState.migrateFailedConjuncts.computeIfAbsent(ref, (k) -> new HashSet<>());
exprSet.add(e);
}
public Set<Expr> findMigrateFailedConjuncts(InlineViewRef inlineViewRef) {
return globalState.migrateFailedConjuncts.get(inlineViewRef);
}
/**
* register expr id
* @param expr

4
fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java
View File

@ -1134,4 +1134,8 @@ public abstract class PlanNode extends TreeNode<PlanNode> implements PlanStats {
public List<SlotId> getOutputSlotIds() {
return outputSlotIds;
}
public void setVConjunct(Set<Expr> exprs) {
vconjunct = convertConjunctsToAndCompoundPredicate(new ArrayList<>(exprs));
}
}

13
fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
View File

@ -1814,8 +1814,9 @@ public class SingleNodePlanner {
newConjuncts = cloneExprs(newConjuncts);
}
} else {
Preconditions.checkArgument(select.getTableRefs().size() == 1);
viewAnalyzer.registerConjuncts(newConjuncts, select.getTableRefs().get(0).getId());
for (Expr e : conjuncts) {
viewAnalyzer.registerMigrateFailedConjuncts(inlineViewRef, e);
}
}
} else {
Preconditions.checkArgument(stmt instanceof SetOperationStmt);
@ -2150,7 +2151,13 @@ public class SingleNodePlanner {
scanNode = createScanNode(analyzer, tblRef, selectStmt);
}
if (tblRef instanceof InlineViewRef) {
scanNode = createInlineViewPlan(analyzer, (InlineViewRef) tblRef);
InlineViewRef inlineViewRef = (InlineViewRef) tblRef;
scanNode = createInlineViewPlan(analyzer, inlineViewRef);
Analyzer viewAnalyzer = inlineViewRef.getAnalyzer();
Set<Expr> exprs = viewAnalyzer.findMigrateFailedConjuncts(inlineViewRef);
if (CollectionUtils.isNotEmpty(exprs)) {
scanNode.setVConjunct(exprs);
}
}
if (scanNode == null) {
throw new UserException("unknown TableRef node");

3
regression-test/data/query_p0/union/test_union.out
View File

@ -364,3 +364,6 @@ hell0
2016-07-01
2016-07-02
-- !union36 --
1 2

2
regression-test/suites/query_p0/union/test_union.groovy
View File

@ -277,4 +277,6 @@ suite("test_union") {
sql 'set enable_fallback_to_original_planner=false'
sql 'set enable_nereids_planner=true'
qt_union35 """select cast("2016-07-01" as date) union (select cast("2016-07-02 1:10:0" as date)) order by 1"""
qt_union36 """SELECT a,2 as a FROM (SELECT '1' as a) b where a=1;"""
}