[hotfix][table-planner] Remove prefix for TypeCheckUtils methods

matriv · twalthr · commit 324c1c4e44e0 · 2021-10-20T10:04:16.000+02:00
Use consistently the methods of TypeCheckUtils without the prefix, since `TypeCheckUtils._` is anyway imported
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/calls/ScalarOperatorGens.scala
@@ -31,7 +31,6 @@ import org.apache.flink.table.runtime.functions.{SqlDateTimeUtils, SqlFunctionUt
 import org.apache.flink.table.runtime.types.LogicalTypeDataTypeConverter.fromLogicalTypeToDataType
 import org.apache.flink.table.runtime.types.PlannerTypeUtils
 import org.apache.flink.table.runtime.types.PlannerTypeUtils.{isInteroperable, isPrimitive}
-import org.apache.flink.table.runtime.typeutils.TypeCheckUtils
 import org.apache.flink.table.runtime.typeutils.TypeCheckUtils._
 import org.apache.flink.table.types.logical.LogicalTypeFamily.DATETIME
 import org.apache.flink.table.types.logical.LogicalTypeRoot._
@@ -996,7 +995,7 @@ object ScalarOperatorGens {
       operand.copy(resultType = targetType)
 
     // Date/Time/Timestamp -> String
-    case (_, VARCHAR | CHAR) if TypeCheckUtils.isTimePoint(operand.resultType) =>
+    case (_, VARCHAR | CHAR) if isTimePoint(operand.resultType) =>
       generateStringResultCallIfArgsNotNull(ctx, Seq(operand), targetType) {
         operandTerm =>
           s"${localTimeToStringCode(ctx, operand.resultType, operandTerm.head)}"
@@ -1085,7 +1084,7 @@ object ScalarOperatorGens {
 
     // String -> NUMERIC TYPE (not Character)
     case (VARCHAR | CHAR, _)
-      if TypeCheckUtils.isNumeric(targetType) =>
+      if isNumeric(targetType) =>
       targetType match {
         case dt: DecimalType =>
           generateUnaryOperatorIfNotNull(ctx, targetType, operand) { operandTerm =>
@@ -1180,7 +1179,7 @@ object ScalarOperatorGens {
       }
 
     // Boolean -> NUMERIC TYPE
-    case (BOOLEAN, _) if TypeCheckUtils.isNumeric(targetType) =>
+    case (BOOLEAN, _) if isNumeric(targetType) =>
       val targetTypeTerm = primitiveTypeTermForType(targetType)
       generateUnaryOperatorIfNotNull(ctx, targetType, operand) {
         operandTerm => s"($targetTypeTerm) ($operandTerm ? 1 : 0)"
@@ -1792,7 +1791,7 @@ object ScalarOperatorGens {
     val resultTypeTerm = boxedTypeTermForType(widerType.get)
 
     def castIfNumeric(t: GeneratedExpression): String = {
-      if (TypeCheckUtils.isNumeric(widerType.get)) {
+      if (isNumeric(widerType.get)) {
          s"${numericCasting(t.resultType, widerType.get).apply(t.resultTerm)}"
       } else {
          s"${t.resultTerm}"
