[hudi] branch rfc-15 updated: [RFC-15] Fix partition key in metadata table when bootstrapping from file system (#2387)

[vinoth]

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

vinoth pushed a commit to branch rfc-15
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/rfc-15 by this push:
     new 4a4a291  [RFC-15] Fix partition key in metadata table when 
bootstrapping from file system (#2387)
4a4a291 is described below

commit 4a4a291ef7e50ecf1f70fba4125753570be8f125
Author: rmpifer <rmpi...@umich.edu>
AuthorDate: Mon Dec 28 14:46:03 2020 -0800

    [RFC-15] Fix partition key in metadata table when bootstrapping from file 
system (#2387)
    
    Co-authored-by: Ryan Pifer <ryanp...@amazon.com>
---
 .../java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java | 3 ++-
 .../test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
 
b/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
index c3ba2a9..fa67766 100644
--- 
a/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
+++ 
b/hudi-client/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java
@@ -374,7 +374,8 @@ public class HoodieBackedTableMetadataWriter implements 
HoodieTableMetadataWrite
 
         if (p.getRight().length > filesInDir.size()) {
           // Is a partition. Add all data files to result.
-          partitionToFileStatus.put(p.getLeft().getName(), filesInDir);
+          String partitionName = FSUtils.getRelativePartitionPath(new 
Path(datasetMetaClient.getBasePath()), p.getLeft());
+          partitionToFileStatus.put(partitionName, filesInDir);
         } else {
           // Add sub-dirs to the queue
           pathsToList.addAll(Arrays.stream(p.getRight())
diff --git 
a/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java
 
b/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java
index 48d07e5..1bb1081 100644
--- 
a/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java
+++ 
b/hudi-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java
@@ -73,7 +73,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
 public class TestHoodieBackedMetadata extends HoodieClientTestHarness {
@@ -406,6 +405,7 @@ public class TestHoodieBackedMetadata extends 
HoodieClientTestHarness {
   //@ParameterizedTest
   //@EnumSource(HoodieTableType.class)
   //public void testSync(HoodieTableType tableType) throws Exception {
+  @Test
   public void testSync() throws Exception {
     //FIXME(metadata): This is broken for MOR, until HUDI-1434 is fixed
     init(HoodieTableType.COPY_ON_WRITE);