update reserved properties

apache · Jun 24, 2020 · 78ff34f · 78ff34f
1 parent 1edc619
commit 78ff34f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
@@ -839,18 +839,24 @@ case class AlterTableSetLocationCommand(
 object DDLUtils {
   val HIVE_PROVIDER = "hive"
 
-  val METASTORE_GENERATED_PROPERTIES: Set[String] = Set(
+  val RESERVED_PROPERTIES: Set[String] =
+    // spark reserved properties
+    Set(
+    TableCatalog.PROP_COMMENT,
+    TableCatalog.PROP_LOCATION,
+    TableCatalog.PROP_OWNER,
+    TableCatalog.PROP_PROVIDER) ++
+    // hive reserved properties
+    Set(
     "CreateTime",
     "transient_lastDdlTime",
     "grantTime",
     "lastUpdateTime",
     "last_modified_by",
     "last_modified_time",
-    "Owner:",
     "totalNumberFiles",
     "maxFileSize",
-    "minFileSize"
-  )
+    "minFileSize")
 
   def isHiveTable(table: CatalogTable): Boolean = {
     isHiveTable(table.provider)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/tables.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/tables.scala
@@ -120,7 +120,7 @@ case class CreateTableLikeCommand(
       case MANAGED | EXTERNAL =>
         // Hive only retain the useful properties through serde class annotation.
         // For better compatible with Hive, we remove the metastore properties.
-        sourceTableDesc.properties -- DDLUtils.METASTORE_GENERATED_PROPERTIES ++ properties
+        sourceTableDesc.properties -- DDLUtils.RESERVED_PROPERTIES ++ properties
       case VIEW =>
         // For view, we just use new properties
         properties

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala
@@ -2727,7 +2727,7 @@ class HiveDDLSuite
 
   test("SPARK-31828: Filters out Hive metastore properties in CreateTableLikeCommand") {
     val catalog = spark.sessionState.catalog
-    DDLUtils.METASTORE_GENERATED_PROPERTIES.foreach { meta =>
+    DDLUtils.RESERVED_PROPERTIES.foreach { meta =>
       withTable("t1", "t2") {
         val uuid = UUID.randomUUID().toString
         sql(s"CREATE TABLE t1(c1 int) TBLPROPERTIES('$meta'='$uuid')")