[hotfix][table-planner] Deprecate SqlFunctions of old function stack

nicusX · Mar 23, 2022 · 3a2b8da · 3a2b8da
1 parent 24f0ac2
commit 3a2b8da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/...ner/src/main/scala/org/apache/flink/table/planner/functions/utils/ScalarSqlFunction.scala b/...ner/src/main/scala/org/apache/flink/table/planner/functions/utils/ScalarSqlFunction.scala
@@ -23,8 +23,7 @@ import org.apache.flink.table.functions.{BuiltInFunctionDefinitions, FunctionIde
 import org.apache.flink.table.planner.calcite.FlinkTypeFactory
 import org.apache.flink.table.planner.functions.bridging.BridgingSqlFunction
 import org.apache.flink.table.planner.functions.utils.ScalarSqlFunction._
-import org.apache.flink.table.planner.functions.utils.UserDefinedFunctionUtils.{getOperandType, _}
-import org.apache.flink.table.runtime.types.ClassLogicalTypeConverter.getDefaultExternalClassForType
+import org.apache.flink.table.planner.functions.utils.UserDefinedFunctionUtils._
 import org.apache.flink.table.runtime.types.LogicalTypeDataTypeConverter.fromDataTypeToLogicalType
 import org.apache.flink.table.runtime.types.TypeInfoLogicalTypeConverter.fromTypeInfoToLogicalType
 import org.apache.flink.table.types.logical.LogicalType
@@ -35,8 +34,6 @@ import org.apache.calcite.sql.`type`.SqlOperandTypeChecker.Consistency
 import org.apache.calcite.sql.`type`._
 import org.apache.calcite.sql.parser.SqlParserPos
 
-import scala.collection.JavaConverters._
-
 /**
   * Calcite wrapper for user-defined scalar functions.
   *

diff --git a/...ain/scala/org/apache/flink/table/planner/plan/schema/DeferredTypeFlinkTableFunction.scala b/...ain/scala/org/apache/flink/table/planner/plan/schema/DeferredTypeFlinkTableFunction.scala
@@ -19,7 +19,8 @@
 package org.apache.flink.table.planner.plan.schema
 
 import org.apache.flink.table.functions
-import org.apache.flink.table.functions.TableFunction
+import org.apache.flink.table.functions.{BuiltInFunctionDefinitions, TableFunction}
+import org.apache.flink.table.planner.functions.bridging.BridgingSqlFunction
 import org.apache.flink.table.planner.functions.utils.UserDefinedFunctionUtils
 import org.apache.flink.table.runtime.types.LogicalTypeDataTypeConverter.fromDataTypeToLogicalType
 import org.apache.flink.table.types.DataType
@@ -33,7 +34,10 @@ import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeFactory}
   *
   * @param tableFunction The Table Function instance
   * @param implicitResultType Implicit result type.
+  * @deprecated Use [[BuiltInFunctionDefinitions]] that translates to [[BridgingSqlFunction]].
   */
+@Deprecated
+@deprecated
 class DeferredTypeFlinkTableFunction(
     val tableFunction: TableFunction[_],
     val implicitResultType: DataType)

diff --git a/...r/src/main/scala/org/apache/flink/table/planner/plan/schema/TypedFlinkTableFunction.scala b/...r/src/main/scala/org/apache/flink/table/planner/plan/schema/TypedFlinkTableFunction.scala
@@ -19,8 +19,9 @@
 package org.apache.flink.table.planner.plan.schema
 
 import org.apache.flink.table.functions
-import org.apache.flink.table.functions.TableFunction
+import org.apache.flink.table.functions.{BuiltInFunctionDefinitions, TableFunction}
 import org.apache.flink.table.planner.calcite.FlinkTypeFactory
+import org.apache.flink.table.planner.functions.bridging.BridgingSqlFunction
 import org.apache.flink.table.runtime.types.TypeInfoDataTypeConverter.fromDataTypeToTypeInfo
 import org.apache.flink.table.runtime.types.TypeInfoLogicalTypeConverter.fromTypeInfoToLogicalType
 import org.apache.flink.table.types.DataType
@@ -34,7 +35,10 @@ import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeFactory}
   *
   * @param tableFunction The Table Function instance
   * @param externalResultType The result type which has been determined
+  * @deprecated Use [[BuiltInFunctionDefinitions]] that translates to [[BridgingSqlFunction]].
   */
+@Deprecated
+@deprecated
 class TypedFlinkTableFunction(
     val tableFunction: TableFunction[_],
     fieldNames: Array[String],