diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 4cdb74e6ae43..3f4013008b4d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -2032,32 +2032,6 @@ public HRegion createLocalHRegion(RegionInfo info, TableDescriptor desc, WAL wal return HRegion.createHRegion(info, getDataTestDir(), getConfiguration(), desc, wal); } - /** - * @param tableName the name of the table - * @param startKey the start key of the region - * @param stopKey the stop key of the region - * @param callingMethod the name of the calling method probably a test method - * @param conf the configuration to use - * @param isReadOnly {@code true} if the table is read only, {@code false} otherwise - * @param families the column families to use - * @throws IOException if an IO problem is encountered - * @return A region on which you must call {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} - * when done. - * @deprecated since 2.0.0 and will be removed in 3.0.0. Use - * {@link #createLocalHRegion(TableName, byte[], byte[], boolean, Durability, WAL, byte[]...)} - * instead. - * @see #createLocalHRegion(TableName, byte[], byte[], boolean, Durability, WAL, byte[]...) - * @see HBASE-13893 - */ - @Deprecated - public HRegion createLocalHRegion(byte[] tableName, byte[] startKey, byte[] stopKey, - String callingMethod, Configuration conf, boolean isReadOnly, Durability durability, - WAL wal, byte[]... families) throws IOException { - return this - .createLocalHRegion(TableName.valueOf(tableName), startKey, stopKey, isReadOnly, durability, - wal, families); - } - /** * @param tableName * @param startKey diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java index 726d2c494312..518234b921d1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java @@ -1122,7 +1122,7 @@ public void testSeqIdsFromReplay() throws IOException { byte[] tableName = Bytes.toBytes(method); byte[] family = Bytes.toBytes("family"); - HRegion region = initHRegion(tableName, method, family); + HRegion region = initHRegion(tableName, family); try { // replay an entry that is bigger than current read point long readPoint = region.getMVCC().getReadPoint(); @@ -1706,16 +1706,8 @@ private void putDataByReplay(HRegion region, } } - private static HRegion initHRegion(byte[] tableName, - String callingMethod, byte[]... families) throws IOException { - return initHRegion(tableName, HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW, - callingMethod, TEST_UTIL.getConfiguration(), false, Durability.SYNC_WAL, null, families); - } - - private static HRegion initHRegion(byte[] tableName, byte[] startKey, byte[] stopKey, - String callingMethod, Configuration conf, boolean isReadOnly, Durability durability, - WAL wal, byte[]... families) throws IOException { - return TEST_UTIL.createLocalHRegion(tableName, startKey, stopKey, callingMethod, conf, - isReadOnly, durability, wal, families); + private static HRegion initHRegion(byte[] tableName, byte[]... families) throws IOException { + return TEST_UTIL.createLocalHRegion(TableName.valueOf(tableName), HConstants.EMPTY_START_ROW, + HConstants.EMPTY_END_ROW, false, Durability.SYNC_WAL, null, families); } }