(hbase) branch branch-2.5 updated: HBASE-30217 Remove dead code getRegionId and isTemporaryDirectoryName… (#8331) (#8371)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liuxiaocs7 pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new 4abfad3401e HBASE-30217 Remove dead code getRegionId and isTemporaryDirectoryName… (#8331) (#8371)
4abfad3401e is described below

commit 4abfad3401e6740c3cbec71944b8abb61b473e4a
Author: Xiao Liu <li...@apache.org>
AuthorDate: Thu Jun 18 17:10:59 2026 +0800

    HBASE-30217 Remove dead code getRegionId and isTemporaryDirectoryName… (#8331) (#8371)
    
    Signed-off-by: Wellington Chevreuil <wc...@apache.org>
    Signed-off-by: Peng Lu <lu...@apache.org>
    
    (cherry picked from commit 1b6aee065c8c2d6a87139d6341a02818d50952f1)
---
 .../org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java   | 6 ------
 .../apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
index f35eb7c74a3..aa0a6c242a0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
@@ -77,12 +77,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";
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
index ddfc6964c61..095d3d2c6d4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHdfsSnapshotHRegion.java
@@ -83,8 +83,8 @@ public class TestHdfsSnapshotHRegion {
   }
 
   @Test
-  public void testSnapshottingWithTmpSplitsAndMergeDirectoriesPresent() throws Exception {
-    // lets get a region and create those directories and make sure we ignore them
+  public void testSnapshottingWithTmpDirectoryPresent() throws Exception {
+    // Create the temp directory and make sure snapshot-open still ignores it.
     RegionInfo firstRegion = TEST_UTIL.getConnection().getRegionLocator(table.getName())
       .getAllRegionLocations().stream().findFirst().get().getRegion();
     String encodedName = firstRegion.getEncodedName();
@@ -92,10 +92,6 @@ public class TestHdfsSnapshotHRegion {
     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));
     // now snapshot
     String snapshotDir = client.createSnapshot(baseDir, "foo_snapshot");
     // everything should still open just fine