From 3736243fb32ae6d19fd5864e36aa0c3f6288b8bd Mon Sep 17 00:00:00 2001
From: Jian Xu <jian@uber.com>
Date: Thu, 18 Jan 2018 12:39:30 -0800
Subject: [PATCH] Rebases with latest upstream

---
 .../com/uber/hoodie/table/HoodieCopyOnWriteTable.java  |  6 +++---
 .../hoodie/TestHoodieClientOnCopyOnWriteStorage.java   | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieCopyOnWriteTable.java b/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieCopyOnWriteTable.java
index 4bcd1d292..f13336f0e 100644
--- a/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieCopyOnWriteTable.java
+++ b/hoodie-client/src/main/java/com/uber/hoodie/table/HoodieCopyOnWriteTable.java
@@ -591,7 +591,7 @@ public class HoodieCopyOnWriteTable<T extends HoodieRecordPayload> extends Hoodi
         .map(writeStatus -> {
           Tuple2<String, HoodieWriteStat> writeStatTuple2 = (Tuple2<String, HoodieWriteStat>) writeStatus;
           HoodieWriteStat writeStat = writeStatTuple2._2();
-          final FileSystem fs = FSUtils.getFs();
+          final FileSystem fs = getMetaClient().getFs();
           final Path finalPath = new Path(config.getBasePath(), writeStat.getPath());
 
           if (writeStat.getTempPath() != null) {
@@ -623,7 +623,7 @@ public class HoodieCopyOnWriteTable<T extends HoodieRecordPayload> extends Hoodi
       return;
     }
 
-    final FileSystem fs = FSUtils.getFs();
+    final FileSystem fs = getMetaClient().getFs();
     final Path temporaryFolder = new Path(config.getBasePath(),
         HoodieTableMetaClient.TEMPFOLDER_NAME);
     try {
@@ -635,7 +635,7 @@ public class HoodieCopyOnWriteTable<T extends HoodieRecordPayload> extends Hoodi
       List<Tuple2<String, Boolean>> results = jsc
           .parallelize(fileStatusesList, config.getFinalizeWriteParallelism())
           .map(fileStatus -> {
-            FileSystem fs1 = FSUtils.getFs();
+            FileSystem fs1 = getMetaClient().getFs();
             boolean success = fs1.delete(fileStatus.getPath(), false);
             logger.info("Deleting file in temporary folder" + fileStatus.getPath() + "\t"
                 + success);
diff --git a/hoodie-client/src/test/java/com/uber/hoodie/TestHoodieClientOnCopyOnWriteStorage.java b/hoodie-client/src/test/java/com/uber/hoodie/TestHoodieClientOnCopyOnWriteStorage.java
index a1822bdfc..4c158e27d 100644
--- a/hoodie-client/src/test/java/com/uber/hoodie/TestHoodieClientOnCopyOnWriteStorage.java
+++ b/hoodie-client/src/test/java/com/uber/hoodie/TestHoodieClientOnCopyOnWriteStorage.java
@@ -310,7 +310,6 @@ public class TestHoodieClientOnCopyOnWriteStorage implements Serializable {
         .build();
     HoodieWriteClient client = new HoodieWriteClient(jsc, cfg);
     HoodieIndex index = HoodieIndex.createIndex(cfg, jsc);
-    FileSystem fs = FSUtils.getFs();
 
     /**
      * Write 1 (only inserts)
@@ -328,9 +327,8 @@ public class TestHoodieClientOnCopyOnWriteStorage implements Serializable {
     assertPartitionMetadata(HoodieTestDataGenerator.DEFAULT_PARTITION_PATHS, fs);
 
     // verify that there is a commit
-    HoodieTableMetaClient metaClient = new HoodieTableMetaClient(fs, basePath);
-    HoodieTimeline timeline = new HoodieActiveTimeline(fs, metaClient.getMetaPath())
-        .getCommitTimeline();
+    HoodieTableMetaClient metaClient = new HoodieTableMetaClient(jsc.hadoopConfiguration(), basePath);
+    HoodieTimeline timeline = new HoodieActiveTimeline(metaClient).getCommitTimeline();
 
     assertEquals("Expecting a single commit.", 1,
         timeline.findInstantsAfter("000", Integer.MAX_VALUE).countInstants());
@@ -366,13 +364,13 @@ public class TestHoodieClientOnCopyOnWriteStorage implements Serializable {
     assertNoWriteErrors(statuses);
 
     // verify there are now 2 commits
-    timeline = new HoodieActiveTimeline(fs, metaClient.getMetaPath()).getCommitTimeline();
+    timeline = new HoodieActiveTimeline(metaClient).getCommitTimeline();
     assertEquals("Expecting two commits.",
         timeline.findInstantsAfter("000", Integer.MAX_VALUE).countInstants(), 2);
     assertEquals("Latest commit should be 004", timeline.lastInstant().get().getTimestamp(),
         newCommitTime);
 
-    metaClient = new HoodieTableMetaClient(fs, basePath);
+    metaClient = new HoodieTableMetaClient(jsc.hadoopConfiguration(), basePath);
     table = HoodieTable.getHoodieTable(metaClient, getConfig());
 
     // Index should be able to locate all updates in correct locations.