From 12f1c7c1ce60238867a55cc0e0c26f75fcbad23f Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Mon, 3 Feb 2020 00:24:19 +0100 Subject: [PATCH] HBASE-23777 Removed deprecated createTableDescriptor(String, int, int, int, KeepDeletedCells) from HBaseTestingUtility Signed-off-by: stack Signed-off-by: Viraj Jasani --- .../hadoop/hbase/HBaseTestingUtility.java | 13 -------- .../hbase/regionserver/TestKeepDeletes.java | 31 ++++++++++--------- 2 files changed, 16 insertions(+), 28 deletions(-) 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 864a14d4a90b..a4d789fd1e26 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 @@ -1899,19 +1899,6 @@ public void deleteTableIfAny(TableName tableName) throws IOException { public static final byte [] START_KEY_BYTES = {FIRST_CHAR, FIRST_CHAR, FIRST_CHAR}; public static final String START_KEY = new String(START_KEY_BYTES, HConstants.UTF8_CHARSET); - /** - * @deprecated since 2.0.0 and will be removed in 3.0.0. Use - * {@link #createTableDescriptor(TableName, int, int, int, KeepDeletedCells)} instead. - * @see #createTableDescriptor(TableName, int, int, int, KeepDeletedCells) - * @see HBASE-13893 - */ - @Deprecated - public HTableDescriptor createTableDescriptor(final String name, - final int minVersions, final int versions, final int ttl, KeepDeletedCells keepDeleted) { - return this.createTableDescriptor(TableName.valueOf(name), minVersions, versions, ttl, - keepDeleted); - } - /** * Create a table of name name. * @param name Name to give table. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java index e8d036224096..4fab2f1ae423 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java @@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeepDeletedCells; import org.apache.hadoop.hbase.PrivateCellUtil; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -104,7 +105,7 @@ public void tearDown() throws Exception { @Test public void testBasicScenario() throws Exception { // keep 3 versions, rows do not expire - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 3, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 3, HConstants.FOREVER, KeepDeletedCells.TRUE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -201,7 +202,7 @@ public void testBasicScenario() throws Exception { @Test public void testRawScanWithoutKeepingDeletes() throws Exception { // KEEP_DELETED_CELLS is NOT enabled - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 3, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 3, HConstants.FOREVER, KeepDeletedCells.FALSE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -246,7 +247,7 @@ public void testRawScanWithoutKeepingDeletes() throws Exception { @Test public void testWithoutKeepingDeletes() throws Exception { // KEEP_DELETED_CELLS is NOT enabled - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 3, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 3, HConstants.FOREVER, KeepDeletedCells.FALSE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -299,7 +300,7 @@ public void testWithoutKeepingDeletes() throws Exception { */ @Test public void testRawScanWithColumns() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 3, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 3, HConstants.FOREVER, KeepDeletedCells.TRUE); Region region = hbu.createLocalHRegion(htd, null, null); @@ -323,7 +324,7 @@ public void testRawScanWithColumns() throws Exception { */ @Test public void testRawScan() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 3, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 3, HConstants.FOREVER, KeepDeletedCells.TRUE); Region region = hbu.createLocalHRegion(htd, null, null); @@ -413,7 +414,7 @@ public void testRawScan() throws Exception { */ @Test public void testDeleteMarkerExpirationEmptyStore() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 1, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 1, HConstants.FOREVER, KeepDeletedCells.TRUE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -456,7 +457,7 @@ public void testDeleteMarkerExpirationEmptyStore() throws Exception { */ @Test public void testDeleteMarkerExpiration() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 1, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 1, HConstants.FOREVER, KeepDeletedCells.TRUE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -519,7 +520,7 @@ public void testDeleteMarkerExpiration() throws Exception { */ @Test public void testWithOldRow() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 1, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 1, HConstants.FOREVER, KeepDeletedCells.TRUE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -597,7 +598,7 @@ public void testWithOldRow() throws Exception { */ @Test public void testRanges() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 3, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 3, HConstants.FOREVER, KeepDeletedCells.TRUE); Region region = hbu.createLocalHRegion(htd, null, null); @@ -679,7 +680,7 @@ public void testRanges() throws Exception { */ @Test public void testDeleteMarkerVersioning() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 1, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 1, HConstants.FOREVER, KeepDeletedCells.TRUE); HRegion region = hbu.createLocalHRegion(htd, null, null); @@ -772,7 +773,7 @@ public void testDeleteMarkerVersioning() throws Exception { */ @Test public void testWithMixedCFs() throws Exception { - HTableDescriptor htd = hbu.createTableDescriptor(name.getMethodName(), 0, 1, + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 0, 1, HConstants.FOREVER, KeepDeletedCells.TRUE); Region region = hbu.createLocalHRegion(htd, null, null); @@ -824,8 +825,8 @@ public void testWithMixedCFs() throws Exception { */ @Test public void testWithMinVersions() throws Exception { - HTableDescriptor htd = - hbu.createTableDescriptor(name.getMethodName(), 3, 1000, 1, KeepDeletedCells.TRUE); + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 3, + 1000, 1, KeepDeletedCells.TRUE); HRegion region = hbu.createLocalHRegion(htd, null, null); long ts = EnvironmentEdgeManager.currentTime() - 2000; // 2s in the past @@ -903,8 +904,8 @@ public void testWithMinVersions() throws Exception { */ @Test public void testWithTTL() throws Exception { - HTableDescriptor htd = - hbu.createTableDescriptor(name.getMethodName(), 1, 1000, 1, KeepDeletedCells.TTL); + HTableDescriptor htd = hbu.createTableDescriptor(TableName.valueOf(name.getMethodName()), 1, + 1000, 1, KeepDeletedCells.TTL); HRegion region = hbu.createLocalHRegion(htd, null, null); long ts = EnvironmentEdgeManager.currentTime() - 2000; // 2s in the past