From e3359efe7ade02615de6c8215625715b4462fbda Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Thu, 12 May 2022 16:42:30 +0800
Subject: [PATCH] Revert "HBASE-27021 StoreFileInfo should set its initialPath
 in a consistent way (#4419)"

Revert due to failure spotless:check

This reverts commit aa31b0f695ab02015a7a183aaf10ac9963a22ddb.
---
 .../hadoop/hbase/regionserver/StoreFileInfo.java  |  2 +-
 .../hadoop/hbase/regionserver/TestHStore.java     | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
index 7a65d0e6ea2..8bd2ffcb873 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
@@ -139,7 +139,7 @@ public class StoreFileInfo implements Configurable {
 
     this.fs = fs;
     this.conf = conf;
-    this.initialPath = fs.makeQualified(initialPath);
+    this.initialPath = initialPath;
     this.primaryReplica = primaryReplica;
     this.noReadahead =
       this.conf.getBoolean(STORE_FILE_READER_NO_READAHEAD, DEFAULT_STORE_FILE_READER_NO_READAHEAD);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 5f817bdb414..e9f87353bc7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -941,16 +941,13 @@ public class TestHStore {
   private void closeCompactedFile(int index) throws IOException {
     Collection<HStoreFile> files =
       this.store.getStoreEngine().getStoreFileManager().getCompactedfiles();
-    if (files.size() > 0) {
-      HStoreFile sf = null;
-      Iterator<HStoreFile> it = files.iterator();
-      for (int i = 0; i <= index; i++) {
-        sf = it.next();
-      }
-      sf.closeStoreFile(true);
-      store.getStoreEngine().getStoreFileManager().
-        removeCompactedFiles(Collections.singletonList(sf));
+    HStoreFile sf = null;
+    Iterator<HStoreFile> it = files.iterator();
+    for (int i = 0; i <= index; i++) {
+      sf = it.next();
     }
+    sf.closeStoreFile(true);
+    store.getStoreEngine().getStoreFileManager().removeCompactedFiles(Lists.newArrayList(sf));
   }
 
   @Test