address comments

allisonwang-db · Dec 30, 2024 · 81cc535 · 81cc535
1 parent 69a9c0f
commit 81cc535
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/common/utils/src/main/resources/error/error-conditions.json b/common/utils/src/main/resources/error/error-conditions.json
@@ -5637,7 +5637,7 @@
       },
       "NOT_NULL_ON_FUNCTION_PARAMETERS" : {
         "message" : [
-          "Cannot specify NOT NULL on <languageName> function parameters: <input>"
+          "Cannot specify NOT NULL on function parameters: <input>"
         ]
       },
       "RETURN_COLUMN_COUNT_MISMATCH" : {

diff --git a/...lyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/UserDefinedFunctionErrors.scala b/...lyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/UserDefinedFunctionErrors.scala
@@ -46,11 +46,10 @@ object UserDefinedFunctionErrors extends QueryErrorsBase {
       messageParameters = Map("routineName" -> routineName, "columns" -> columns))
   }
 
-  def cannotSpecifyNotNullOnFunctionParameters(
-      language: RoutineLanguage, input: String): Throwable = {
+  def cannotSpecifyNotNullOnFunctionParameters(input: String): Throwable = {
     new AnalysisException(
       errorClass = "USER_DEFINED_FUNCTIONS.NOT_NULL_ON_FUNCTION_PARAMETERS",
-      messageParameters = Map("languageName" -> language.name, "input" -> input))
+      messageParameters = Map("input" -> input))
   }
 
   def bodyIsNotAQueryForSqlTableUdf(functionName: String): Throwable = {

diff --git a/...core/src/main/scala/org/apache/spark/sql/execution/command/CreateSQLFunctionCommand.scala b/...core/src/main/scala/org/apache/spark/sql/execution/command/CreateSQLFunctionCommand.scala
@@ -97,7 +97,7 @@ case class CreateSQLFunctionCommand(
       // Build function input.
       val inputPlan = if (inputParam.isDefined) {
         val param = inputParam.get
-        checkParameterNotNull(param, inputParamText.get, function.language)
+        checkParameterNotNull(param, inputParamText.get)
         checkParameterNameDuplication(param, conf, name)
         checkDefaultsTrailing(param, name)
 
@@ -209,7 +209,7 @@ case class CreateSQLFunctionCommand(
         }
 
         // Check the return columns cannot have NOT NULL specified.
-        checkParameterNotNull(returnParam, returnTypeText, function.language)
+        checkParameterNotNull(returnParam, returnTypeText)
 
         // Check duplicated return column names.
         checkReturnsColumnDuplication(returnParam, conf, name)

diff --git a/.../main/scala/org/apache/spark/sql/execution/command/CreateUserDefinedFunctionCommand.scala b/.../main/scala/org/apache/spark/sql/execution/command/CreateUserDefinedFunctionCommand.scala
@@ -177,10 +177,10 @@ object CreateUserDefinedFunctionCommand {
    * Perform this check on function input and return parameters while registering the function
    * to fail early. This check does not need to run the function itself.
    */
-  def checkParameterNotNull(param: StructType, input: String, language: RoutineLanguage): Unit = {
+  def checkParameterNotNull(param: StructType, input: String): Unit = {
     param.fields.foreach { field =>
       if (!field.nullable) {
-        throw UserDefinedFunctionErrors.cannotSpecifyNotNullOnFunctionParameters(language, input)
+        throw UserDefinedFunctionErrors.cannotSpecifyNotNullOnFunctionParameters(input)
       }
     }
   }