You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2022/06/24 13:01:20 UTC
[GitHub] [doris] yinzhijian opened a new pull request, #10411: [feature](nereids) support like and regexp predicate
yinzhijian opened a new pull request, #10411:
URL: https://github.com/apache/doris/pull/10411
# Proposed changes
Issue Number: close #xxx
## Problem Summary:
Describe the overview of changes.
## Checklist(Required)
1. Does it affect the original behavior: (No)
2. Has unit tests been added: (No)
3. Has document been added or modified: (No Need)
4. Does it need to update dependencies: (No)
5. Are there any changes that cannot be rolled back: (No)
## Further comments
If this is a relatively large or complex change, kick off the discussion at [dev@doris.apache.org](mailto:dev@doris.apache.org) by explaining why you chose the solution you did and what alternatives you considered, etc...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] EmmyMiao87 merged pull request #10411: [feature](nereids) support like and regexp predicate
Posted by GitBox <gi...@apache.org>.
EmmyMiao87 merged PR #10411:
URL: https://github.com/apache/doris/pull/10411
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] yinzhijian commented on a diff in pull request #10411: [feature](nereids) support like and regexp predicate
Posted by GitBox <gi...@apache.org>.
yinzhijian commented on code in PR #10411:
URL: https://github.com/apache/doris/pull/10411#discussion_r909239031
##########
fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4:
##########
@@ -178,6 +178,7 @@ booleanExpression
predicate
: NOT? kind=BETWEEN lower=valueExpression AND upper=valueExpression
+ | NOT? kind=(LIKE | REGEXP) pattern=valueExpression
Review Comment:
DORIS original optimizer does not support RLIKE, the new optimizer should be consistent with it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] EmmyMiao87 commented on a diff in pull request #10411: [feature](nereids) support like and regexp predicate
Posted by GitBox <gi...@apache.org>.
EmmyMiao87 commented on code in PR #10411:
URL: https://github.com/apache/doris/pull/10411#discussion_r913634626
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Regexp.java:
##########
@@ -0,0 +1,56 @@
+// 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.
+
+package org.apache.doris.nereids.trees.expressions;
+
+import org.apache.doris.nereids.exceptions.UnboundException;
+import org.apache.doris.nereids.trees.NodeType;
+
+import com.google.common.base.Preconditions;
+
+import java.util.List;
+
+/**
+ * like expression: a regexp '^xxx$'.
+ */
+public class Regexp<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
+ extends StringRegexPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+
+ public Regexp(LEFT_CHILD_TYPE left, RIGHT_CHILD_TYPE right) {
+ super(NodeType.REGEXP, left, right);
+ }
+
+ @Override
+ public boolean nullable() throws UnboundException {
+ return left().nullable() || right().nullable();
Review Comment:
same as like
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Like.java:
##########
@@ -0,0 +1,56 @@
+// 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.
+
+package org.apache.doris.nereids.trees.expressions;
+
+import org.apache.doris.nereids.exceptions.UnboundException;
+import org.apache.doris.nereids.trees.NodeType;
+
+import com.google.common.base.Preconditions;
+
+import java.util.List;
+
+/**
+ * like expression: a like 'xxx%'.
+ */
+public class Like<LEFT_CHILD_TYPE extends Expression, RIGHT_CHILD_TYPE extends Expression>
+ extends StringRegexPredicate<LEFT_CHILD_TYPE, RIGHT_CHILD_TYPE> {
+
+ public Like(LEFT_CHILD_TYPE left, RIGHT_CHILD_TYPE right) {
+ super(NodeType.LIKE, left, right);
+ }
+
+ @Override
+ public boolean nullable() throws UnboundException {
+ return left().nullable() || right().nullable();
Review Comment:
Maybe only ```left().nullable()``` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] yinzhijian commented on a diff in pull request #10411: [feature](nereids) support like and regexp predicate
Posted by GitBox <gi...@apache.org>.
yinzhijian commented on code in PR #10411:
URL: https://github.com/apache/doris/pull/10411#discussion_r909289024
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -576,6 +582,38 @@ public Expression withBetween(PredicateContext ctx, Expression e) {
return isNotBetween ? new Not(betweenPredicate) : betweenPredicate;
}
+ /**
+ * Generate like predicate.
+ *
+ * @param ctx PredicateContext
+ * @param e Expression
+ * @return Expression
+ */
+ public Expression withLike(PredicateContext ctx, Expression e) {
+ boolean isNotLike = ctx.NOT() != null ? true : false;
+ LikePredicate likePredicate = new LikePredicate(
+ e,
+ expression(ctx.pattern)
+ );
+ return isNotLike ? new Not(likePredicate) : likePredicate;
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] morrySnow commented on a diff in pull request #10411: [feature](nereids) support like and regexp predicate
Posted by GitBox <gi...@apache.org>.
morrySnow commented on code in PR #10411:
URL: https://github.com/apache/doris/pull/10411#discussion_r907406194
##########
fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4:
##########
@@ -178,6 +178,7 @@ booleanExpression
predicate
: NOT? kind=BETWEEN lower=valueExpression AND upper=valueExpression
+ | NOT? kind=(LIKE | REGEXP) pattern=valueExpression
Review Comment:
we have RLIKE in DorisLexer.g4 represent both 'RLIKE' and 'REGEXP'
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -576,6 +582,38 @@ public Expression withBetween(PredicateContext ctx, Expression e) {
return isNotBetween ? new Not(betweenPredicate) : betweenPredicate;
}
+ /**
+ * Generate like predicate.
+ *
+ * @param ctx PredicateContext
+ * @param e Expression
+ * @return Expression
+ */
+ public Expression withLike(PredicateContext ctx, Expression e) {
+ boolean isNotLike = ctx.NOT() != null ? true : false;
+ LikePredicate likePredicate = new LikePredicate(
+ e,
+ expression(ctx.pattern)
+ );
+ return isNotLike ? new Not(likePredicate) : likePredicate;
Review Comment:
in another pr, we refactor this and generate process in withPredicate
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] yinzhijian commented on a diff in pull request #10411: [feature](nereids) support like and regexp predicate
Posted by GitBox <gi...@apache.org>.
yinzhijian commented on code in PR #10411:
URL: https://github.com/apache/doris/pull/10411#discussion_r909241816
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -576,6 +582,38 @@ public Expression withBetween(PredicateContext ctx, Expression e) {
return isNotBetween ? new Not(betweenPredicate) : betweenPredicate;
}
+ /**
+ * Generate like predicate.
+ *
+ * @param ctx PredicateContext
+ * @param e Expression
+ * @return Expression
+ */
+ public Expression withLike(PredicateContext ctx, Expression e) {
+ boolean isNotLike = ctx.NOT() != null ? true : false;
+ LikePredicate likePredicate = new LikePredicate(
+ e,
+ expression(ctx.pattern)
+ );
+ return isNotLike ? new Not(likePredicate) : likePredicate;
Review Comment:
which pr？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org