Skip to content

HBASE-23738 Removed deprecated createLocalHRegion from HBaseTestingUtility #1090

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

Merged
HorizonNet merged 1 commit into from
Jan 28, 2020
Merged

HBASE-23738 Removed deprecated createLocalHRegion from HBaseTestingUtility #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="https://issues.apache.org/jira/browse/HBASE-13893">HBASE-13893</a>
*/
@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
Expand Down
16 changes: 4 additions & 12 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}
}