Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-27021 StoreFileInfo should set its initialPath in a consistent way (#4419)" 

Revert due to failure spotless:check

This reverts commit aa31b0f695.
This commit is contained in:
Duo Zhang 2022-05-12 16:42:30 +08:00 committed by Wellington Chevreuil
parent b7647d8d5f
commit e3359efe7a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
View File

@ -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);

15
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
View File

@ -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