You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/06/25 23:42:54 UTC
[6/6] hbase git commit: HBASE-13893 Replace HTable with Table in
client tests (Jurriaan Mous)
HBASE-13893 Replace HTable with Table in client tests (Jurriaan Mous)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b5b58530
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b5b58530
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b5b58530
Branch: refs/heads/master
Commit: b5b5853043e20a719f1b7afb485ede68ddd823f0
Parents: e6ed792
Author: stack <st...@apache.org>
Authored: Thu Jun 25 14:42:33 2015 -0700
Committer: stack <st...@apache.org>
Committed: Thu Jun 25 14:42:33 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/Action.java | 2 +-
.../hbase/client/BufferedMutatorImpl.java | 2 +-
.../hadoop/hbase/client/ScannerCallable.java | 2 +-
.../hadoop/hbase/client/coprocessor/Batch.java | 14 +-
.../hbase/ipc/RegionCoprocessorRpcChannel.java | 4 +-
.../hadoop/hbase/client/TestOperation.java | 8 +-
.../mapreduce/IntegrationTestBulkLoad.java | 2 +-
...tionTestWithCellVisibilityLoadAndVerify.java | 2 +-
.../hadoop/hbase/rest/RowResourceBase.java | 14 +-
.../hadoop/hbase/rest/TestStatusResource.java | 4 +-
.../hbase/mapred/TableInputFormatBase.java | 2 +-
.../hbase/mapreduce/LoadIncrementalHFiles.java | 10 +-
.../hbase/mapreduce/TableInputFormatBase.java | 4 +-
.../hadoop/hbase/util/RegionSizeCalculator.java | 6 +-
.../org/apache/hadoop/hbase/HBaseTestCase.java | 2 +-
.../hadoop/hbase/HBaseTestingUtility.java | 166 ++++-
.../hadoop/hbase/TestFullLogReconstruction.java | 3 +-
.../hadoop/hbase/TestGlobalMemStoreSize.java | 7 +-
.../hbase/TestHBaseOnOtherDfsCluster.java | 8 +-
.../hadoop/hbase/TestMetaTableAccessor.java | 6 +-
.../apache/hadoop/hbase/client/TestAdmin1.java | 517 +++++++-------
.../apache/hadoop/hbase/client/TestAdmin2.java | 22 +-
.../hadoop/hbase/client/TestCheckAndMutate.java | 8 +-
.../hadoop/hbase/client/TestClientPushback.java | 26 +-
.../hadoop/hbase/client/TestFromClientSide.java | 705 ++++++++++---------
.../hbase/client/TestFromClientSide3.java | 283 ++++----
.../hbase/client/TestFromClientSideNoCodec.java | 16 +-
.../org/apache/hadoop/hbase/client/TestHCM.java | 124 ++--
.../hbase/client/TestHTableMultiplexer.java | 100 +--
.../client/TestHTableMultiplexerFlushCache.java | 38 +-
.../hbase/client/TestMetaWithReplicas.java | 18 +-
.../hadoop/hbase/client/TestMultiParallel.java | 2 +-
.../hbase/client/TestReplicaWithCluster.java | 10 +-
.../hadoop/hbase/client/TestReplicasClient.java | 17 +-
.../hbase/client/TestResultSizeEstimation.java | 6 +-
.../client/TestScannersFromClientSide.java | 22 +-
.../client/TestSnapshotCloneIndependence.java | 16 +-
.../hbase/client/TestSnapshotFromClient.java | 2 +-
.../coprocessor/TestAggregateProtocol.java | 3 +-
.../TestBigDecimalColumnInterpreter.java | 7 +-
.../coprocessor/TestCoprocessorEndpoint.java | 26 +-
.../TestDoubleColumnInterpreter.java | 3 +-
.../hbase/coprocessor/TestMasterObserver.java | 19 +-
.../TestRegionObserverInterface.java | 168 +++--
...gionServerCoprocessorExceptionWithAbort.java | 4 +-
...ionServerCoprocessorExceptionWithRemove.java | 7 +-
.../hbase/filter/TestMultiRowRangeFilter.java | 44 +-
.../encoding/TestLoadAndSwitchEncodeOnDisk.java | 19 +-
.../MultiTableInputFormatTestBase.java | 3 +-
.../hadoop/hbase/mapreduce/TestCellCounter.java | 77 +-
.../hadoop/hbase/mapreduce/TestCopyTable.java | 10 +-
.../hbase/mapreduce/TestHFileOutputFormat.java | 119 ++--
.../hbase/mapreduce/TestHFileOutputFormat2.java | 42 +-
.../hadoop/hbase/mapreduce/TestHashTable.java | 11 +-
.../TestImportTSVWithOperationAttributes.java | 12 +-
.../hbase/mapreduce/TestImportTSVWithTTLs.java | 6 +-
.../TestImportTSVWithVisibilityLabels.java | 29 +-
.../hadoop/hbase/mapreduce/TestImportTsv.java | 6 +-
.../TestLoadIncrementalHFilesSplitRecovery.java | 49 +-
.../mapreduce/TestMultiTableInputFormat.java | 5 +-
.../mapreduce/TestMultithreadedTableMapper.java | 2 +-
.../hadoop/hbase/mapreduce/TestRowCounter.java | 2 +-
.../hadoop/hbase/mapreduce/TestSyncTable.java | 30 +-
.../mapreduce/TestTableInputFormatScanBase.java | 15 +-
.../hbase/mapreduce/TestTableMapReduceBase.java | 2 +-
.../master/TestAssignmentManagerOnCluster.java | 70 +-
.../master/TestDistributedLogSplitting.java | 22 +-
.../master/TestGetLastFlushedSequenceId.java | 4 +-
.../apache/hadoop/hbase/master/TestMaster.java | 3 +-
.../TestMasterRestartAfterDisablingTable.java | 5 +-
.../hbase/master/TestMasterTransitions.java | 4 +-
.../hbase/master/TestRegionPlacement.java | 14 +-
.../hadoop/hbase/master/TestRollingRestart.java | 5 +-
.../master/cleaner/TestSnapshotFromMaster.java | 4 +-
.../hbase/namespace/TestNamespaceAuditor.java | 2 +-
.../hadoop/hbase/quotas/TestQuotaThrottle.java | 13 +-
.../TestEndToEndSplitTransaction.java | 27 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 74 +-
.../regionserver/TestHRegionOnCluster.java | 10 +-
.../regionserver/TestPerColumnFamilyFlush.java | 10 +-
.../regionserver/TestRegionFavoredNodes.java | 3 +-
.../hbase/regionserver/TestRegionReplicas.java | 7 +-
.../regionserver/TestRegionServerMetrics.java | 4 +-
.../regionserver/TestRegionServerNoMaster.java | 8 +-
.../TestRegionServerOnlineConfigChange.java | 20 +-
.../regionserver/TestScannerWithBulkload.java | 22 +-
.../regionserver/TestServerCustomProtocol.java | 45 +-
.../TestSplitTransactionOnCluster.java | 17 +-
.../TestCompactionWithThroughputController.java | 2 +-
.../replication/TestReplicationKillRS.java | 2 +-
...egionReplicaReplicationEndpointNoMaster.java | 12 +-
.../security/access/TestAccessController.java | 8 +-
.../apache/hadoop/hbase/util/TestHBaseFsck.java | 381 +++++-----
.../hbase/util/TestProcessBasedCluster.java | 2 +-
.../hadoop/hbase/util/TestRegionSplitter.java | 79 ++-
.../util/hbck/OfflineMetaRebuildTestCore.java | 14 +-
96 files changed, 2030 insertions(+), 1783 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java
index 5743fd5..1c38349 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
/**
* A Get, Put, Increment, Append, or Delete associated with it's region. Used internally by
- * {@link HTable#batch} to associate the action with it's region and maintain
+ * {@link Table#batch} to associate the action with it's region and maintain
* the index from the original request.
*/
@InterfaceAudience.Private
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
index 249edec..ba86986 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
/**
* <p>
- * Used to communicate with a single HBase table similar to {@link HTable}
+ * Used to communicate with a single HBase table similar to {@link Table}
* but meant for batched, potentially asynchronous puts. Obtain an instance from
* a {@link Connection} and call {@link #close()} afterwards.
* </p>
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
index afce287..65f74c8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
@@ -57,7 +57,7 @@ import com.google.protobuf.TextFormat;
/**
* Scanner operations such as create, next, etc.
- * Used by {@link ResultScanner}s made by {@link HTable}. Passed to a retrying caller such as
+ * Used by {@link ResultScanner}s made by {@link Table}. Passed to a retrying caller such as
* {@link RpcRetryingCaller} so fails are retried.
*/
@InterfaceAudience.Private
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java
index f8a0e1c..a9c23cc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java
@@ -36,13 +36,15 @@ public abstract class Batch {
*
* <p>
* When used with
- * {@link org.apache.hadoop.hbase.client.HTable#coprocessorService(Class, byte[], byte[], org.apache.hadoop.hbase.client.coprocessor.Batch.Call)}
+ * {@link org.apache.hadoop.hbase.client.Table#coprocessorService(Class, byte[], byte[],
+ * org.apache.hadoop.hbase.client.coprocessor.Batch.Call)}
* the implementations {@link Batch.Call#call(Object)} method will be invoked
* with a proxy to each region's coprocessor {@link com.google.protobuf.Service} implementation.
* </p>
* @see org.apache.hadoop.hbase.client.coprocessor
- * @see org.apache.hadoop.hbase.client.HTable#coprocessorService(byte[])
- * @see org.apache.hadoop.hbase.client.HTable#coprocessorService(Class, byte[], byte[], org.apache.hadoop.hbase.client.coprocessor.Batch.Call)
+ * @see org.apache.hadoop.hbase.client.Table#coprocessorService(byte[])
+ * @see org.apache.hadoop.hbase.client.Table#coprocessorService(Class, byte[], byte[],
+ * org.apache.hadoop.hbase.client.coprocessor.Batch.Call)
* @param <T> the instance type to be passed to
* {@link Batch.Call#call(Object)}
* @param <R> the return type from {@link Batch.Call#call(Object)}
@@ -59,13 +61,15 @@ public abstract class Batch {
*
* <p>
* When used with
- * {@link org.apache.hadoop.hbase.client.HTable#coprocessorService(Class, byte[], byte[], org.apache.hadoop.hbase.client.coprocessor.Batch.Call)}
+ * {@link org.apache.hadoop.hbase.client.Table#coprocessorService(Class, byte[], byte[],
+ * org.apache.hadoop.hbase.client.coprocessor.Batch.Call)}
* the implementation's {@link Batch.Callback#update(byte[], byte[], Object)}
* method will be called with the {@link Batch.Call#call(Object)} return value
* from each region in the selected range.
* </p>
* @param <R> the return type from the associated {@link Batch.Call#call(Object)}
- * @see org.apache.hadoop.hbase.client.HTable#coprocessorService(Class, byte[], byte[], org.apache.hadoop.hbase.client.coprocessor.Batch.Call)
+ * @see org.apache.hadoop.hbase.client.Table#coprocessorService(Class, byte[], byte[],
+ * org.apache.hadoop.hbase.client.coprocessor.Batch.Call)
*/
@InterfaceAudience.Public
@InterfaceStability.Stable
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java
index 092e24d..502fc21 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java
@@ -40,10 +40,10 @@ import com.google.protobuf.Message;
/**
* Provides clients with an RPC connection to call coprocessor endpoint {@link com.google.protobuf.Service}s
* against a given table region. An instance of this class may be obtained
- * by calling {@link org.apache.hadoop.hbase.client.HTable#coprocessorService(byte[])},
+ * by calling {@link org.apache.hadoop.hbase.client.Table#coprocessorService(byte[])},
* but should normally only be used in creating a new {@link com.google.protobuf.Service} stub to call the endpoint
* methods.
- * @see org.apache.hadoop.hbase.client.HTable#coprocessorService(byte[])
+ * @see org.apache.hadoop.hbase.client.Table#coprocessorService(byte[])
*/
@InterfaceAudience.Private
public class RegionCoprocessorRpcChannel extends CoprocessorRpcChannel{
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
index 37890f9..ae0d52c 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
@@ -382,7 +382,7 @@ public class TestOperation {
Assert.assertEquals(0, c.size());
Assert.assertEquals(HConstants.LATEST_TIMESTAMP, p.getTimeStamp());
- p.add(FAMILY, ByteBuffer.wrap(QUALIFIER), 1984L, ByteBuffer.wrap(VALUE));
+ p.addColumn(FAMILY, ByteBuffer.wrap(QUALIFIER), 1984L, ByteBuffer.wrap(VALUE));
c = p.get(FAMILY, QUALIFIER);
Assert.assertEquals(1, c.size());
Assert.assertEquals(1984L, c.get(0).getTimestamp());
@@ -391,7 +391,7 @@ public class TestOperation {
Assert.assertEquals(0, CellComparator.COMPARATOR.compare(c.get(0), new KeyValue(c.get(0))));
p = new Put(ROW);
- p.add(FAMILY, ByteBuffer.wrap(QUALIFIER), 2013L, null);
+ p.addColumn(FAMILY, ByteBuffer.wrap(QUALIFIER), 2013L, null);
c = p.get(FAMILY, QUALIFIER);
Assert.assertEquals(1, c.size());
Assert.assertEquals(2013L, c.get(0).getTimestamp());
@@ -400,7 +400,7 @@ public class TestOperation {
Assert.assertEquals(0, CellComparator.COMPARATOR.compare(c.get(0), new KeyValue(c.get(0))));
p = new Put(ByteBuffer.wrap(ROW));
- p.add(FAMILY, ByteBuffer.wrap(QUALIFIER), 2001L, null);
+ p.addColumn(FAMILY, ByteBuffer.wrap(QUALIFIER), 2001L, null);
c = p.get(FAMILY, QUALIFIER);
Assert.assertEquals(1, c.size());
Assert.assertEquals(2001L, c.get(0).getTimestamp());
@@ -410,7 +410,7 @@ public class TestOperation {
Assert.assertEquals(0, CellComparator.COMPARATOR.compare(c.get(0), new KeyValue(c.get(0))));
p = new Put(ByteBuffer.wrap(ROW), 1970L);
- p.add(FAMILY, ByteBuffer.wrap(QUALIFIER), 2001L, null);
+ p.addColumn(FAMILY, ByteBuffer.wrap(QUALIFIER), 2001L, null);
c = p.get(FAMILY, QUALIFIER);
Assert.assertEquals(1, c.size());
Assert.assertEquals(2001L, c.get(0).getTimestamp());
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
index b5f0360..b9f97a7 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
@@ -237,7 +237,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
}
util.createTable(
- getTablename().getName(),
+ getTablename(),
new byte[][]{CHAIN_FAM, SORT_FAM, DATA_FAM},
getSplits(16)
);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
index 41a705f..b797740 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
@@ -377,7 +377,7 @@ public class IntegrationTestWithCellVisibilityLoadAndVerify extends IntegrationT
}
doLoad(getConf(), htd);
doVerify(getConf(), htd);
- getTestingUtil(getConf()).deleteTable(htd.getName());
+ getTestingUtil(getConf()).deleteTable(getTablename());
return 0;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
index 0e74b46..48cebb2 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
@@ -52,6 +52,9 @@ import org.junit.BeforeClass;
public class RowResourceBase {
protected static final String TABLE = "TestRowResource";
+
+ protected static final TableName TABLE_NAME = TableName.valueOf(TABLE);
+
protected static final String CFA = "a";
protected static final String CFB = "b";
protected static final String COLUMN_1 = CFA + ":1";
@@ -76,6 +79,7 @@ public class RowResourceBase {
protected static Configuration conf;
protected static ObjectMapper jsonMapper;
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
conf = TEST_UTIL.getConfiguration();
@@ -102,10 +106,10 @@ public class RowResourceBase {
@Before
public void beforeMethod() throws Exception {
Admin admin = TEST_UTIL.getHBaseAdmin();
- if (admin.tableExists(TableName.valueOf(TABLE))) {
- TEST_UTIL.deleteTable(Bytes.toBytes(TABLE));
+ if (admin.tableExists(TABLE_NAME)) {
+ TEST_UTIL.deleteTable(TABLE_NAME);
}
- HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(TABLE));
+ HTableDescriptor htd = new HTableDescriptor(TABLE);
htd.addFamily(new HColumnDescriptor(CFA));
htd.addFamily(new HColumnDescriptor(CFB));
admin.createTable(htd);
@@ -114,8 +118,8 @@ public class RowResourceBase {
@After
public void afterMethod() throws Exception {
Admin admin = TEST_UTIL.getHBaseAdmin();
- if (admin.tableExists(TableName.valueOf(TABLE))) {
- TEST_UTIL.deleteTable(Bytes.toBytes(TABLE));
+ if (admin.tableExists(TABLE_NAME)) {
+ TEST_UTIL.deleteTable(TABLE_NAME);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
index 75ab0fc..ca3b82f 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
@@ -84,8 +84,8 @@ public class TestStatusResource {
public static void setUpBeforeClass() throws Exception {
conf = TEST_UTIL.getConfiguration();
TEST_UTIL.startMiniCluster(1, 1);
- TEST_UTIL.createTable(Bytes.toBytes("TestStatusResource"), Bytes.toBytes("D"));
- TEST_UTIL.createTable(Bytes.toBytes("TestStatusResource2"), Bytes.toBytes("D"));
+ TEST_UTIL.createTable(TableName.valueOf("TestStatusResource"), Bytes.toBytes("D"));
+ TEST_UTIL.createTable(TableName.valueOf("TestStatusResource2"), Bytes.toBytes("D"));
REST_TEST_UTIL.startServletContainer(conf);
Cluster cluster = new Cluster();
cluster.add("localhost", REST_TEST_UTIL.getServletPort());
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
index e735bb1..919b6ad 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.mapred.RecordReader;
import org.apache.hadoop.mapred.Reporter;
/**
- * A Base for {@link TableInputFormat}s. Receives a {@link HTable}, a
+ * A Base for {@link TableInputFormat}s. Receives a {@link Table}, a
* byte[] of input columns and optionally a {@link Filter}.
* Subclasses may use other TableRecordReader implementations.
*
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 8b74e4e..9b77619 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -433,7 +433,7 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
final Multimap<ByteBuffer, LoadQueueItem> regionGroups) throws IOException {
// atomically bulk load the groups.
Set<Future<List<LoadQueueItem>>> loadingFutures = new HashSet<Future<List<LoadQueueItem>>>();
- for (Entry<ByteBuffer, ? extends Collection<LoadQueueItem>> e: regionGroups.asMap().entrySet()) {
+ for (Entry<ByteBuffer, ? extends Collection<LoadQueueItem>> e: regionGroups.asMap().entrySet()){
final byte[] first = e.getKey().array();
final Collection<LoadQueueItem> lqis = e.getValue();
@@ -854,7 +854,8 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
* Algo:
* 1) Poll on the keys in order:
* a) Keep adding the mapped values to these keys (runningSum)
- * b) Each time runningSum reaches 0, add the start Key from when the runningSum had started to a boundary list.
+ * b) Each time runningSum reaches 0, add the start Key from when the runningSum had started to
+ * a boundary list.
* 2) Return the boundary list.
*/
public static byte[][] inferBoundaries(TreeMap<byte[], Integer> bdryMap) {
@@ -958,8 +959,9 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
Path hfofDir = new Path(dirPath);
- try (HTable table = (HTable) connection.getTable(tableName);) {
- doBulkLoad(hfofDir, table);
+ try (Table table = connection.getTable(tableName);
+ RegionLocator locator = connection.getRegionLocator(tableName)) {
+ doBulkLoad(hfofDir, admin, table, locator);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
index 987b377..b8f2a22 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
@@ -526,7 +526,7 @@ extends InputFormat<ImmutableBytesWritable, Result> {
}
}
//transform the List of bytes to byte[]
- byte result[] = new byte[resultBytesList.size()];
+ byte[] result = new byte[resultBytesList.size()];
for (int k = 0; k < resultBytesList.size(); k++) {
result[k] = (byte) resultBytesList.get(k);
}
@@ -558,7 +558,7 @@ extends InputFormat<ImmutableBytesWritable, Result> {
}
/**
- * Allows subclasses to get the {@link HTable}.
+ * Allows subclasses to get the {@link Table}.
*
* @deprecated use {@link #getTable()}
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
index 643ab0e..957a490 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java
@@ -42,6 +42,7 @@ import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.RegionLocator;
+import org.apache.hadoop.hbase.client.Table;
/**
* Computes size of each region for given table and given column families.
@@ -66,10 +67,11 @@ public class RegionSizeCalculator {
* @deprecated Use {@link #RegionSizeCalculator(RegionLocator, Admin)} instead.
*/
@Deprecated
- public RegionSizeCalculator(HTable table) throws IOException {
+ public RegionSizeCalculator(Table table) throws IOException {
try (Connection conn = ConnectionFactory.createConnection(table.getConfiguration());
+ RegionLocator locator = conn.getRegionLocator(table.getName());
Admin admin = conn.getAdmin()) {
- init(table.getRegionLocator(), admin);
+ init(locator, admin);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
index 0d5b27e..597573a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
@@ -478,7 +478,7 @@ public abstract class HBaseTestCase extends TestCase {
}
/**
- * A class that makes a {@link Incommon} out of a {@link HTable}
+ * A class that makes a {@link Incommon} out of a {@link Table}
*/
public static class HTableIncommon implements Incommon {
final Table table;
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
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 a6d4d77..e8b79a8 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
@@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.Waiter.Predicate;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.BufferedMutator;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Consistency;
@@ -64,6 +65,7 @@ import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnection;
+import org.apache.hadoop.hbase.client.HRegionLocator;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionLocator;
@@ -1262,10 +1264,11 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param family
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[])}
*/
- public HTable createTable(byte[] tableName, byte[] family)
- throws IOException{
- return createTable(TableName.valueOf(tableName), new byte[][]{family});
+ @Deprecated
+ public HTable createTable(byte[] tableName, byte[] family) throws IOException {
+ return createTable(TableName.valueOf(tableName), new byte[][] { family });
}
/**
@@ -1321,7 +1324,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param families
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][])}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[][] families)
throws IOException {
return createTable(tableName, families,
@@ -1364,16 +1369,18 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
return createTable(tableName, families, splitKeys, new Configuration(getConfiguration()));
}
- public HTable createTable(byte[] tableName, byte[][] families,
- int numVersions, byte[] startKey, byte[] endKey, int numRegions) throws IOException {
- return createTable(TableName.valueOf(tableName), families, numVersions,
- startKey, endKey, numRegions);
+ @Deprecated
+ public HTable createTable(byte[] tableName, byte[][] families, int numVersions, byte[] startKey,
+ byte[] endKey, int numRegions) throws IOException {
+ return createTable(TableName.valueOf(tableName), families, numVersions, startKey, endKey,
+ numRegions);
}
- public HTable createTable(String tableName, byte[][] families,
- int numVersions, byte[] startKey, byte[] endKey, int numRegions) throws IOException {
- return createTable(TableName.valueOf(tableName), families, numVersions,
- startKey, endKey, numRegions);
+ @Deprecated
+ public HTable createTable(String tableName, byte[][] families, int numVersions, byte[] startKey,
+ byte[] endKey, int numRegions) throws IOException {
+ return createTable(TableName.valueOf(tableName), families, numVersions, startKey, endKey,
+ numRegions);
}
public HTable createTable(TableName tableName, byte[][] families,
@@ -1452,10 +1459,11 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param c Configuration to use
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][])}
*/
- public HTable createTable(TableName tableName, byte[][] families,
- final Configuration c)
- throws IOException {
+ @Deprecated
+ public HTable createTable(TableName tableName, byte[][] families, final Configuration c)
+ throws IOException {
return createTable(tableName, families, (byte[][]) null, c);
}
@@ -1480,10 +1488,11 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param c Configuration to use
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][])}
*/
- public HTable createTable(byte[] tableName, byte[][] families,
- final Configuration c)
- throws IOException {
+ @Deprecated
+ public HTable createTable(byte[] tableName, byte[][] families, final Configuration c)
+ throws IOException {
HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));
for(byte[] family : families) {
HColumnDescriptor hcd = new HColumnDescriptor(family);
@@ -1505,7 +1514,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param numVersions
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][], int)}
*/
+ @Deprecated
public HTable createTable(TableName tableName, byte[][] families,
final Configuration c, int numVersions)
throws IOException {
@@ -1529,14 +1540,15 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param numVersions
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][], int)}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[][] families,
final Configuration c, int numVersions)
throws IOException {
HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));
- for(byte[] family : families) {
- HColumnDescriptor hcd = new HColumnDescriptor(family)
- .setMaxVersions(numVersions);
+ for (byte[] family : families) {
+ HColumnDescriptor hcd = new HColumnDescriptor(family).setMaxVersions(numVersions);
desc.addFamily(hcd);
}
getHBaseAdmin().createTable(desc);
@@ -1550,7 +1562,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param numVersions
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[], int)}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[] family, int numVersions)
throws IOException {
return createTable(tableName, new byte[][]{family}, numVersions);
@@ -1576,10 +1590,11 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param numVersions
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][], int)}
*/
- public HTable createTable(byte[] tableName, byte[][] families,
- int numVersions)
- throws IOException {
+ @Deprecated
+ public HTable createTable(byte[] tableName, byte[][] families, int numVersions)
+ throws IOException {
return createTable(TableName.valueOf(tableName), families, numVersions);
}
@@ -1591,9 +1606,8 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @return An HTable instance for the created table.
* @throws IOException
*/
- public HTable createTable(TableName tableName, byte[][] families,
- int numVersions)
- throws IOException {
+ public HTable createTable(TableName tableName, byte[][] families, int numVersions)
+ throws IOException {
return createTable(tableName, families, numVersions, (byte[][]) null);
}
@@ -1640,7 +1654,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param blockSize
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][], int, int)}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[][] families,
int numVersions, int blockSize) throws IOException {
return createTable(TableName.valueOf(tableName),
@@ -1678,7 +1694,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param numVersions
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][], int)}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[][] families,
int[] numVersions)
throws IOException {
@@ -1717,7 +1735,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param splitRows
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[], byte[][])}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[] family, byte[][] splitRows)
throws IOException{
return createTable(TableName.valueOf(tableName), family, splitRows);
@@ -1760,7 +1780,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param splitRows
* @return An HTable instance for the created table.
* @throws IOException
+ * @deprecated use {@link #createTable(TableName, byte[][], byte[][])}
*/
+ @Deprecated
public HTable createTable(byte[] tableName, byte[][] families, byte[][] splitRows)
throws IOException {
HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));
@@ -1817,7 +1839,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
/**
* Drop an existing table
* @param tableName existing table
+ * @deprecated use {@link #deleteTable(TableName)}
*/
+ @Deprecated
public void deleteTable(String tableName) throws IOException {
deleteTable(TableName.valueOf(tableName));
}
@@ -1825,7 +1849,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
/**
* Drop an existing table
* @param tableName existing table
+ * @deprecated use {@link #deleteTable(TableName)}
*/
+ @Deprecated
public void deleteTable(byte[] tableName) throws IOException {
deleteTable(TableName.valueOf(tableName));
}
@@ -1870,9 +1896,27 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
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
public HTableDescriptor createTableDescriptor(final String name,
final int minVersions, final int versions, final int ttl, KeepDeletedCells keepDeleted) {
- HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name));
+ return this.createTableDescriptor(TableName.valueOf(name), minVersions, versions, ttl,
+ keepDeleted);
+ }
+
+ /**
+ * Create a table of name <code>name</code>.
+ * @param name Name to give table.
+ * @return Column descriptor.
+ */
+ @Deprecated
+ public HTableDescriptor createTableDescriptor(final String name) {
+ return createTableDescriptor(TableName.valueOf(name), HColumnDescriptor.DEFAULT_MIN_VERSIONS,
+ MAXVERSIONS, HConstants.FOREVER, HColumnDescriptor.DEFAULT_KEEP_DELETED);
+ }
+
+ public HTableDescriptor createTableDescriptor(final TableName name,
+ final int minVersions, final int versions, final int ttl, KeepDeletedCells keepDeleted) {
+ HTableDescriptor htd = new HTableDescriptor(name);
for (byte[] cfName : new byte[][]{ fam1, fam2, fam3 }) {
htd.addFamily(new HColumnDescriptor(cfName)
.setMinVersions(minVersions)
@@ -1890,7 +1934,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param name Name to give table.
* @return Column descriptor.
*/
- public HTableDescriptor createTableDescriptor(final String name) {
+ public HTableDescriptor createTableDescriptor(final TableName name) {
return createTableDescriptor(name, HColumnDescriptor.DEFAULT_MIN_VERSIONS,
MAXVERSIONS, HConstants.FOREVER, HColumnDescriptor.DEFAULT_KEEP_DELETED);
}
@@ -1942,11 +1986,33 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @throws IOException
* @return A region on which you must call
{@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} when done.
+ * @deprecated use
+ * {@link #createLocalHRegion(TableName, byte[], byte[], boolean, Durability, WAL, byte[]...)}
*/
+ @Deprecated
public HRegion createLocalHRegion(byte[] tableName, byte[] startKey, byte[] stopKey,
String callingMethod, Configuration conf, boolean isReadOnly, Durability durability,
WAL wal, byte[]... families) throws IOException {
- HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));
+ return this
+ .createLocalHRegion(TableName.valueOf(tableName), startKey, stopKey, isReadOnly, durability,
+ wal, families);
+ }
+
+ /**
+ * @param tableName
+ * @param startKey
+ * @param stopKey
+ * @param callingMethod
+ * @param conf
+ * @param isReadOnly
+ * @param families
+ * @return A region on which you must call
+ * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} when done.
+ * @throws IOException
+ */
+ public HRegion createLocalHRegion(TableName tableName, byte[] startKey, byte[] stopKey,
+ boolean isReadOnly, Durability durability, WAL wal, byte[]... families) throws IOException {
+ HTableDescriptor htd = new HTableDescriptor(tableName);
htd.setReadOnly(isReadOnly);
for (byte[] family : families) {
HColumnDescriptor hcd = new HColumnDescriptor(family);
@@ -1958,6 +2024,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
HRegionInfo info = new HRegionInfo(htd.getTableName(), startKey, stopKey, false);
return createLocalHRegion(info, htd, wal);
}
+
//
// ==========================================================================
@@ -1967,7 +2034,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* @param tableName existing table
* @return HTable to that new table
* @throws IOException
+ * @deprecated use {@link #deleteTableData(TableName)}
*/
+ @Deprecated
public HTable deleteTableData(byte[] tableName) throws IOException {
return deleteTableData(TableName.valueOf(tableName));
}
@@ -2021,11 +2090,15 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
/**
* Truncate a table using the admin command.
* Effectively disables, deletes, and recreates the table.
- * @param tableName table which must exist.
+ *
+ * @param tableName table which must exist.
* @param preserveRegions keep the existing split points
* @return HTable for the new table
+ * @deprecated use {@link #truncateTable(TableName, boolean)}
*/
- public HTable truncateTable(final byte[] tableName, final boolean preserveRegions) throws IOException {
+ @Deprecated
+ public HTable truncateTable(final byte[] tableName, final boolean preserveRegions)
+ throws IOException {
return truncateTable(TableName.valueOf(tableName), preserveRegions);
}
@@ -2035,11 +2108,14 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
* For previous behavior of issuing row deletes, see
* deleteTableData.
* Expressly does not preserve regions of existing table.
+ *
* @param tableName table which must exist.
* @return HTable for the new table
+ * @deprecated use {@link #truncateTable(TableName)}
*/
+ @Deprecated
public HTable truncateTable(final byte[] tableName) throws IOException {
- return truncateTable(tableName, false);
+ return truncateTable(TableName.valueOf(tableName), false);
}
/**
@@ -2395,7 +2471,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
public List<HRegionInfo> createMultiRegionsInMeta(final Configuration conf,
final HTableDescriptor htd, byte [][] startKeys)
throws IOException {
- Table meta = (HTable) getConnection().getTable(TableName.META_TABLE_NAME);
+ Table meta = getConnection().getTable(TableName.META_TABLE_NAME);
Arrays.sort(startKeys, Bytes.BYTES_COMPARATOR);
List<HRegionInfo> newRegions = new ArrayList<HRegionInfo>(startKeys.length);
MetaTableAccessor
@@ -2455,7 +2531,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
*/
public List<byte[]> getMetaTableRows() throws IOException {
// TODO: Redo using MetaTableAccessor class
- Table t = (HTable) getConnection().getTable(TableName.META_TABLE_NAME);
+ Table t = getConnection().getTable(TableName.META_TABLE_NAME);
List<byte[]> rows = new ArrayList<byte[]>();
ResultScanner s = t.getScanner(new Scan());
for (Result result : s) {
@@ -3510,8 +3586,17 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
}
+ @Deprecated
+ public HTable createRandomTable(String tableName, final Collection<String> families,
+ final int maxVersions, final int numColsPerRow, final int numFlushes, final int numRegions,
+ final int numRowsPerFlush) throws IOException, InterruptedException {
+ return (HTable) this
+ .createRandomTable(TableName.valueOf(tableName), families, maxVersions, numColsPerRow,
+ numFlushes, numRegions, numRowsPerFlush);
+ }
+
/** Creates a random table with the given parameters */
- public HTable createRandomTable(String tableName,
+ public Table createRandomTable(TableName tableName,
final Collection<String> families,
final int maxVersions,
final int numColsPerRow,
@@ -3541,7 +3626,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
final int splitStartKey = actualStartKey + keysPerRegion;
final int splitEndKey = actualEndKey - keysPerRegion;
final String keyFormat = "%08x";
- final HTable table = createTable(tableName, cfBytes,
+ final Table table = createTable(tableName, cfBytes,
maxVersions,
Bytes.toBytes(String.format(keyFormat, splitStartKey)),
Bytes.toBytes(String.format(keyFormat, splitEndKey)),
@@ -3551,6 +3636,8 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
getMiniHBaseCluster().flushcache(TableName.META_TABLE_NAME);
}
+ BufferedMutator mutator = getConnection().getBufferedMutator(tableName);
+
for (int iFlush = 0; iFlush < numFlushes; ++iFlush) {
for (int iRow = 0; iRow < numRowsPerFlush; ++iRow) {
final byte[] row = Bytes.toBytes(String.format(keyFormat,
@@ -3575,19 +3662,20 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
}
if (!put.isEmpty()) {
- table.put(put);
+ mutator.mutate(put);
}
if (!del.isEmpty()) {
- table.delete(del);
+ mutator.mutate(del);
}
}
LOG.info("Initiating flush #" + iFlush + " for table " + tableName);
- table.flushCommits();
+ mutator.flush();
if (hbaseCluster != null) {
getMiniHBaseCluster().flushcache(table.getName());
}
}
+ mutator.close();
return table;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index d5b6a9c..7fd8902 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -91,7 +92,7 @@ public class TestFullLogReconstruction {
*/
@Test (timeout=300000)
public void testReconstruction() throws Exception {
- HTable table = TEST_UTIL.createMultiRegionTable(TABLE_NAME, FAMILY);
+ Table table = TEST_UTIL.createMultiRegionTable(TABLE_NAME, FAMILY);
// Load up the table with simple rows and count them
int initialCount = TEST_UTIL.loadTable(table, FAMILY);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
index b82443b..ab0e6b4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
@@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.RegionLocator;
+import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.Region;
@@ -73,12 +74,12 @@ public class TestGlobalMemStoreSize {
cluster.waitForActiveAndReadyMaster();
// Create a table with regions
- byte [] table = Bytes.toBytes("TestGlobalMemStoreSize");
+ TableName table = TableName.valueOf("TestGlobalMemStoreSize");
byte [] family = Bytes.toBytes("family");
LOG.info("Creating table with " + regionNum + " regions");
- HTable ht = TEST_UTIL.createMultiRegionTable(TableName.valueOf(table), family, regionNum);
+ Table ht = TEST_UTIL.createMultiRegionTable(table, family, regionNum);
int numRegions = -1;
- try (RegionLocator r = ht.getRegionLocator()) {
+ try (RegionLocator r = TEST_UTIL.getConnection().getRegionLocator(table)) {
numRegions = r.getStartKeys().length;
}
assertEquals(regionNum,numRegions);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
index 7135a24..5134a7b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hdfs.MiniDFSCluster;
@@ -65,12 +66,11 @@ public class TestHBaseOnOtherDfsCluster {
// do a simple create/write to ensure the cluster works as expected
byte[] family = Bytes.toBytes("testfamily");
- byte[] tablename = Bytes.toBytes("testtable");
- HTable table = util2.createTable(tablename, family);
+ TableName tablename = TableName.valueOf("testtable");
+ Table table = util2.createTable(tablename, family);
Put p = new Put(new byte[] { 1, 2, 3 });
- p.add(family, null, new byte[] { 1 });
+ p.addColumn(family, null, new byte[] { 1 });
table.put(p);
- table.flushCommits();
// shutdown and make sure cleanly shutting down
util2.shutdownMiniCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
index f78fbe8..479a528 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
@@ -98,9 +98,9 @@ public class TestMetaTableAccessor {
final TableName name =
TableName.valueOf("testRetrying");
LOG.info("Started " + name);
- HTable t = UTIL.createMultiRegionTable(name, HConstants.CATALOG_FAMILY);
+ Table t = UTIL.createMultiRegionTable(name, HConstants.CATALOG_FAMILY);
int regionCount = -1;
- try (RegionLocator r = t.getRegionLocator()) {
+ try (RegionLocator r = UTIL.getConnection().getRegionLocator(name)) {
regionCount = r.getStartKeys().length;
}
// Test it works getting a region from just made user table.
@@ -494,7 +494,7 @@ public class TestMetaTableAccessor {
new byte[][] { Bytes.toBytes("region_a"), Bytes.toBytes("region_b") };
UTIL.createTable(TABLENAME, FAMILY, SPLIT_KEYS);
- HTable table = (HTable) connection.getTable(TABLENAME);
+ Table table = connection.getTable(TABLENAME);
// Make sure all the regions are deployed
UTIL.countRows(table);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
index 02bc3c7..572b72a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.InvalidFamilyOperationException;
import org.apache.hadoop.hbase.MasterNotRunningException;
@@ -86,8 +87,7 @@ public class TestAdmin1 {
TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);
TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);
TEST_UTIL.getConfiguration().setInt("hbase.client.retries.number", 6);
- TEST_UTIL.getConfiguration().setBoolean(
- "hbase.master.enabletable.roundrobin", true);
+ TEST_UTIL.getConfiguration().setBoolean("hbase.master.enabletable.roundrobin", true);
TEST_UTIL.startMiniCluster(3);
}
@@ -104,7 +104,7 @@ public class TestAdmin1 {
@After
public void tearDown() throws Exception {
for (HTableDescriptor htd : this.admin.listTables()) {
- TEST_UTIL.deleteTable(htd.getName());
+ TEST_UTIL.deleteTable(htd.getTableName());
}
}
@@ -362,9 +362,9 @@ public class TestAdmin1 {
TEST_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY).close();
tables = this.admin.listTables();
assertEquals(numTables + 1, tables.length);
- assertTrue("Table must be enabled.", TEST_UTIL.getHBaseCluster()
- .getMaster().getAssignmentManager().getTableStateManager().isTableState(
- tableName, TableState.State.ENABLED));
+ assertTrue("Table must be enabled.",
+ TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager().getTableStateManager()
+ .isTableState(tableName, TableState.State.ENABLED));
assertEquals(TableState.State.ENABLED, getStateFromMeta(tableName));
}
@@ -434,11 +434,11 @@ public class TestAdmin1 {
HTableDescriptor htd = new HTableDescriptor(tableName);
htd.addFamily(fam1);
this.admin.createTable(htd);
- HTable table = (HTable)TEST_UTIL.getConnection().getTable(htd.getTableName());
+ Table table = TEST_UTIL.getConnection().getTable(htd.getTableName());
long ts = this.admin.getLastMajorCompactionTimestamp(tableName);
assertEquals(0, ts);
Put p = new Put(Bytes.toBytes("row1"));
- p.add(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));
+ p.addColumn(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));
table.put(p);
ts = this.admin.getLastMajorCompactionTimestamp(tableName);
// no files written -> no data
@@ -449,12 +449,14 @@ public class TestAdmin1 {
// still 0, we flushed a file, but no major compaction happened
assertEquals(0, ts);
- byte[] regionName =
- table.getRegionLocator().getAllRegionLocations().get(0).getRegionInfo().getRegionName();
+ byte[] regionName;
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(tableName)) {
+ regionName = l.getAllRegionLocations().get(0).getRegionInfo().getRegionName();
+ }
long ts1 = this.admin.getLastMajorCompactionTimestampForRegion(regionName);
assertEquals(ts, ts1);
p = new Put(Bytes.toBytes("row2"));
- p.add(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));
+ p.addColumn(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));
table.put(p);
this.admin.flush(tableName);
ts = this.admin.getLastMajorCompactionTimestamp(tableName);
@@ -623,19 +625,19 @@ public class TestAdmin1 {
"hbase.online.schema.update.enable", true);
}
- @SuppressWarnings("deprecation")
- protected void verifyRoundRobinDistribution(HTable ht, int expectedRegions) throws IOException {
- int numRS = ht.getConnection().getCurrentNrHRS();
- Map<HRegionInfo, ServerName> regions = ht.getRegionLocations();
+ protected void verifyRoundRobinDistribution(ClusterConnection c, RegionLocator regionLocator, int
+ expectedRegions) throws IOException {
+ int numRS = c.getCurrentNrHRS();
+ List<HRegionLocation> regions = regionLocator.getAllRegionLocations();
Map<ServerName, List<HRegionInfo>> server2Regions = new HashMap<ServerName, List<HRegionInfo>>();
- for (Map.Entry<HRegionInfo, ServerName> entry : regions.entrySet()) {
- ServerName server = entry.getValue();
+ for (HRegionLocation loc : regions) {
+ ServerName server = loc.getServerName();
List<HRegionInfo> regs = server2Regions.get(server);
if (regs == null) {
regs = new ArrayList<HRegionInfo>();
server2Regions.put(server, regs);
}
- regs.add(entry.getKey());
+ regs.add(loc.getRegionInfo());
}
if (numRS >= 2) {
// Ignore the master region server,
@@ -656,28 +658,29 @@ public class TestAdmin1 {
HTableDescriptor desc = new HTableDescriptor(tableName);
desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(desc);
- HTable ht = (HTable) TEST_UTIL.getConnection().getTable(tableName);
- Map<HRegionInfo, ServerName> regions = ht.getRegionLocations();
- assertEquals("Table should have only 1 region", 1, regions.size());
- ht.close();
+ List<HRegionLocation> regions;
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(tableName)) {
+ regions = l.getAllRegionLocations();
+ assertEquals("Table should have only 1 region", 1, regions.size());
+ }
TableName TABLE_2 = TableName.valueOf(tableName.getNameAsString() + "_2");
desc = new HTableDescriptor(TABLE_2);
desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(desc, new byte[][]{new byte[]{42}});
- HTable ht2 = (HTable) TEST_UTIL.getConnection().getTable(TABLE_2);
- regions = ht2.getRegionLocations();
- assertEquals("Table should have only 2 region", 2, regions.size());
- ht2.close();
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(TABLE_2)) {
+ regions = l.getAllRegionLocations();
+ assertEquals("Table should have only 2 region", 2, regions.size());
+ }
TableName TABLE_3 = TableName.valueOf(tableName.getNameAsString() + "_3");
desc = new HTableDescriptor(TABLE_3);
desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(desc, "a".getBytes(), "z".getBytes(), 3);
- HTable ht3 = (HTable) TEST_UTIL.getConnection().getTable(TABLE_3);
- regions = ht3.getRegionLocations();
- assertEquals("Table should have only 3 region", 3, regions.size());
- ht3.close();
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(TABLE_3)) {
+ regions = l.getAllRegionLocations();
+ assertEquals("Table should have only 3 region", 3, regions.size());
+ }
TableName TABLE_4 = TableName.valueOf(tableName.getNameAsString() + "_4");
desc = new HTableDescriptor(TABLE_4);
@@ -692,11 +695,11 @@ public class TestAdmin1 {
TableName TABLE_5 = TableName.valueOf(tableName.getNameAsString() + "_5");
desc = new HTableDescriptor(TABLE_5);
desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
- admin.createTable(desc, new byte[] {1}, new byte[] {127}, 16);
- HTable ht5 = (HTable) TEST_UTIL.getConnection().getTable(TABLE_5);
- regions = ht5.getRegionLocations();
- assertEquals("Table should have 16 region", 16, regions.size());
- ht5.close();
+ admin.createTable(desc, new byte[] { 1 }, new byte[] { 127 }, 16);
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(TABLE_5)) {
+ regions = l.getAllRegionLocations();
+ assertEquals("Table should have 16 region", 16, regions.size());
+ }
}
@Test (timeout=300000)
@@ -724,47 +727,53 @@ public class TestAdmin1 {
boolean tableAvailable = admin.isTableAvailable(tableName, splitKeys);
assertTrue("Table should be created with splitKyes + 1 rows in META", tableAvailable);
- HTable ht = (HTable) TEST_UTIL.getConnection().getTable(tableName);
- Map<HRegionInfo, ServerName> regions = ht.getRegionLocations();
- assertEquals("Tried to create " + expectedRegions + " regions " +
- "but only found " + regions.size(),
- expectedRegions, regions.size());
- System.err.println("Found " + regions.size() + " regions");
-
- Iterator<HRegionInfo> hris = regions.keySet().iterator();
- HRegionInfo hri = hris.next();
- assertTrue(hri.getStartKey() == null || hri.getStartKey().length == 0);
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[0]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[0]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[1]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[1]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[2]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[2]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[3]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[3]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[4]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[4]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[5]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[5]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[6]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[6]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[7]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[7]));
- assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[8]));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[8]));
- assertTrue(hri.getEndKey() == null || hri.getEndKey().length == 0);
-
- verifyRoundRobinDistribution(ht, expectedRegions);
- ht.close();
+ List<HRegionLocation> regions;
+ Iterator<HRegionLocation> hris;
+ HRegionInfo hri;
+ ClusterConnection conn = (ClusterConnection) TEST_UTIL.getConnection();
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(tableName)) {
+ regions = l.getAllRegionLocations();
+
+ assertEquals("Tried to create " + expectedRegions + " regions " +
+ "but only found " + regions.size(), expectedRegions, regions.size());
+ System.err.println("Found " + regions.size() + " regions");
+
+ hris = regions.iterator();
+ hri = hris.next().getRegionInfo();
+ assertTrue(hri.getStartKey() == null || hri.getStartKey().length == 0);
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[0]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[0]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[1]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[1]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[2]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[2]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[3]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[3]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[4]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[4]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[5]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[5]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[6]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[6]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[7]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[7]));
+ assertTrue(Bytes.equals(hri.getEndKey(), splitKeys[8]));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[8]));
+ assertTrue(hri.getEndKey() == null || hri.getEndKey().length == 0);
+
+ verifyRoundRobinDistribution(conn, l, expectedRegions);
+ }
+
+
// Now test using start/end with a number of regions
@@ -784,47 +793,46 @@ public class TestAdmin1 {
admin = TEST_UTIL.getHBaseAdmin();
admin.createTable(desc, startKey, endKey, expectedRegions);
- HTable ht2 = (HTable) TEST_UTIL.getConnection().getTable(TABLE_2);
- regions = ht2.getRegionLocations();
- assertEquals("Tried to create " + expectedRegions + " regions " +
- "but only found " + regions.size(),
- expectedRegions, regions.size());
- System.err.println("Found " + regions.size() + " regions");
-
- hris = regions.keySet().iterator();
- hri = hris.next();
- assertTrue(hri.getStartKey() == null || hri.getStartKey().length == 0);
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {1,1,1,1,1,1,1,1,1,1}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {1,1,1,1,1,1,1,1,1,1}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {2,2,2,2,2,2,2,2,2,2}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {2,2,2,2,2,2,2,2,2,2}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {3,3,3,3,3,3,3,3,3,3}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {3,3,3,3,3,3,3,3,3,3}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {4,4,4,4,4,4,4,4,4,4}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {4,4,4,4,4,4,4,4,4,4}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {5,5,5,5,5,5,5,5,5,5}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {5,5,5,5,5,5,5,5,5,5}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {6,6,6,6,6,6,6,6,6,6}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {6,6,6,6,6,6,6,6,6,6}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {7,7,7,7,7,7,7,7,7,7}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {7,7,7,7,7,7,7,7,7,7}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {8,8,8,8,8,8,8,8,8,8}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {8,8,8,8,8,8,8,8,8,8}));
- assertTrue(Bytes.equals(hri.getEndKey(), new byte [] {9,9,9,9,9,9,9,9,9,9}));
- hri = hris.next();
- assertTrue(Bytes.equals(hri.getStartKey(), new byte [] {9,9,9,9,9,9,9,9,9,9}));
- assertTrue(hri.getEndKey() == null || hri.getEndKey().length == 0);
-
- verifyRoundRobinDistribution(ht2, expectedRegions);
- ht2.close();
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(TABLE_2)) {
+ regions = l.getAllRegionLocations();
+ assertEquals("Tried to create " + expectedRegions + " regions " +
+ "but only found " + regions.size(), expectedRegions, regions.size());
+ System.err.println("Found " + regions.size() + " regions");
+
+ hris = regions.iterator();
+ hri = hris.next().getRegionInfo();
+ assertTrue(hri.getStartKey() == null || hri.getStartKey().length == 0);
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }));
+ assertTrue(Bytes.equals(hri.getEndKey(), new byte[] { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9 }));
+ hri = hris.next().getRegionInfo();
+ assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9 }));
+ assertTrue(hri.getEndKey() == null || hri.getEndKey().length == 0);
+
+ verifyRoundRobinDistribution(conn, l, expectedRegions);
+ }
// Try once more with something that divides into something infinite
@@ -841,15 +849,14 @@ public class TestAdmin1 {
admin.createTable(desc, startKey, endKey, expectedRegions);
- HTable ht3 = (HTable) TEST_UTIL.getConnection().getTable(TABLE_3);
- regions = ht3.getRegionLocations();
- assertEquals("Tried to create " + expectedRegions + " regions " +
- "but only found " + regions.size(),
- expectedRegions, regions.size());
- System.err.println("Found " + regions.size() + " regions");
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(TABLE_3)) {
+ regions = l.getAllRegionLocations();
+ assertEquals("Tried to create " + expectedRegions + " regions " +
+ "but only found " + regions.size(), expectedRegions, regions.size());
+ System.err.println("Found " + regions.size() + " regions");
- verifyRoundRobinDistribution(ht3, expectedRegions);
- ht3.close();
+ verifyRoundRobinDistribution(conn, l, expectedRegions);
+ }
// Try an invalid case where there are duplicate split keys
@@ -962,20 +969,22 @@ public class TestAdmin1 {
HTableDescriptor desc = new HTableDescriptor(tableName);
desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(desc, splitKeys);
- HTable ht = (HTable) TEST_UTIL.getConnection().getTable(tableName);
- Map<HRegionInfo, ServerName> regions = ht.getRegionLocations();
- assertEquals("Tried to create " + expectedRegions + " regions "
- + "but only found " + regions.size(), expectedRegions, regions.size());
- // Disable table.
- admin.disableTable(tableName);
- // Enable table, use retain assignment to assign regions.
- admin.enableTable(tableName);
- Map<HRegionInfo, ServerName> regions2 = ht.getRegionLocations();
-
- // Check the assignment.
- assertEquals(regions.size(), regions2.size());
- for (Map.Entry<HRegionInfo, ServerName> entry : regions.entrySet()) {
- assertEquals(regions2.get(entry.getKey()), entry.getValue());
+
+ try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(tableName)) {
+ List<HRegionLocation> regions = l.getAllRegionLocations();
+
+ assertEquals(
+ "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size(),
+ expectedRegions, regions.size());
+ // Disable table.
+ admin.disableTable(tableName);
+ // Enable table, use retain assignment to assign regions.
+ admin.enableTable(tableName);
+ List<HRegionLocation> regions2 = l.getAllRegionLocations();
+
+ // Check the assignment.
+ assertEquals(regions.size(), regions2.size());
+ assertTrue(regions2.containsAll(regions));
}
}
@@ -1022,133 +1031,132 @@ public class TestAdmin1 {
sb.append("_").append(Integer.toString(rowCounts[i]));
}
assertFalse(admin.tableExists(tableName));
- final HTable table = TEST_UTIL.createTable(tableName, familyNames,
+ try(final Table table = TEST_UTIL.createTable(tableName, familyNames,
numVersions, blockSize);
+ final RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName)) {
+
+ int rowCount = 0;
+ byte[] q = new byte[0];
+
+ // insert rows into column families. The number of rows that have values
+ // in a specific column family is decided by rowCounts[familyIndex]
+ for (int index = 0; index < familyNames.length; index++) {
+ ArrayList<Put> puts = new ArrayList<Put>(rowCounts[index]);
+ for (int i = 0; i < rowCounts[index]; i++) {
+ byte[] k = Bytes.toBytes(i);
+ Put put = new Put(k);
+ put.addColumn(familyNames[index], q, k);
+ puts.add(put);
+ }
+ table.put(puts);
- int rowCount = 0;
- byte[] q = new byte[0];
-
- // insert rows into column families. The number of rows that have values
- // in a specific column family is decided by rowCounts[familyIndex]
- for (int index = 0; index < familyNames.length; index++) {
- ArrayList<Put> puts = new ArrayList<Put>(rowCounts[index]);
- for (int i = 0; i < rowCounts[index]; i++) {
- byte[] k = Bytes.toBytes(i);
- Put put = new Put(k);
- put.add(familyNames[index], q, k);
- puts.add(put);
+ if (rowCount < rowCounts[index]) {
+ rowCount = rowCounts[index];
+ }
}
- table.put(puts);
- if ( rowCount < rowCounts[index] ) {
- rowCount = rowCounts[index];
+ // get the initial layout (should just be one region)
+ List<HRegionLocation> m = locator.getAllRegionLocations();
+ LOG.info("Initial regions (" + m.size() + "): " + m);
+ assertTrue(m.size() == 1);
+
+ // Verify row count
+ Scan scan = new Scan();
+ ResultScanner scanner = table.getScanner(scan);
+ int rows = 0;
+ for (@SuppressWarnings("unused") Result result : scanner) {
+ rows++;
}
- }
-
- // get the initial layout (should just be one region)
- Map<HRegionInfo, ServerName> m = table.getRegionLocations();
- LOG.info("Initial regions (" + m.size() + "): " + m);
- assertTrue(m.size() == 1);
-
- // Verify row count
- Scan scan = new Scan();
- ResultScanner scanner = table.getScanner(scan);
- int rows = 0;
- for(@SuppressWarnings("unused") Result result : scanner) {
- rows++;
- }
- scanner.close();
- assertEquals(rowCount, rows);
-
- // Have an outstanding scan going on to make sure we can scan over splits.
- scan = new Scan();
- scanner = table.getScanner(scan);
- // Scan first row so we are into first region before split happens.
- scanner.next();
-
- // Split the table
- this.admin.split(tableName, splitPoint);
-
- final AtomicInteger count = new AtomicInteger(0);
- Thread t = new Thread("CheckForSplit") {
- @Override
- public void run() {
- for (int i = 0; i < 45; i++) {
- try {
- sleep(1000);
- } catch (InterruptedException e) {
- continue;
+ scanner.close();
+ assertEquals(rowCount, rows);
+
+ // Have an outstanding scan going on to make sure we can scan over splits.
+ scan = new Scan();
+ scanner = table.getScanner(scan);
+ // Scan first row so we are into first region before split happens.
+ scanner.next();
+
+ // Split the table
+ this.admin.split(tableName, splitPoint);
+
+ final AtomicInteger count = new AtomicInteger(0);
+ Thread t = new Thread("CheckForSplit") {
+ @Override
+ public void run() {
+ for (int i = 0; i < 45; i++) {
+ try {
+ sleep(1000);
+ } catch (InterruptedException e) {
+ continue;
+ }
+ // check again
+ List<HRegionLocation> regions = null;
+ try {
+ regions = locator.getAllRegionLocations();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ if (regions == null)
+ continue;
+ count.set(regions.size());
+ if (count.get() >= 2) {
+ LOG.info("Found: " + regions);
+ break;
+ }
+ LOG.debug("Cycle waiting on split");
}
- // check again table = new HTable(conf, tableName);
- Map<HRegionInfo, ServerName> regions = null;
- try {
- regions = table.getRegionLocations();
- } catch (IOException e) {
- e.printStackTrace();
- }
- if (regions == null) continue;
- count.set(regions.size());
- if (count.get() >= 2) {
- LOG.info("Found: " + regions);
- break;
- }
- LOG.debug("Cycle waiting on split");
+ LOG.debug("CheckForSplit thread exited, current region count: " + count.get());
+ }
+ };
+ t.setPriority(Thread.NORM_PRIORITY - 2);
+ t.start();
+ t.join();
+
+ // Verify row count
+ rows = 1; // We counted one row above.
+ for (@SuppressWarnings("unused") Result result : scanner) {
+ rows++;
+ if (rows > rowCount) {
+ scanner.close();
+ assertTrue("Scanned more than expected (" + rowCount + ")", false);
}
- LOG.debug("CheckForSplit thread exited, current region count: " + count.get());
- }
- };
- t.setPriority(Thread.NORM_PRIORITY - 2);
- t.start();
- t.join();
-
- // Verify row count
- rows = 1; // We counted one row above.
- for (@SuppressWarnings("unused") Result result : scanner) {
- rows++;
- if (rows > rowCount) {
- scanner.close();
- assertTrue("Scanned more than expected (" + rowCount + ")", false);
}
- }
- scanner.close();
- assertEquals(rowCount, rows);
+ scanner.close();
+ assertEquals(rowCount, rows);
- Map<HRegionInfo, ServerName> regions = null;
- try {
- regions = table.getRegionLocations();
- } catch (IOException e) {
- e.printStackTrace();
- }
- assertEquals(2, regions.size());
- Set<HRegionInfo> hRegionInfos = regions.keySet();
- HRegionInfo[] r = hRegionInfos.toArray(new HRegionInfo[hRegionInfos.size()]);
- if (splitPoint != null) {
- // make sure the split point matches our explicit configuration
- assertEquals(Bytes.toString(splitPoint),
- Bytes.toString(r[0].getEndKey()));
- assertEquals(Bytes.toString(splitPoint),
- Bytes.toString(r[1].getStartKey()));
- LOG.debug("Properly split on " + Bytes.toString(splitPoint));
- } else {
- if (familyNames.length > 1) {
- int splitKey = Bytes.toInt(r[0].getEndKey());
- // check if splitKey is based on the largest column family
- // in terms of it store size
- int deltaForLargestFamily = Math.abs(rowCount/2 - splitKey);
- LOG.debug("SplitKey=" + splitKey + "&deltaForLargestFamily=" + deltaForLargestFamily +
- ", r=" + r[0]);
- for (int index = 0; index < familyNames.length; index++) {
- int delta = Math.abs(rowCounts[index]/2 - splitKey);
- if (delta < deltaForLargestFamily) {
- assertTrue("Delta " + delta + " for family " + index
- + " should be at least deltaForLargestFamily " + deltaForLargestFamily,
- false);
+ List<HRegionLocation> regions = null;
+ try {
+ regions = locator.getAllRegionLocations();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ assertEquals(2, regions.size());
+ if (splitPoint != null) {
+ // make sure the split point matches our explicit configuration
+ assertEquals(Bytes.toString(splitPoint),
+ Bytes.toString(regions.get(0).getRegionInfo().getEndKey()));
+ assertEquals(Bytes.toString(splitPoint),
+ Bytes.toString(regions.get(1).getRegionInfo().getStartKey()));
+ LOG.debug("Properly split on " + Bytes.toString(splitPoint));
+ } else {
+ if (familyNames.length > 1) {
+ int splitKey = Bytes.toInt(regions.get(0).getRegionInfo().getEndKey());
+ // check if splitKey is based on the largest column family
+ // in terms of it store size
+ int deltaForLargestFamily = Math.abs(rowCount / 2 - splitKey);
+ LOG.debug("SplitKey=" + splitKey + "&deltaForLargestFamily=" + deltaForLargestFamily +
+ ", r=" + regions.get(0).getRegionInfo());
+ for (int index = 0; index < familyNames.length; index++) {
+ int delta = Math.abs(rowCounts[index] / 2 - splitKey);
+ if (delta < deltaForLargestFamily) {
+ assertTrue("Delta " + delta + " for family " + index + " should be at least "
+ + "deltaForLargestFamily " + deltaForLargestFamily, false);
+ }
}
}
}
+ TEST_UTIL.deleteTable(tableName);
}
- TEST_UTIL.deleteTable(tableName);
- table.close();
}
@Test
@@ -1173,7 +1181,7 @@ public class TestAdmin1 {
Thread.sleep(10);
} while (oldRegions.size() != 9); //3 regions * 3 replicas
// write some data to the table
- HTable ht = (HTable) TEST_UTIL.getConnection().getTable(tableName);
+ Table ht = TEST_UTIL.getConnection().getTable(tableName);
List<Put> puts = new ArrayList<Put>();
byte[] qualifier = "c".getBytes();
Put put = new Put(new byte[]{(byte)'1'});
@@ -1186,7 +1194,6 @@ public class TestAdmin1 {
put.add(cf, qualifier, "100".getBytes());
puts.add(put);
ht.put(puts);
- ht.flushCommits();
ht.close();
List<Pair<HRegionInfo, ServerName>> regions =
MetaTableAccessor.getTableRegionsAndLocations(TEST_UTIL.getConnection(), tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
index b121c37..5a95d61 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
@@ -104,7 +104,7 @@ public class TestAdmin2 {
@After
public void tearDown() throws Exception {
for (HTableDescriptor htd : this.admin.listTables()) {
- TEST_UTIL.deleteTable(htd.getName());
+ TEST_UTIL.deleteTable(htd.getTableName());
}
}
@@ -693,15 +693,17 @@ public class TestAdmin2 {
final TableName tableName = TableName.valueOf("testGetRegion");
LOG.info("Started " + tableName);
- HTable t = TEST_UTIL.createMultiRegionTable(tableName, HConstants.CATALOG_FAMILY);
-
- HRegionLocation regionLocation = t.getRegionLocation("mmm");
- HRegionInfo region = regionLocation.getRegionInfo();
- byte[] regionName = region.getRegionName();
- Pair<HRegionInfo, ServerName> pair = rawAdmin.getRegion(regionName);
- assertTrue(Bytes.equals(regionName, pair.getFirst().getRegionName()));
- pair = rawAdmin.getRegion(region.getEncodedNameAsBytes());
- assertTrue(Bytes.equals(regionName, pair.getFirst().getRegionName()));
+ Table t = TEST_UTIL.createMultiRegionTable(tableName, HConstants.CATALOG_FAMILY);
+
+ try (RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName)) {
+ HRegionLocation regionLocation = locator.getRegionLocation(Bytes.toBytes("mmm"));
+ HRegionInfo region = regionLocation.getRegionInfo();
+ byte[] regionName = region.getRegionName();
+ Pair<HRegionInfo, ServerName> pair = rawAdmin.getRegion(regionName);
+ assertTrue(Bytes.equals(regionName, pair.getFirst().getRegionName()));
+ pair = rawAdmin.getRegion(region.getEncodedNameAsBytes());
+ assertTrue(Bytes.equals(regionName, pair.getFirst().getRegionName()));
+ }
}
@Test(timeout = 30000)
http://git-wip-us.apache.org/repos/asf/hbase/blob/b5b58530/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
index ae8a449..b68381f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
@@ -57,7 +57,7 @@ public class TestCheckAndMutate {
final TableName tableName = TableName.valueOf("TestPutWithDelete");
final byte[] rowKey = Bytes.toBytes("12345");
final byte[] family = Bytes.toBytes("cf");
- HTable table = TEST_UTIL.createTable(tableName, family);
+ Table table = TEST_UTIL.createTable(tableName, family);
TEST_UTIL.waitTableAvailable(tableName.getName(), 5000);
try {
// put one row
@@ -79,11 +79,11 @@ public class TestCheckAndMutate {
// put the same row again with C column deleted
RowMutations rm = new RowMutations(rowKey);
put = new Put(rowKey);
- put.add(family, Bytes.toBytes("A"), Bytes.toBytes("a"));
- put.add(family, Bytes.toBytes("B"), Bytes.toBytes("b"));
+ put.addColumn(family, Bytes.toBytes("A"), Bytes.toBytes("a"));
+ put.addColumn(family, Bytes.toBytes("B"), Bytes.toBytes("b"));
rm.add(put);
Delete del = new Delete(rowKey);
- del.deleteColumn(family, Bytes.toBytes("C"));
+ del.addColumn(family, Bytes.toBytes("C"));
rm.add(del);
boolean res = table.checkAndMutate(rowKey, family, Bytes.toBytes("A"), CompareFilter.CompareOp.EQUAL,
Bytes.toBytes("a"), rm);