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

[Feature](Nereids): add logical operator || && (#15643)

Browse Source
This commit is contained in:
谢健
2023-01-06 12:18:21 +08:00
committed by GitHub
parent df2da89b89
commit ef72b8d859
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
View File

@ -413,6 +413,7 @@ SLASH: '/';
PERCENT: '%';
TILDE: '~';
AMPERSAND: '&';
LOGICALAND: '&&';
PIPE: '|';
CONCAT_PIPE: '||';
HAT: '^';

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

@ -243,8 +243,8 @@ booleanExpression
| (ISNULL | IS_NULL_PRED) LEFT_PAREN valueExpression RIGHT_PAREN #isnull
| IS_NOT_NULL_PRED LEFT_PAREN valueExpression RIGHT_PAREN #is_not_null_pred
| valueExpression predicate? #predicated
| left=booleanExpression operator=AND right=booleanExpression #logicalBinary
| left=booleanExpression operator=OR right=booleanExpression #logicalBinary
| left=booleanExpression operator=(AND | LOGICALAND) right=booleanExpression #logicalBinary
| left=booleanExpression operator=(OR | CONCAT_PIPE) right=booleanExpression #logicalBinary
;
predicate

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

@ -575,9 +575,11 @@ public class LogicalPlanBuilder extends DorisParserBaseVisitor<Object> {
Expression right = getExpression(ctx.right);
switch (ctx.operator.getType()) {
case DorisParser.LOGICALAND:
case DorisParser.AND:
return new And(left, right);
case DorisParser.OR:
case DorisParser.CONCAT_PIPE:
return new Or(left, right);
default:
throw new ParseException("Unsupported logical binary type: " + ctx.operator.getText(), ctx);

31
regression-test/suites/nereids_syntax_p0/expression.groovy Normal file
View File

@ -0,0 +1,31 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
suite("nereids_syntax_expression_test") {
sql "SET enable_nereids_planner=true"
sql "SET enable_fallback_to_original_planner=false"
test {
sql "select true and false, true && false"
result([[false, false]])
}
test {
sql "select true or false, true || false"
result([[true, true]])
}
}