Writes relative paths to .commit files instead of absolute paths

Clean up code

Removed commented out code

Fixed merge conflict with master

hoodie-common/src/main/java/com/uber/hoodie/common/model/HoodieCommitMetadata.java

@@ -19,6 +19,7 @@ package com.uber.hoodie.common.model;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import org.apache.hadoop.fs.Path;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -72,17 +73,25 @@ public class HoodieCommitMetadata implements Serializable {
         return extraMetadataMap.get(metaKey);
     }
 
-    public HashMap<String, String> getFileIdAndFullPaths() {
+    public HashMap<String, String> getFileIdAndRelativePaths() {
         HashMap<String, String> filePaths = new HashMap<>();
         // list all partitions paths
         for (Map.Entry<String, List<HoodieWriteStat>> entry: getPartitionToWriteStats().entrySet()) {
             for (HoodieWriteStat stat: entry.getValue()) {
-                filePaths.put(stat.getFileId(), stat.getFullPath());
+                filePaths.put(stat.getFileId(), stat.getPath());
             }
         }
         return filePaths;
     }
 
+    public HashMap<String, String> getFileIdAndFullPaths(String basePath) {
+        HashMap<String, String> fullPaths = new HashMap<>();
+        HashMap<String, String> relativePaths = getFileIdAndRelativePaths();
+        for (Map.Entry<String, String> entry: relativePaths.entrySet()) {
+            Path fullPath = new Path(basePath, entry.getValue());
+            fullPaths.put(entry.getKey(), fullPath.toString());
+        } return fullPaths;
+    }
 
     public String toJsonString() throws IOException {
         if(partitionToWriteStats.containsKey(null)) {

hoodie-common/src/main/java/com/uber/hoodie/common/model/HoodieWriteStat.java

@@ -35,9 +35,9 @@ public class HoodieWriteStat implements Serializable {
     private String fileId;
 
     /**
-     * Full path to the file on underlying file system
+     * Relative path to the file from the base path
      */
-    private String fullPath;
+    private String path;
 
     /**
      * The previous version of the file. (null if this is the first version. i.e insert)
@@ -79,9 +79,7 @@ public class HoodieWriteStat implements Serializable {
         this.fileId = fileId;
     }
 
-    public void setFullPath(String fullFilePath) {
-        this.fullPath = fullFilePath;
-    }
+    public void setPath(String path) { this.path = path; }
 
     public void setPrevCommit(String prevCommit) {
         this.prevCommit = prevCommit;
@@ -131,15 +129,14 @@ public class HoodieWriteStat implements Serializable {
         return fileId;
     }
 
-    public String getFullPath() {
-        return fullPath;
-    }
+    public String getPath() { return path; }
+
 
     @Override
     public String toString() {
         return new StringBuilder()
                 .append("HoodieWriteStat {")
-                .append("fullPath='" + fullPath + '\'')
+                .append("path=" + path)
                 .append(", prevCommit='" + prevCommit + '\'')
                 .append(", numWrites=" + numWrites)
                 .append(", numDeletes=" + numDeletes)
@@ -157,7 +154,7 @@ public class HoodieWriteStat implements Serializable {
             return false;
 
         HoodieWriteStat that = (HoodieWriteStat) o;
-        if (!fullPath.equals(that.fullPath))
+        if (!path.equals(that.path))
             return false;
         return prevCommit.equals(that.prevCommit);
 
@@ -165,7 +162,7 @@ public class HoodieWriteStat implements Serializable {
 
     @Override
     public int hashCode() {
-        int result = fullPath.hashCode();
+        int result = path.hashCode();
         result = 31 * result + prevCommit.hashCode();
         return result;
     }

hoodie-common/src/test/java/com/uber/hoodie/common/model/HoodieTestUtils.java

@@ -116,6 +116,10 @@ public class HoodieTestUtils {
         return basePath + "/" + partitionPath + "/" + FSUtils.makeDataFileName(commitTime, DEFAULT_TASK_PARTITIONID, fileID);
     }
 
+    public static final String getCommitFilePath(String basePath, String commitTime) throws IOException {
+        return basePath + "/" + HoodieTableMetaClient.METAFOLDER_NAME + "/" + commitTime + HoodieTimeline.COMMIT_EXTENSION;
+    }
+
     public static final boolean doesDataFileExist(String basePath, String partitionPath, String commitTime, String fileID) throws IOException {
         return new File(getDataFilePath(basePath, partitionPath, commitTime, fileID)).exists();
     }