You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by "Tanya-W (via GitHub)" <gi...@apache.org> on 2023/06/15 10:56:03 UTC
[GitHub] [doris] Tanya-W opened a new pull request, #20860: fix(match) add more checks for match expression in nereids, to fix regression case test_index_match_select and test_index_match_phrase
Tanya-W opened a new pull request, #20860:
URL: https://github.com/apache/doris/pull/20860
## Proposed changes
1. add more checks for match expression in nereids
2. and fix regression case test_index_match_select and test_index_match_phrase
## 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] morrySnow commented on a diff in pull request #20860: [fix](match) add more checks for match expression in nereids, to fix regression case test_index_match_select and test_index_match_phrase
Posted by "morrySnow (via GitHub)" <gi...@apache.org>.
morrySnow commented on code in PR #20860:
URL: https://github.com/apache/doris/pull/20860#discussion_r1231721692
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Match.java:
##########
@@ -60,22 +57,24 @@ public DataType getDataType() throws UnboundException {
return BooleanType.INSTANCE;
}
+ @Override
+ public AbstractDataType inputType() {
+ return AnyDataType.INSTANCE;
+ }
+
@Override
public boolean nullable() throws UnboundException {
- Preconditions.checkArgument(children.size() == 2);
- return (children.get(0).nullable() || children.get(1).nullable());
+ return left().nullable() || right().nullable();
Review Comment:
just use trait `PropagateNullable`
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/FunctionBinder.java:
##########
@@ -241,4 +242,27 @@ public Expression visitInSubquery(InSubquery inSubquery, ExpressionRewriteContex
inSubquery.getCorrelateSlots(), ((ListQuery) afterTypeCoercion.right()).getTypeCoercionExpr(),
inSubquery.isNot());
}
+
+ @Override
+ public Expression visitMatch(Match match, ExpressionRewriteContext context) {
+ Expression left = match.left().accept(this, context);
+ Expression right = match.right().accept(this, context);
+ // check child type
+ if (!left.getDataType().isCharType() && !left.getDataType().isVarcharType()
+ && !left.getDataType().isStringType()) {
Review Comment:
```suggestion
if (!left.isStringLikeType()) {
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CheckMatchExpression.java:
##########
@@ -0,0 +1,61 @@
+// 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.rules.rewrite;
+
+import org.apache.doris.nereids.exceptions.AnalysisException;
+import org.apache.doris.nereids.rules.Rule;
+import org.apache.doris.nereids.rules.RuleType;
+import org.apache.doris.nereids.trees.expressions.Expression;
+import org.apache.doris.nereids.trees.expressions.Match;
+import org.apache.doris.nereids.trees.expressions.SlotReference;
+import org.apache.doris.nereids.trees.expressions.literal.Literal;
+import org.apache.doris.nereids.trees.plans.logical.LogicalFilter;
+
+import java.util.List;
+
+/**
+ * Check match expression
+ */
+public class CheckMatchExpression extends OneRewriteRuleFactory {
+
+ @Override
+ public Rule build() {
+ return logicalFilter(logicalOlapScan())
+ .when(filter -> containsMatchExpression(filter.getExpressions()))
+ .then(filter -> checkChildren(filter)).toRule(RuleType.CHECK_MATCH_EXPRESSION);
Review Comment:
```suggestion
.when(filter -> containsMatchExpression(filter.getExpressions()))
.then(this::checkChildren)
.toRule(RuleType.CHECK_MATCH_EXPRESSION);
```
--
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] Tanya-W commented on pull request #20860: [fix](match) add more checks for match expression in nereids, to fix regression case test_index_match_select and test_index_match_phrase
Posted by "Tanya-W (via GitHub)" <gi...@apache.org>.
Tanya-W commented on PR #20860:
URL: https://github.com/apache/doris/pull/20860#issuecomment-1594241591
run buildall
--
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] github-actions[bot] commented on pull request #20860: [fix](match) add more checks for match expression in nereids, to fix regression case test_index_match_select and test_index_match_phrase
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #20860:
URL: https://github.com/apache/doris/pull/20860#issuecomment-1594254265
PR approved by at least one committer and no changes requested.
--
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] qidaye merged pull request #20860: [fix](match) fix regression case test_index_match_select and test_index_match_phrase
Posted by "qidaye (via GitHub)" <gi...@apache.org>.
qidaye merged PR #20860:
URL: https://github.com/apache/doris/pull/20860
--
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] Tanya-W commented on pull request #20860: [fix](match) add more checks for match expression in nereids, to fix regression case test_index_match_select and test_index_match_phrase
Posted by "Tanya-W (via GitHub)" <gi...@apache.org>.
Tanya-W commented on PR #20860:
URL: https://github.com/apache/doris/pull/20860#issuecomment-1593224267
run buildall
--
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] github-actions[bot] commented on pull request #20860: [fix](match) add more checks for match expression in nereids, to fix regression case test_index_match_select and test_index_match_phrase
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #20860:
URL: https://github.com/apache/doris/pull/20860#issuecomment-1594254328
PR approved by anyone and no changes requested.
--
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