You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2022/05/12 10:10:30 UTC
[hbase] 03/03: HBASE-27021 StoreFileInfo should set its initialPath in a consistent way
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 930bc5368cfd000c47a335566b23ed8ca75c2ed7
Author: Wellington Chevreuil <wc...@apache.org>
AuthorDate: Tue May 10 17:33:55 2022 +0100
HBASE-27021 StoreFileInfo should set its initialPath in a consistent way
(Amending spotless errors after revert by Duo)
---
.../apache/hadoop/hbase/regionserver/StoreFileInfo.java | 2 +-
.../org/apache/hadoop/hbase/regionserver/TestHStore.java | 15 +++++++++------
2 files changed, 10 insertions(+), 7 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 8bd2ffcb873..7a65d0e6ea2 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 = initialPath;
+ this.initialPath = fs.makeQualified(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 e9f87353bc7..b125fd93791 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,13 +941,16 @@ public class TestHStore {
private void closeCompactedFile(int index) throws IOException {
Collection<HStoreFile> files =
this.store.getStoreEngine().getStoreFileManager().getCompactedfiles();
- HStoreFile sf = null;
- Iterator<HStoreFile> it = files.iterator();
- for (int i = 0; i <= index; i++) {
- sf = it.next();
+ 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));
}
- sf.closeStoreFile(true);
- store.getStoreEngine().getStoreFileManager().removeCompactedFiles(Lists.newArrayList(sf));
}
@Test