Skip to content

HBASE-30217 Remove dead code getRegionId and isTemporaryDirectoryName… #8331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuxiaocs7 wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −35
Open

HBASE-30217 Remove dead code getRegionId and isTemporaryDirectoryName… #8331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a10bf2
HBASE-30217 Remove dead code getRegionId and isTemporaryDirectoryName…
liuxiaocs7 Jun 10, 2026
329a96e
address comments
liuxiaocs7 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ public class HRegionFileSystem {
/** Name of the region info file that resides just under the region directory. */
public final static String REGION_INFO_FILE = ".regioninfo";

/** Temporary subdirectory of the region directory used for merges. */
public static final String REGION_MERGES_DIR = ".merges";

/** Temporary subdirectory of the region directory used for splits. */
public static final String REGION_SPLITS_DIR = ".splits";

/** Temporary subdirectory of the region directory used for compaction output. */
static final String REGION_TEMP_DIR = ".tmp";

Expand Down Expand Up @@ -1000,31 +994,6 @@ public static void deleteRegionFromFileSystem(final Configuration conf, final Fi
}
}

/**
* Retrieves the Region ID from the given HFile path.
* @param hFilePath The path of the HFile.
* @return The Region ID extracted from the HFile path.
* @throws IOException If an I/O error occurs or if the HFile path is incorrect.
*/
public static String getRegionId(Path hFilePath) throws IOException {
if (hFilePath.getParent() == null || hFilePath.getParent().getParent() == null) {
throw new IOException("Incorrect HFile Path: " + hFilePath);
}
Path dir = hFilePath.getParent().getParent();
if (isTemporaryDirectoryName(dir.getName())) {
if (dir.getParent() == null) {
throw new IOException("Incorrect HFile Path: " + hFilePath);
}
return dir.getParent().getName();
}
return dir.getName();
}

private static boolean isTemporaryDirectoryName(String dirName) {
return REGION_MERGES_DIR.equals(dirName) || REGION_SPLITS_DIR.equals(dirName)
|| REGION_TEMP_DIR.equals(dirName);
}

/**
* Creates a directory. Assumes the user has already checked for this directory existence.
* @return the result of fs.mkdirs(). In case underlying fs throws an IOException, it checks
Expand Down
7 changes: 3 additions & 4 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,9 @@ public void testSnapshottingWithTmpSplitsAndMergeDirectoriesPresent() throws Exc
Path regionDirectoryPath = new Path(tableDir, encodedName);
TEST_UTIL.getTestFileSystem()
.create(new Path(regionDirectoryPath, HRegionFileSystem.REGION_TEMP_DIR));
TEST_UTIL.getTestFileSystem()
.create(new Path(regionDirectoryPath, HRegionFileSystem.REGION_SPLITS_DIR));
TEST_UTIL.getTestFileSystem()
.create(new Path(regionDirectoryPath, HRegionFileSystem.REGION_MERGES_DIR));
// Legacy directories created by split/merge before HBASE-26187
TEST_UTIL.getTestFileSystem().create(new Path(regionDirectoryPath, ".splits"));
TEST_UTIL.getTestFileSystem().create(new Path(regionDirectoryPath, ".merges"));
// now snapshot
String snapshotDir = client.createSnapshot(baseDir, "foo_snapshot");
// everything should still open just fine
Expand Down