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

[fix](Nereids) set operation syntax is not compatible with legacy planner (#23668)

Browse Source 
for example
```sql
WITH A AS (SELECT * FROM B)
SELECT * FROM C
UNION
SELECT * FROM D
```

the scope of CTE in Nereids is the first set oeprand.
the scope of CTE in legacy planner is the whole statement.
This commit is contained in:
morrySnow
2023-08-31 11:55:35 +08:00
committed by GitHub
parent ab85fb3592
commit 897151fc2b
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
View File

@ -118,14 +118,13 @@ outFileClause
;
query
: {!doris_legacy_SQL_syntax}? cte? queryTerm queryOrganization
| {doris_legacy_SQL_syntax}? queryTerm queryOrganization
: cte? queryTerm queryOrganization
;
queryTerm
: queryPrimary #queryTermDefault
: queryPrimary #queryTermDefault
| left=queryTerm operator=(UNION | EXCEPT | INTERSECT)
setQuantifier? right=queryTerm #setOperation
setQuantifier? right=queryTerm #setOperation
;
setQuantifier
@ -134,19 +133,17 @@ setQuantifier
;
queryPrimary
: querySpecification #queryPrimaryDefault
| TABLE multipartIdentifier #table
| LEFT_PAREN query RIGHT_PAREN #subquery
: querySpecification #queryPrimaryDefault
| LEFT_PAREN query RIGHT_PAREN #subquery
;
querySpecification
: {doris_legacy_SQL_syntax}? cte?
selectClause
: selectClause
fromClause?
whereClause?
aggClause?
havingClause?
{doris_legacy_SQL_syntax}? queryOrganization #regularQuerySpecification
{doris_legacy_SQL_syntax}? queryOrganization #regularQuerySpecification
;
cte
@ -287,11 +284,12 @@ identifierSeq
;
relationPrimary
: multipartIdentifier specifiedPartition? tabletList? tableAlias relationHint? lateralView* #tableName
| LEFT_PAREN query RIGHT_PAREN tableAlias lateralView* #aliasedQuery
: multipartIdentifier specifiedPartition?
tabletList? tableAlias relationHint? lateralView* #tableName
| LEFT_PAREN query RIGHT_PAREN tableAlias lateralView* #aliasedQuery
| tvfName=identifier LEFT_PAREN
(properties=propertyItemList)?
RIGHT_PAREN tableAlias #tableValuedFunction
RIGHT_PAREN tableAlias #tableValuedFunction
;
propertyClause

1
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
View File

@ -631,7 +631,6 @@ public class LogicalPlanBuilder extends DorisParserBaseVisitor<Object> {
);
}
selectPlan = withQueryOrganization(selectPlan, ctx.queryOrganization());
selectPlan = withCte(selectPlan, ctx.cte());
return withSelectHint(selectPlan, selectCtx.selectHint());
});
}

3
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/FunctionBinder.java
View File

@ -119,8 +119,7 @@ public class FunctionBinder extends AbstractExpressionRewriteRule {
@Override
public Expression visitBoundFunction(BoundFunction boundFunction, ExpressionRewriteContext context) {
boundFunction = (BoundFunction) boundFunction.withChildren(boundFunction.children().stream()
.map(e -> e.accept(this, context)).collect(Collectors.toList()));
boundFunction = (BoundFunction) super.visitBoundFunction(boundFunction, context);
return TypeCoercionUtils.processBoundFunction(boundFunction);
}