[hive] branch master updated: HIVE-22972 Allow table id to be set for table creation requests (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)

[mg...@apache.org]

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

mgergely 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 f148293  HIVE-22972 Allow table id to be set for table creation requests (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)
f148293 is described below

commit f148293e58d397b31676bc1dae8792f49b8fc3cb
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Wed Mar 4 07:26:30 2020 +0100

    HIVE-22972 Allow table id to be set for table creation requests (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)
---
 .../java/org/apache/hadoop/hive/metastore/HiveMetaStore.java     | 6 +++---
 .../java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index 662a098..de3c44b 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -2040,9 +2040,9 @@ public class HiveMetaStore extends ThriftHiveMetastore {
         }
       }
       if (tbl.isSetId()) {
-        throw new InvalidObjectException("Id shouldn't be set but table "
-            + tbl.getDbName() + "." + tbl.getTableName() + " has the Id set to "
-            + tbl.getId() + ". It's a read-only option");
+        LOG.debug("Id shouldn't be set but table {}.{} has the Id set to {}. Id is ignored.", tbl.getDbName(),
+            tbl.getTableName(), tbl.getId());
+        tbl.unsetId();
       }
       SkewedInfo skew = tbl.getSd().getSkewedInfo();
       if (skew != null) {
diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
index 40a4ef6..5f85165 100644
--- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
+++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
@@ -1850,14 +1850,7 @@ public abstract class TestHiveMetaStore {
         .addCol("bar", "string")
         .build(conf);
     table.setId(1);
-    try {
-      client.createTable(table);
-      Assert.fail("An error should happen when setting the id"
-          + " to create a table");
-    } catch (InvalidObjectException e) {
-      Assert.assertTrue(e.getMessage().contains("Id shouldn't be set"));
-      Assert.assertTrue(e.getMessage().contains(tblName));
-    }
+    client.createTable(table);
   }
 
   @Test