Repository: hbase Updated Branches: refs/heads/branch-1 8dccea9dd -> 6152b2b86
HBASE-12876 TestScannerWithBulkload should pass Table with unmanaged connection to LoadIncrementalHFiles#doBulkLoad() Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6152b2b8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6152b2b8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6152b2b8 Branch: refs/heads/branch-1 Commit: 6152b2b86fe216fa8699174f8d7ec54cbdb66b6c Parents: 8dccea9 Author: tedyu <[email protected]> Authored: Wed Jan 21 11:21:41 2015 -0800 Committer: tedyu <[email protected]> Committed: Wed Jan 21 11:21:41 2015 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/TestScannerWithBulkload.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6152b2b8/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java index 8e3ca88..552f809 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -164,7 +165,8 @@ public class TestScannerWithBulkload { } private HTable init(HBaseAdmin admin, long l, Scan scan, TableName tableName) throws Exception { - HTable table = new HTable(TEST_UTIL.getConfiguration(), tableName); + Connection connection = TEST_UTIL.getConnection(); + HTable table = (HTable) connection.getTable(tableName); Put put0 = new Put(Bytes.toBytes("row1")); put0.add(new KeyValue(Bytes.toBytes("row1"), Bytes.toBytes("col"), Bytes.toBytes("q"), l, Bytes .toBytes("version0")));
