benWize commented on a change in pull request #16200:
URL: https://github.com/apache/beam/pull/16200#discussion_r776040199
##########
File path:
sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorMappingTable.java
##########
@@ -17,85 +17,93 @@
*/
package org.apache.beam.sdk.extensions.sql.zetasql.translation;
+import com.google.zetasql.resolvedast.ResolvedNodes;
import java.util.Map;
+import java.util.function.Function;
import
org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlOperator;
import
org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.fun.SqlStdOperatorTable;
import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap;
+import org.checkerframework.checker.nullness.qual.Nullable;
/** SqlOperatorMappingTable. */
class SqlOperatorMappingTable {
// todo: Some of operators defined here are later overridden in
ZetaSQLPlannerImpl.
// We should remove them from this table and add generic way to provide
custom
// implementation. (Ex.: timestamp_add)
- static final Map<String, SqlOperator>
ZETASQL_FUNCTION_TO_CALCITE_SQL_OPERATOR =
- ImmutableMap.<String, SqlOperator>builder()
- // grouped window function
- .put("TUMBLE", SqlStdOperatorTable.TUMBLE_OLD)
- .put("HOP", SqlStdOperatorTable.HOP_OLD)
- .put("SESSION", SqlStdOperatorTable.SESSION_OLD)
+ static final Map<String, Function<ResolvedNodes.ResolvedFunctionCallBase,
SqlOperator>>
+ ZETASQL_FUNCTION_TO_CALCITE_SQL_OPERATOR =
+ ImmutableMap
+ .<String, Function<ResolvedNodes.ResolvedFunctionCallBase,
SqlOperator>>builder()
+ // grouped window function
+ .put("TUMBLE", resolvedFunction ->
SqlStdOperatorTable.TUMBLE_OLD)
+ .put("HOP", resolvedFunction -> SqlStdOperatorTable.HOP_OLD)
+ .put("SESSION", resolvedFunction ->
SqlStdOperatorTable.SESSION_OLD)
- // ZetaSQL functions
- .put("$and", SqlStdOperatorTable.AND)
- .put("$or", SqlStdOperatorTable.OR)
- .put("$not", SqlStdOperatorTable.NOT)
- .put("$equal", SqlStdOperatorTable.EQUALS)
- .put("$not_equal", SqlStdOperatorTable.NOT_EQUALS)
- .put("$greater", SqlStdOperatorTable.GREATER_THAN)
- .put("$greater_or_equal", SqlStdOperatorTable.GREATER_THAN_OR_EQUAL)
- .put("$less", SqlStdOperatorTable.LESS_THAN)
- .put("$less_or_equal", SqlStdOperatorTable.LESS_THAN_OR_EQUAL)
- .put("$like", SqlOperators.LIKE)
- .put("$is_null", SqlStdOperatorTable.IS_NULL)
- .put("$is_true", SqlStdOperatorTable.IS_TRUE)
- .put("$is_false", SqlStdOperatorTable.IS_FALSE)
- .put("$add", SqlStdOperatorTable.PLUS)
- .put("$subtract", SqlStdOperatorTable.MINUS)
- .put("$multiply", SqlStdOperatorTable.MULTIPLY)
- .put("$unary_minus", SqlStdOperatorTable.UNARY_MINUS)
- .put("$divide", SqlStdOperatorTable.DIVIDE)
- .put("concat", SqlOperators.CONCAT)
- .put("substr", SqlOperators.SUBSTR)
- .put("substring", SqlOperators.SUBSTR)
- .put("trim", SqlOperators.TRIM)
- .put("replace", SqlOperators.REPLACE)
- .put("char_length", SqlOperators.CHAR_LENGTH)
- .put("starts_with", SqlOperators.START_WITHS)
- .put("ends_with", SqlOperators.ENDS_WITH)
- .put("ltrim", SqlOperators.LTRIM)
- .put("rtrim", SqlOperators.RTRIM)
- .put("reverse", SqlOperators.REVERSE)
- .put("$count_star", SqlStdOperatorTable.COUNT)
- .put("max", SqlStdOperatorTable.MAX)
- .put("min", SqlStdOperatorTable.MIN)
- .put("avg", SqlStdOperatorTable.AVG)
- .put("sum", SqlStdOperatorTable.SUM)
- .put("any_value", SqlStdOperatorTable.ANY_VALUE)
- .put("count", SqlStdOperatorTable.COUNT)
- .put("bit_and", SqlStdOperatorTable.BIT_AND)
- .put("string_agg", SqlOperators.STRING_AGG_STRING_FN) // NULL values
not supported
- .put("array_agg", SqlOperators.ARRAY_AGG_FN)
- .put("bit_or", SqlStdOperatorTable.BIT_OR)
- .put("bit_xor", SqlOperators.BIT_XOR)
- .put("ceil", SqlStdOperatorTable.CEIL)
- .put("floor", SqlStdOperatorTable.FLOOR)
- .put("mod", SqlStdOperatorTable.MOD)
- .put("timestamp", SqlOperators.TIMESTAMP_OP)
- .put("$case_no_value", SqlStdOperatorTable.CASE)
+ // ZetaSQL functions
+ .put("$and", resolvedFunction -> SqlStdOperatorTable.AND)
+ .put("$or", resolvedFunction -> SqlStdOperatorTable.OR)
+ .put("$not", resolvedFunction -> SqlStdOperatorTable.NOT)
+ .put("$equal", resolvedFunction -> SqlStdOperatorTable.EQUALS)
+ .put("$not_equal", resolvedFunction ->
SqlStdOperatorTable.NOT_EQUALS)
+ .put("$greater", resolvedFunction ->
SqlStdOperatorTable.GREATER_THAN)
+ .put(
+ "$greater_or_equal",
+ resolvedFunction ->
SqlStdOperatorTable.GREATER_THAN_OR_EQUAL)
+ .put("$less", resolvedFunction -> SqlStdOperatorTable.LESS_THAN)
+ .put("$less_or_equal", resolvedFunction ->
SqlStdOperatorTable.LESS_THAN_OR_EQUAL)
+ .put("$like", resolvedFunction -> SqlOperators.LIKE)
+ .put("$is_null", resolvedFunction -> SqlStdOperatorTable.IS_NULL)
+ .put("$is_true", resolvedFunction -> SqlStdOperatorTable.IS_TRUE)
+ .put("$is_false", resolvedFunction ->
SqlStdOperatorTable.IS_FALSE)
+ .put("$add", resolvedFunction -> SqlStdOperatorTable.PLUS)
+ .put("$subtract", resolvedFunction -> SqlStdOperatorTable.MINUS)
+ .put("$multiply", resolvedFunction ->
SqlStdOperatorTable.MULTIPLY)
+ .put("$unary_minus", resolvedFunction ->
SqlStdOperatorTable.UNARY_MINUS)
+ .put("$divide", resolvedFunction -> SqlStdOperatorTable.DIVIDE)
+ .put("concat", resolvedFunction -> SqlOperators.CONCAT)
+ .put("substr", resolvedFunction -> SqlOperators.SUBSTR)
+ .put("substring", resolvedFunction -> SqlOperators.SUBSTR)
+ .put("trim", resolvedFunction -> SqlOperators.TRIM)
+ .put("replace", resolvedFunction -> SqlOperators.REPLACE)
+ .put("char_length", resolvedFunction -> SqlOperators.CHAR_LENGTH)
+ .put("starts_with", resolvedFunction -> SqlOperators.START_WITHS)
+ .put("ends_with", resolvedFunction -> SqlOperators.ENDS_WITH)
+ .put("ltrim", resolvedFunction -> SqlOperators.LTRIM)
+ .put("rtrim", resolvedFunction -> SqlOperators.RTRIM)
+ .put("reverse", resolvedFunction -> SqlOperators.REVERSE)
+ .put("$count_star", resolvedFunction ->
SqlStdOperatorTable.COUNT)
+ .put("max", resolvedFunction -> SqlStdOperatorTable.MAX)
+ .put("min", resolvedFunction -> SqlStdOperatorTable.MIN)
+ .put("avg", resolvedFunction -> SqlStdOperatorTable.AVG)
+ .put("sum", resolvedFunction -> SqlStdOperatorTable.SUM)
+ .put("any_value", resolvedFunction ->
SqlStdOperatorTable.ANY_VALUE)
+ .put("count", resolvedFunction -> SqlStdOperatorTable.COUNT)
+ .put("bit_and", resolvedFunction -> SqlStdOperatorTable.BIT_AND)
+ .put("string_agg", SqlOperators::createStringAggOperator) //
NULL values not supported
Review comment:
Yes, those were my thoughts
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
