You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2018/03/22 10:37:48 UTC
hive git commit: HIVE-18898: Fix NPEs in HiveMetastore.dropPartition
method (Marta Kuczora, reviewed by Sahil Takiar,
Alexander Kolbasov and Peter Vary)
Repository: hive
Updated Branches:
refs/heads/master 901a3b3fb -> 80aaa1e65
HIVE-18898: Fix NPEs in HiveMetastore.dropPartition method (Marta Kuczora, reviewed by Sahil Takiar, Alexander Kolbasov and Peter Vary)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/80aaa1e6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/80aaa1e6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/80aaa1e6
Branch: refs/heads/master
Commit: 80aaa1e65894400d16df608e48bf838238152ec8
Parents: 901a3b3
Author: Peter Vary <pv...@cloudera.com>
Authored: Thu Mar 22 11:36:27 2018 +0100
Committer: Peter Vary <pv...@cloudera.com>
Committed: Thu Mar 22 11:36:27 2018 +0100
----------------------------------------------------------------------
.../apache/hadoop/hive/metastore/HiveMetaStore.java | 10 ++++++++++
.../hadoop/hive/metastore/HiveMetaStoreClient.java | 10 ++++++++++
.../hive/metastore/client/TestDropPartitions.java | 16 +++++++---------
3 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/80aaa1e6/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
----------------------------------------------------------------------
diff --git 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
index 3a0e760..84fac2d 100644
--- 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
@@ -3555,6 +3555,16 @@ public class HiveMetaStore extends ThriftHiveMetastore {
boolean isExternalTbl = false;
Map<String, String> transactionalListenerResponses = Collections.emptyMap();
+ if (db_name == null) {
+ throw new MetaException("The DB name cannot be null.");
+ }
+ if (tbl_name == null) {
+ throw new MetaException("The table name cannot be null.");
+ }
+ if (part_vals == null) {
+ throw new MetaException("The partition values cannot be null.");
+ }
+
try {
ms.openTransaction();
part = ms.getPartition(db_name, tbl_name, part_vals);
http://git-wip-us.apache.org/repos/asf/hive/blob/80aaa1e6/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index 1755700b..0e561f8 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -993,6 +993,9 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable {
@Override
public boolean dropPartition(String db_name, String tbl_name,
List<String> part_vals, PartitionDropOptions options) throws TException {
+ if (options == null) {
+ options = PartitionDropOptions.instance();
+ }
return dropPartition(db_name, tbl_name, part_vals, options.deleteData,
options.purgeData? getEnvironmentContextWithIfPurgeSet() : null);
}
@@ -1000,6 +1003,13 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable {
public boolean dropPartition(String db_name, String tbl_name, List<String> part_vals,
boolean deleteData, EnvironmentContext envContext) throws NoSuchObjectException,
MetaException, TException {
+ if (part_vals != null) {
+ for (String partVal : part_vals) {
+ if (partVal == null) {
+ throw new MetaException("The partition value must not be null.");
+ }
+ }
+ }
return client.drop_partition_with_environment_context(db_name, tbl_name, part_vals, deleteData,
envContext);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/80aaa1e6/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java b/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java
index 4d94ebf..d2ba4be 100644
--- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java
+++ b/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java
@@ -264,18 +264,13 @@ public class TestDropPartitions extends MetaStoreClientTest {
client.dropPartition(DB_NAME, TABLE_NAME, Lists.newArrayList("2017", "may"), false);
}
- @Test
+ @Test(expected = MetaException.class)
public void testDropPartitionNullVal() throws Exception {
List<String> partVals = new ArrayList<>();
partVals.add(null);
partVals.add(null);
- try {
- client.dropPartition(DB_NAME, TABLE_NAME, partVals, false);
- Assert.fail("NullPointerException or NoSuchObjectException is expected to be thrown");
- } catch (NullPointerException | NoSuchObjectException e) {
- // TODO: Should not throw NPE.
- }
+ client.dropPartition(DB_NAME, TABLE_NAME, partVals, false);
}
@Test(expected = NoSuchObjectException.class)
@@ -400,10 +395,13 @@ public class TestDropPartitions extends MetaStoreClientTest {
checkPartitionsAfterDelete(tableName, droppedPartitions, remainingPartitions, true, true);
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testDropPartitionNullPartDropOptions() throws Exception {
- // TODO: This should not throw NPE
+
client.dropPartition(DB_NAME, TABLE_NAME, PARTITIONS[0].getValues(), null);
+ List<Partition> droppedPartitions = Lists.newArrayList(PARTITIONS[0]);
+ List<Partition> remainingPartitions = Lists.newArrayList(PARTITIONS[1], PARTITIONS[2]);
+ checkPartitionsAfterDelete(TABLE_NAME, droppedPartitions, remainingPartitions, true, false);
}
// Tests for dropPartition(String db_name, String tbl_name, String name,