Skip to content

Commit 5c93fc9

Browse files
committed
HBASE-26386 Refactor StoreFileTracker implementations to expose the set method (#3774)
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
1 parent 25909e8 commit 5c93fc9

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/DefaultStoreFileTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
6262
}
6363

6464
@Override
65-
void set(List<StoreFileInfo> files) {
65+
public void set(List<StoreFileInfo> files) {
6666
// NOOP
6767
}
6868
}

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/FileBasedStoreFileTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
148148
}
149149

150150
@Override
151-
void set(List<StoreFileInfo> files) throws IOException {
151+
public void set(List<StoreFileInfo> files) throws IOException {
152152
synchronized (storefiles) {
153153
storefiles.clear();
154154
StoreFileList.Builder builder = StoreFileList.newBuilder();

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/MigrationStoreFileTracker.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import java.util.Collection;
2222
import java.util.List;
2323
import org.apache.hadoop.conf.Configuration;
24-
import org.apache.hadoop.hbase.client.TableDescriptor;
25-
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
26-
import org.apache.hadoop.hbase.procedure2.util.StringUtils;
2724
import org.apache.hadoop.hbase.regionserver.StoreContext;
2825
import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
2926
import org.apache.yetus.audience.InterfaceAudience;
@@ -84,7 +81,7 @@ protected void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
8481
}
8582

8683
@Override
87-
void set(List<StoreFileInfo> files) {
84+
public void set(List<StoreFileInfo> files) {
8885
throw new UnsupportedOperationException(
8986
"Should not call this method on " + getClass().getSimpleName());
9087
}

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTracker.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.io.IOException;
2121
import java.util.Collection;
2222
import java.util.List;
23-
24-
import org.apache.hadoop.hbase.client.TableDescriptor;
2523
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
2624
import org.apache.hadoop.hbase.regionserver.CreateStoreFileWriterParams;
2725
import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
@@ -69,6 +67,11 @@ public interface StoreFileTracker {
6967
void replace(Collection<StoreFileInfo> compactedFiles, Collection<StoreFileInfo> newFiles)
7068
throws IOException;
7169

70+
/**
71+
* Set the store files.
72+
*/
73+
void set(List<StoreFileInfo> files) throws IOException;
74+
7275
/**
7376
* Create a writer for writing new store files.
7477
* @return Writer for a new StoreFile

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerBase.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121

2222
import java.io.IOException;
2323
import java.util.Collection;
24-
import java.util.List;
2524
import org.apache.hadoop.conf.Configuration;
2625
import org.apache.hadoop.fs.Path;
2726
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
28-
import org.apache.hadoop.hbase.client.TableDescriptor;
2927
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
3028
import org.apache.hadoop.hbase.io.compress.Compression;
3129
import org.apache.hadoop.hbase.io.crypto.Encryption;
@@ -184,12 +182,4 @@ public final StoreFileWriter createWriter(CreateStoreFileWriterParams params) th
184182

185183
protected abstract void doAddCompactionResults(Collection<StoreFileInfo> compactedFiles,
186184
Collection<StoreFileInfo> newFiles) throws IOException;
187-
188-
/**
189-
* used to mirror the store file list after loading when migration.
190-
* <p/>
191-
* Do not add this method to the {@link StoreFileTracker} interface since we do not need this
192-
* method in upper layer.
193-
*/
194-
abstract void set(List<StoreFileInfo> files) throws IOException;
195185
}

0 commit comments

Comments
 (0)