This is an automated email from the ASF dual-hosted git repository. twalthr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 3a2b8da7d9a114e09268f365d5e8796dfcbf8d17 Author: Timo Walther <[email protected]> AuthorDate: Fri Mar 18 10:30:29 2022 +0100 [hotfix][table-planner] Deprecate SqlFunctions of old function stack --- .../flink/table/planner/functions/utils/ScalarSqlFunction.scala | 5 +---- .../table/planner/plan/schema/DeferredTypeFlinkTableFunction.scala | 6 +++++- .../flink/table/planner/plan/schema/TypedFlinkTableFunction.scala | 6 +++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/functions/utils/ScalarSqlFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/functions/utils/ScalarSqlFunction.scala index 380484b..cd0b87e 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/functions/utils/ScalarSqlFunction.scala +++ b/flink-table/flink-table-planner/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/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/DeferredTypeFlinkTableFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/DeferredTypeFlinkTableFunction.scala index 79b278c..e7c6a1d 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/DeferredTypeFlinkTableFunction.scala +++ b/flink-table/flink-table-planner/src/main/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/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/TypedFlinkTableFunction.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/TypedFlinkTableFunction.scala index 5b8e5af..eba0ff4 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/schema/TypedFlinkTableFunction.scala +++ b/flink-table/flink-table-planner/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],
