update

common/utils/src/main/resources/error/error-conditions.json

@@ -4411,11 +4411,6 @@
           "<functionName> with AES-<mode> does not support initialization vectors (IVs)."
         ]
       },
-      "ALTER_NAMESPACE_PROPERTY" : {
-        "message" : [
-          "<property> is a reserved namespace property, <msg>."
-        ]
-      },
       "ANALYZE_UNCACHED_TEMP_VIEW" : {
         "message" : [
           "The ANALYZE TABLE FOR COLUMNS command can operate on temporary views that have been cached already. Consider to cache the view <viewName>."
@@ -4581,6 +4576,11 @@
           "The replace function does not support nested column <colName>."
         ]
       },
+      "SET_NAMESPACE_PROPERTY" : {
+        "message" : [
+          "<property> is a reserved namespace property, <msg>."
+        ]
+      },
       "SET_OPERATION_ON_MAP_TYPE" : {
         "message" : [
           "Cannot have MAP type columns in DataFrame which calls set operations (INTERSECT, EXCEPT, etc.), but the type of column <colName> is <dataType>."

sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala

@@ -339,7 +339,7 @@ private[sql] object QueryParsingErrors extends DataTypeErrorsBase {
   def cannotCleanReservedNamespacePropertyError(
       property: String, ctx: ParserRuleContext, msg: String): Throwable = {
     new ParseException(
-      errorClass = "UNSUPPORTED_FEATURE.ALTER_NAMESPACE_PROPERTY",
+      errorClass = "UNSUPPORTED_FEATURE.SET_NAMESPACE_PROPERTY",
       messageParameters = Map("property" -> property, "msg" -> msg),
       ctx)
   }

sql/core/src/main/scala/org/apache/spark/sql/execution/command/UnsetNamespacePropertiesCommand.scala

@@ -25,11 +25,12 @@ import org.apache.spark.sql.connector.catalog.NamespaceChange
 import org.apache.spark.sql.errors.QueryCompilationErrors
 
 /**
- * A command that ALTER NAMESPACE UNSET PROPERTIES command.
+ * A command that unsets database/schema/namespace properties.
  *
  * The syntax of this command is:
  * {{{
- *     ALTER (DATABASE|SCHEMA|NAMESPACE) ... UNSET (DBPROPERTIES|PROPERTIES) [IF EXISTS] ...;
+ *    ALTER (DATABASE|SCHEMA|NAMESPACE) ...
+ *      UNSET (DBPROPERTIES|PROPERTIES) [IF EXISTS] ('key1', 'key2', ...);
  * }}}
  */
 case class UnsetNamespacePropertiesCommand(

sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala

@@ -562,7 +562,7 @@ class QueryParsingErrorsSuite extends QueryTest with SharedSparkSession with SQL
     val sqlText = "CREATE NAMESPACE IF NOT EXISTS a.b.c WITH PROPERTIES ('location'='/home/user/db')"
     checkError(
       exception = parseException(sqlText),
-      errorClass = "UNSUPPORTED_FEATURE.ALTER_NAMESPACE_PROPERTY",
+      errorClass = "UNSUPPORTED_FEATURE.SET_NAMESPACE_PROPERTY",
       sqlState = "0A000",
       parameters = Map(
         "property" -> "location",

sql/core/src/test/scala/org/apache/spark/sql/execution/command/AlterNamespaceSetPropertiesSuiteBase.scala

@@ -88,7 +88,7 @@ trait AlterNamespaceSetPropertiesSuiteBase extends QueryTest with DDLCommandTest
             exception = intercept[ParseException] {
               sql(sqlText)
             },
-            errorClass = "UNSUPPORTED_FEATURE.ALTER_NAMESPACE_PROPERTY",
+            errorClass = "UNSUPPORTED_FEATURE.SET_NAMESPACE_PROPERTY",
             parameters = Map("property" -> key, "msg" -> ".*"),
             sqlState = None,
             context = ExpectedContext(

sql/core/src/test/scala/org/apache/spark/sql/execution/command/AlterNamespaceUnsetPropertiesSuiteBase.scala

@@ -71,6 +71,7 @@ trait AlterNamespaceUnsetPropertiesSuiteBase extends QueryTest with DDLCommandTe
       sql(s"ALTER NAMESPACE $ns UNSET PROPERTIES ('b')")
       assert(getProperties(ns) === "((a,a), (c,c))")
 
+      // unset non-existent properties
       checkError(
         exception = intercept[AnalysisException] {
           sql(s"ALTER NAMESPACE $ns UNSET PROPERTIES ('b')")
@@ -94,7 +95,7 @@ trait AlterNamespaceUnsetPropertiesSuiteBase extends QueryTest with DDLCommandTe
             exception = intercept[ParseException] {
               sql(sqlText)
             },
-            errorClass = "UNSUPPORTED_FEATURE.ALTER_NAMESPACE_PROPERTY",
+            errorClass = "UNSUPPORTED_FEATURE.SET_NAMESPACE_PROPERTY",
             parameters = Map("property" -> key, "msg" -> ".*"),
             sqlState = None,
             context = ExpectedContext(