[hive] branch master updated: HIVE-25586: Add Iceberg to list of allowed serdes for incompatible col type changes (Adam Szita, reviewed by Marton Bod)

[sz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

szita pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new af20893  HIVE-25586: Add Iceberg to list of allowed serdes for incompatible col type changes (Adam Szita, reviewed by Marton Bod)
af20893 is described below

commit af2089370130e0fc5c1c70600b2b45f91d12813e
Author: Adam Szita <40...@users.noreply.github.com>
AuthorDate: Mon Oct 4 10:27:32 2021 +0200

    HIVE-25586: Add Iceberg to list of allowed serdes for incompatible col type changes (Adam Szita, reviewed by Marton Bod)
---
 iceberg/iceberg-handler/src/test/queries/positive/llap_iceberg_read.q  | 3 ---
 .../main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/iceberg/iceberg-handler/src/test/queries/positive/llap_iceberg_read.q b/iceberg/iceberg-handler/src/test/queries/positive/llap_iceberg_read.q
index 9533f9d..3c10c1f 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/llap_iceberg_read.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/llap_iceberg_read.q
@@ -1,6 +1,3 @@
---makes no sense for iceberg tables for this to be 'true':
-set hive.metastore.disallow.incompatible.col.type.changes=false;
-
 --test against vectorized LLAP execution mode
 set hive.llap.io.enabled=true;
 set hive.vectorized.execution.enabled=true;
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
index c866008..8dfdcba 100644
--- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
+++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
@@ -698,7 +698,8 @@ public class MetastoreConf {
             "\n" +
             "See HIVE-4409 for more details."),
     ALLOW_INCOMPATIBLE_COL_TYPE_CHANGES_TABLE_SERDES("metastore.allow.incompatible.col.type.changes.serdes",
-        "hive.metastore.allow.incompatible.col.type.changes.serdes", "org.apache.hadoop.hive.kudu.KuduSerDe",
+        "hive.metastore.allow.incompatible.col.type.changes.serdes",
+        "org.apache.hadoop.hive.kudu.KuduSerDe,org.apache.iceberg.mr.hive.HiveIcebergSerDe",
         "Comma-separated list of table serdes which are allowed to make incompatible column type\n" +
         "changes. This configuration is only applicable if metastore.disallow.incompatible.col.type.changes\n" +
         "is true."),