HBASE-26386 Refactor StoreFileTracker implementations to expose the s…

…et method (#3774) Signed-off-by: Wellington Chevreuil <[email protected]>
apache · Dec 22, 2021 · e4e7cf8 · e4e7cf8
1 parent 06db852
commit e4e7cf8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/...n/java/org/apache/hadoop/hbase/regionserver/storefiletracker/DefaultStoreFileTracker.java b/...n/java/org/apache/hadoop/hbase/regionserver/storefiletracker/DefaultStoreFileTracker.java
@@ -62,7 +62,7 @@ protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
   }
 
   @Override
-  void set(List<StoreFileInfo> files) {
+  public void set(List<StoreFileInfo> files) {
     // NOOP
   }
 }
diff --git a/...java/org/apache/hadoop/hbase/regionserver/storefiletracker/FileBasedStoreFileTracker.java b/...java/org/apache/hadoop/hbase/regionserver/storefiletracker/FileBasedStoreFileTracker.java
@@ -148,7 +148,7 @@ protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
   }
 
   @Override
-  void set(List<StoreFileInfo> files) throws IOException {
+  public void set(List<StoreFileInfo> files) throws IOException {
     synchronized (storefiles) {
       storefiles.clear();
       StoreFileList.Builder builder = StoreFileList.newBuilder();

diff --git a/...java/org/apache/hadoop/hbase/regionserver/storefiletracker/MigrationStoreFileTracker.java b/...java/org/apache/hadoop/hbase/regionserver/storefiletracker/MigrationStoreFileTracker.java
@@ -21,9 +21,6 @@
 import java.util.Collection;
 import java.util.List;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.apache.hadoop.hbase.procedure2.util.StringUtils;
 import org.apache.hadoop.hbase.regionserver.StoreContext;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
 import org.apache.yetus.audience.InterfaceAudience;
@@ -84,7 +81,7 @@ protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
   }
 
   @Override
-  void set(List<StoreFileInfo> files) {
+  public void set(List<StoreFileInfo> files) {
     throw new UnsupportedOperationException(
       "Should not call this method on " + getClass().getSimpleName());
   }

diff --git a/...src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTracker.java b/...src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTracker.java
@@ -20,8 +20,6 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
-
-import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.regionserver.CreateStoreFileWriterParams;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
@@ -69,6 +67,11 @@ public interface StoreFileTracker {
   void replace(Collection<StoreFileInfo> compactedFiles, Collection<StoreFileInfo> newFiles)
     throws IOException;
 
+  /**
+   * Set the store files.
+   */
+  void set(List<StoreFileInfo> files) throws IOException;
+
   /**
    * Create a writer for writing new store files.
    * @return Writer for a new StoreFile

diff --git a/...main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerBase.java b/...main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerBase.java
@@ -21,11 +21,9 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.List;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.io.compress.Compression;
 import org.apache.hadoop.hbase.io.crypto.Encryption;
@@ -184,12 +182,4 @@ public final StoreFileWriter createWriter(CreateStoreFileWriterParams params) th
 
   protected abstract void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
     Collection<StoreFileInfo> newFiles) throws IOException;
-
-  /**
-   * used to mirror the store file list after loading when migration.
-   * <p/>
-   * Do not add this method to the {@link StoreFileTracker} interface since we do not need this
-   * method in upper layer.
-   */
-  abstract void set(List<StoreFileInfo> files) throws IOException;
 }