HIVE-19416 : merge master into branch (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4cc7819d Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4cc7819d Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4cc7819d Branch: refs/heads/master-txnstats Commit: 4cc7819d77dc32ac44f857b8ed742439da68c56f Parents: 648ab64 6a8f4cb Author: sergey <[email protected]> Authored: Wed Jun 27 19:08:22 2018 -0700 Committer: sergey <[email protected]> Committed: Wed Jun 27 19:08:22 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/conf/HiveConf.java | 6 + .../test/resources/testconfiguration.properties | 1 + .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 8 + .../clientpositive/external_table_purge.q | 165 +++++ .../llap/external_table_purge.q.out | 635 +++++++++++++++++++ .../hadoop/hive/metastore/HiveMetaStore.java | 33 +- .../hive/metastore/utils/MetaStoreUtils.java | 8 +- 7 files changed, 845 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4cc7819d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- diff --cc standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 706d831,35c0f5c..fb15cda --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@@ -4110,8 -4105,8 +4123,8 @@@ public class HiveMetaStore extends Thri try { ms.openTransaction(); part = ms.getPartition(catName, db_name, tbl_name, part_vals); - tbl = get_table_core(catName, db_name, tbl_name); + tbl = get_table_core(catName, db_name, tbl_name, -1, null); - isExternalTbl = isExternal(tbl); + tableDataShouldBeDeleted = checkTableDataShouldBeDeleted(tbl, deleteData); firePreEvent(new PreDropPartitionEvent(tbl, part, deleteData, this)); mustPurge = isMustPurge(envContext, tbl);
