This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 7f5b2759968 [opt](Nereids) support no-key hint parameter (#37720)
7f5b2759968 is described below
commit 7f5b2759968184a1d6eb3a20b939e0c7441ab1e4
Author: morrySnow <[email protected]>
AuthorDate: Wed Jul 17 14:45:07 2024 +0800
[opt](Nereids) support no-key hint parameter (#37720)
support hint use parameter without key, like:
```sql
SELECT /*+ query_timeout(3000) */ * FROM t;
```
---
.../antlr4/org/apache/doris/nereids/DorisParser.g4 | 1 +
.../datasource/hive/HiveMetaStoreClientHelper.java | 2 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 36 +++++++++++++---------
.../suites/nereids_syntax_p0/hint.groovy | 27 ++++++++++++++++
4 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
index 7e1c98b5cb2..045100055ae 100644
--- a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
+++ b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
@@ -501,6 +501,7 @@ hintStatement
hintAssignment
: key=identifierOrText (EQ (constantValue=constant |
identifierValue=identifier))?
+ | constant
;
updateAssignment
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
index 795cbef18c9..db6019eda97 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
@@ -883,7 +883,7 @@ public class HiveMetaStoreClientHelper {
public static String getByte(String altValue) {
if (altValue != null && altValue.length() > 0) {
try {
- return Character.toString((char) (Byte.parseByte(altValue) +
256) % 256);
+ return Character.toString((char) ((Byte.parseByte(altValue) +
256) % 256));
} catch (NumberFormatException e) {
return altValue.substring(0, 1);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
index 5c404e936bd..79ced9182dc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -3112,24 +3112,28 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
case "set_var":
Map<String, Optional<String>> parameters =
Maps.newLinkedHashMap();
for (HintAssignmentContext kv : hintStatement.parameters) {
- String parameterName = visitIdentifierOrText(kv.key);
- Optional<String> value = Optional.empty();
- if (kv.constantValue != null) {
- Literal literal = (Literal)
visit(kv.constantValue);
- value =
Optional.ofNullable(literal.toLegacyLiteral().getStringValue());
- } else if (kv.identifierValue != null) {
- // maybe we should throw exception when the
identifierValue is quoted identifier
- value =
Optional.ofNullable(kv.identifierValue.getText());
+ if (kv.key != null) {
+ String parameterName =
visitIdentifierOrText(kv.key);
+ Optional<String> value = Optional.empty();
+ if (kv.constantValue != null) {
+ Literal literal = (Literal)
visit(kv.constantValue);
+ value =
Optional.ofNullable(literal.toLegacyLiteral().getStringValue());
+ } else if (kv.identifierValue != null) {
+ // maybe we should throw exception when the
identifierValue is quoted identifier
+ value =
Optional.ofNullable(kv.identifierValue.getText());
+ }
+ parameters.put(parameterName, value);
}
- parameters.put(parameterName, value);
}
hints.put(hintName, new SelectHintSetVar(hintName,
parameters));
break;
case "leading":
List<String> leadingParameters = new ArrayList<String>();
for (HintAssignmentContext kv : hintStatement.parameters) {
- String parameterName = visitIdentifierOrText(kv.key);
- leadingParameters.add(parameterName);
+ if (kv.key != null) {
+ String parameterName =
visitIdentifierOrText(kv.key);
+ leadingParameters.add(parameterName);
+ }
}
hints.put(hintName, new SelectHintLeading(hintName,
leadingParameters));
break;
@@ -3139,8 +3143,10 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
case "use_cbo_rule":
List<String> useRuleParameters = new ArrayList<String>();
for (HintAssignmentContext kv : hintStatement.parameters) {
- String parameterName = visitIdentifierOrText(kv.key);
- useRuleParameters.add(parameterName);
+ if (kv.key != null) {
+ String parameterName =
visitIdentifierOrText(kv.key);
+ useRuleParameters.add(parameterName);
+ }
}
hints.put(hintName, new SelectHintUseCboRule(hintName,
useRuleParameters, false));
break;
@@ -3148,7 +3154,9 @@ public class LogicalPlanBuilder extends
DorisParserBaseVisitor<Object> {
List<String> noUseRuleParameters = new ArrayList<String>();
for (HintAssignmentContext kv : hintStatement.parameters) {
String parameterName = visitIdentifierOrText(kv.key);
- noUseRuleParameters.add(parameterName);
+ if (kv.key != null) {
+ noUseRuleParameters.add(parameterName);
+ }
}
hints.put(hintName, new SelectHintUseCboRule(hintName,
noUseRuleParameters, true));
break;
diff --git a/regression-test/suites/nereids_syntax_p0/hint.groovy
b/regression-test/suites/nereids_syntax_p0/hint.groovy
new file mode 100644
index 00000000000..88c8f0c2163
--- /dev/null
+++ b/regression-test/suites/nereids_syntax_p0/hint.groovy
@@ -0,0 +1,27 @@
+// 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("hint") {
+ sql """select /*+ func(k=v) */ 1"""
+ sql """select /*+ func('k'=v) */ 1"""
+ sql """select /*+ func("k"=v) */ 1"""
+ sql """select /*+ func(k) */ 1"""
+ sql """select /*+ func('k') */ 1"""
+ sql """select /*+ func("k") */ 1"""
+ sql """select /*+ func(1) */ 1"""
+}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
