Added COMPLEX_EXPRESSION_UNSUPPORTED_INPUT.BAD_INPUTS. Tests pass.

apache · Sep 29, 2024 · afd123b · afd123b
1 parent 37efd0c
commit afd123b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/common/utils/src/main/resources/error/error-conditions.json b/common/utils/src/main/resources/error/error-conditions.json
@@ -634,6 +634,11 @@
         "message" : [
           "The collection of input data types must not be empty."
         ]
+      },
+      "BAD_INPUTS" : {
+        "message" : [
+          "The input data types to <functionName> must be valid, but found the input types <dataType>."
+        ]
       }
     },
     "sqlState" : "42K09"

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Mode.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Mode.scala
@@ -21,6 +21,7 @@ import org.apache.spark.SparkIllegalArgumentException
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.analysis.{ExpressionBuilder, TypeCheckResult, UnresolvedWithinGroup}
 import org.apache.spark.sql.catalyst.expressions.{Ascending, Descending, Expression, ExpressionDescription, ImplicitCastInputTypes, SortOrder}
+import org.apache.spark.sql.catalyst.expressions.Cast.toSQLExpr
 import org.apache.spark.sql.catalyst.trees.UnaryLike
 import org.apache.spark.sql.catalyst.types.PhysicalDataType
 import org.apache.spark.sql.catalyst.util.{ArrayData, CollationFactory, GenericArrayData, UnsafeRowUtils}
@@ -118,8 +119,9 @@ case class Mode(
         CollationFactory.getCollationKey(data.asInstanceOf[UTF8String], st.collationId)
       case _ =>
         throw new SparkIllegalArgumentException(
-          errorClass = "COMPLEX_EXPRESSION_UNSUPPORTED_INPUT.NO_INPUT",
+          errorClass = "COMPLEX_EXPRESSION_UNSUPPORTED_INPUT.BAD_INPUTS",
           messageParameters = Map(
+            "expression" -> toSQLExpr(this),
             "functionName" -> toSQLType(prettyName),
             "dataType" -> toSQLType(child.dataType))
         )

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala
@@ -1957,7 +1957,7 @@ class CollationSQLExpressionsSuite
       ModeTestCase("unicode_ci", Map("a" -> 3L, "b" -> 2L, "B" -> 2L), "b")
     ).foreach { t1 =>
         checkError(
-          exception = intercept[SparkException] {
+          exception = intercept[SparkIllegalArgumentException] {
           Mode(
               child = Literal.create(null,
                 MapType(StringType(t1.collationId), IntegerType))
@@ -1966,10 +1966,11 @@ class CollationSQLExpressionsSuite
               dataType = MapType(StringType(t1.collationId), IntegerType)
             )
           },
-          condition = "INTERNAL_ERROR",
-          parameters = Map("message" ->
-            "Cannot find sub error class 'COMPLEX_EXPRESSION_UNSUPPORTED_INPUT.NO_INPUT'")
-            // Map("function" -> "mode(i)", "dataType" -> "MAP<STRING, INT>")
+          condition = "COMPLEX_EXPRESSION_UNSUPPORTED_INPUT.BAD_INPUTS",
+          parameters = Map(
+            "expression" -> "\"mode(NULL)\"",
+            "functionName" -> "\"MODE\"",
+            "dataType" -> s"\"MAP<STRING COLLATE ${t1.collationId.toUpperCase()}, INT>\"")
          )
       }
   }