This is an automated email from the ASF dual-hosted git repository.
janh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 93c5e76 HBASE-23775 Removed deprecated method
createLocalHTU(Configuration) from HBaseTestingUtility
93c5e76 is described below
commit 93c5e7691f02e4b46b4b7d4a582b32e9b9ce9792
Author: Jan Hentschel <jan.hentsc...@ultratendency.com>
AuthorDate: Fri Feb 7 09:51:04 2020 +0100
HBASE-23775 Removed deprecated method createLocalHTU(Configuration) from
HBaseTestingUtility
Signed-off-by: Sean Busbey <bus...@apache.org>
---
.../java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 12 ------------
.../hadoop/hbase/regionserver/TestCompactingMemStore.java | 2 +-
.../hadoop/hbase/regionserver/TestDefaultMemStore.java | 4 ++--
.../hbase/regionserver/TestMemStoreSegmentsIterator.java | 2 +-
4 files changed, 4 insertions(+), 16 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 575e65d..e40dfa0 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
@@ -343,18 +343,6 @@ public class HBaseTestingUtility extends
HBaseZKTestingUtility {
}
/**
- * @deprecated since 2.0.0 and will be removed in 3.0.0. Use
- * {@link #HBaseTestingUtility(Configuration)} instead.
- * @return a normal HBaseTestingUtility
- * @see #HBaseTestingUtility(Configuration)
- * @see <a
href="https://issues.apache.org/jira/browse/HBASE-19841";>HBASE-19841</a>
- */
- @Deprecated
- public static HBaseTestingUtility createLocalHTU(Configuration c) {
- return new HBaseTestingUtility(c);
- }
-
- /**
* Close both the region {@code r} and it's underlying WAL. For use in tests.
*/
public static void closeRegionAndWAL(final Region r) throws IOException {
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
index e5a2a8a..80e312b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
@@ -107,7 +107,7 @@ public class TestCompactingMemStore extends
TestDefaultMemStore {
conf.setBoolean(MemStoreLAB.USEMSLAB_KEY, true);
conf.setFloat(MemStoreLAB.CHUNK_POOL_MAXSIZE_KEY, 0.2f);
conf.setInt(HRegion.MEMSTORE_PERIODIC_FLUSH_INTERVAL, 1000);
- HBaseTestingUtility hbaseUtility =
HBaseTestingUtility.createLocalHTU(conf);
+ HBaseTestingUtility hbaseUtility = new HBaseTestingUtility(conf);
HColumnDescriptor hcd = new HColumnDescriptor(FAMILY);
HTableDescriptor htd = new HTableDescriptor(TableName.valueOf("foobar"));
htd.addFamily(hcd);
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java
index f88e3ed..9e7c038 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java
@@ -917,7 +917,7 @@ public class TestDefaultMemStore {
try {
EnvironmentEdgeForMemstoreTest edge = new
EnvironmentEdgeForMemstoreTest();
EnvironmentEdgeManager.injectEdge(edge);
- HBaseTestingUtility hbaseUtility =
HBaseTestingUtility.createLocalHTU(conf);
+ HBaseTestingUtility hbaseUtility = new HBaseTestingUtility(conf);
String cf = "foo";
HRegion region =
hbaseUtility.createTestRegion("foobar",
ColumnFamilyDescriptorBuilder.of(cf));
@@ -943,7 +943,7 @@ public class TestDefaultMemStore {
// the MEMSTORE_PERIODIC_FLUSH_INTERVAL is set to a higher value)
Configuration conf = new Configuration();
conf.setInt(HRegion.MEMSTORE_PERIODIC_FLUSH_INTERVAL,
HRegion.SYSTEM_CACHE_FLUSH_INTERVAL * 10);
- HBaseTestingUtility hbaseUtility =
HBaseTestingUtility.createLocalHTU(conf);
+ HBaseTestingUtility hbaseUtility = new HBaseTestingUtility(conf);
Path testDir = hbaseUtility.getDataTestDir();
EnvironmentEdgeForMemstoreTest edge = new EnvironmentEdgeForMemstoreTest();
EnvironmentEdgeManager.injectEdge(edge);
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreSegmentsIterator.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreSegmentsIterator.java
index 7aec6d0..3602db6 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreSegmentsIterator.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreSegmentsIterator.java
@@ -75,7 +75,7 @@ public class TestMemStoreSegmentsIterator {
@Before
public void setup() throws IOException {
Configuration conf = new Configuration();
- HBaseTestingUtility hbaseUtility =
HBaseTestingUtility.createLocalHTU(conf);
+ HBaseTestingUtility hbaseUtility = new HBaseTestingUtility(conf);
TableDescriptorBuilder tableDescriptorBuilder =
TableDescriptorBuilder.newBuilder(TableName.valueOf(TABLE));
ColumnFamilyDescriptor columnFamilyDescriptor =
