This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new cacb0b12e8 fixing canonicalize function name (#11460)
cacb0b12e8 is described below
commit cacb0b12e86f0dc5269438f7ed07b13d160047b7
Author: Xiang Fu <[email protected]>
AuthorDate: Wed Aug 30 05:00:08 2023 -0700
fixing canonicalize function name (#11460)
---
.../pinot/query/parser/CalciteRexExpressionParser.java | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git
a/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
b/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
index 8afefcd0ea..36e57fb06f 100644
---
a/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
+++
b/pinot-query-planner/src/main/java/org/apache/pinot/query/parser/CalciteRexExpressionParser.java
@@ -56,7 +56,8 @@ public class CalciteRexExpressionParser {
static {
CANONICAL_NAME_TO_SPECIAL_KEY_MAP = new HashMap<>();
for (FilterKind filterKind : FilterKind.values()) {
-
CANONICAL_NAME_TO_SPECIAL_KEY_MAP.put(canonicalizeFunctionNameInternal(filterKind.name()),
filterKind.name());
+
CANONICAL_NAME_TO_SPECIAL_KEY_MAP.put(RequestUtils.canonicalizeFunctionName(filterKind.name()),
+ filterKind.name());
}
}
@@ -276,18 +277,7 @@ public class CalciteRexExpressionParser {
}
private static String canonicalizeFunctionName(String functionName) {
- String canonicalizeName = canonicalizeFunctionNameInternal(functionName);
+ String canonicalizeName =
RequestUtils.canonicalizeFunctionName(functionName);
return CANONICAL_NAME_TO_SPECIAL_KEY_MAP.getOrDefault(canonicalizeName,
canonicalizeName);
}
-
- /**
- * Canonicalize Calcite generated Logical function names.
- */
- private static String canonicalizeFunctionNameInternal(String functionName) {
- if (functionName.endsWith("0")) {
- return functionName.substring(0, functionName.length() - 1).replace("_",
"").toLowerCase();
- } else {
- return functionName.replace("_", "").toLowerCase();
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
