[FLINK-26474][hive] fix the issue of failing to call some hive udf re…

…quired constant parameters with implicit constant passed.
apache · Jun 22, 2022 · d2abd7a · d2abd7a
1 parent 3ae4c6f
commit d2abd7a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/...rc/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java b/...rc/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java
@@ -2274,7 +2274,8 @@ private RelNode genSelectLogicalPlan(
                 } else {
                     // Case when this is an expression
                     HiveParserTypeCheckCtx typeCheckCtx =
-                            new HiveParserTypeCheckCtx(inputRR, frameworkConfig, cluster);
+                            new HiveParserTypeCheckCtx(
+                                    inputRR, true, true, frameworkConfig, cluster);
                     // We allow stateful functions in the SELECT list (but nowhere else)
                     typeCheckCtx.setAllowStatefulFunctions(true);
                     if (!qbp.getDestToGroupBy().isEmpty()) {

diff --git a/...n/java/org/apache/flink/table/planner/delegation/hive/HiveParserTypeCheckProcFactory.java b/...n/java/org/apache/flink/table/planner/delegation/hive/HiveParserTypeCheckProcFactory.java
@@ -75,6 +75,7 @@
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFNvl;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPAnd;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual;
+import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNot;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPOr;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFWhen;
@@ -1231,7 +1232,6 @@ protected ExprNodeDesc getXpathOrFuncExprNodeDesc(
                 // If the function is deterministic and the children are constants,
                 // we try to fold the expression to remove e.g. cast on constant
                 if (ctx.isFoldExpr()
-                        && desc instanceof ExprNodeGenericFuncDesc
                         && FunctionRegistry.isDeterministic(genericUDF)
                         && HiveParserExprNodeDescUtils.isAllConstants(children)) {
                     ExprNodeDesc constantExpr =
@@ -1248,11 +1248,36 @@ protected ExprNodeDesc getXpathOrFuncExprNodeDesc(
             if (FunctionRegistry.isOpPositive(desc)) {
                 assert (desc.getChildren().size() == 1);
                 desc = desc.getChildren().get(0);
+            } else if (getGenericUDFClassFromExprDesc(desc) == GenericUDFOPNegative.class) {
+                // UDFOPNegative should always be folded.
+                assert (desc.getChildren().size() == 1);
+                ExprNodeDesc input = desc.getChildren().get(0);
+                if (input instanceof ExprNodeConstantDesc) {
+                    ExprNodeDesc constantExpr = foldExpr(desc);
+                    if (constantExpr != null) {
+                        desc = constantExpr;
+                    }
+                }
             }
             assert (desc != null);
             return desc;
         }
 
+        private Class<? extends GenericUDF> getGenericUDFClassFromExprDesc(ExprNodeDesc desc) {
+            if (!(desc instanceof ExprNodeGenericFuncDesc)) {
+                return null;
+            }
+            ExprNodeGenericFuncDesc genericFuncDesc = (ExprNodeGenericFuncDesc) desc;
+            return genericFuncDesc.getGenericUDF().getClass();
+        }
+
+        private ExprNodeDesc foldExpr(ExprNodeDesc expr) {
+            if (expr instanceof ExprNodeGenericFuncDesc) {
+                return ConstantPropagateProcFactory.foldExpr((ExprNodeGenericFuncDesc) expr);
+            }
+            return expr;
+        }
+
         // try to create an ExprNodeDesc with a SqlOperator
         private ExprNodeDesc convertSqlOperator(
                 String funcText, List<ExprNodeDesc> children, HiveParserTypeCheckCtx ctx)

diff --git a/flink-connectors/flink-connector-hive/src/test/resources/query-test/udf.q b/flink-connectors/flink-connector-hive/src/test/resources/query-test/udf.q
@@ -0,0 +1,13 @@
+-- SORT_QUERY_RESULTS
+
+select bround(55.0, -1);
+
+[+I[60]]
+
+select round(123.45, -2);
+
+[+I[100]]
+
+select sha2('ABC', cast(null as int));
+
+[+I[null]]