[hive] branch master updated: HIVE-23240 : loadDynamicPartition complains about static partitions even when they are provided in the description (Reza Safi via Ashutosh Chauhan)

[hashutosh]

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

hashutosh 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 d3ee2ae  HIVE-23240 : loadDynamicPartition complains about static 
partitions even when they are provided in the description (Reza Safi via 
Ashutosh Chauhan)
d3ee2ae is described below

commit d3ee2ae414686de90f13e5db1d857ec51e783bad
Author: Ashutosh Chauhan <hashut...@apache.org>
AuthorDate: Sun May 3 00:55:38 2020 -0700

    HIVE-23240 : loadDynamicPartition complains about static partitions even 
when they are provided in the description (Reza Safi via Ashutosh Chauhan)
    
    Signed-off-by: Ashutosh Chauhan <hashut...@apache.org>
---
 ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java 
b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
index 7bb90d3..bd1fae1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -2879,7 +2879,12 @@ private void constructOneLBLocationMap(FileStatus fSta,
     // calculate full path spec for each valid partition path
     validPartitions.forEach(partPath -> {
       Map<String, String> fullPartSpec = Maps.newLinkedHashMap(partSpec);
-      if (!Warehouse.makeSpecFromName(fullPartSpec, partPath, new 
HashSet<>(partSpec.keySet()))) {
+      String staticParts =  Warehouse.makeDynamicPartName(partSpec);
+      Path computedPath = partPath;
+      if (!staticParts.isEmpty() ) {
+        computedPath = new Path(new Path(partPath.getParent(), staticParts), 
partPath.getName());
+      }
+      if (!Warehouse.makeSpecFromName(fullPartSpec, computedPath, new 
HashSet<>(partSpec.keySet()))) {
         Utilities.FILE_OP_LOGGER.warn("Ignoring invalid DP directory " + 
partPath);
       } else {
         PartitionDetails details = new PartitionDetails();