hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [6/8] HBASE-11679 Replace HTable with HTableInterface where backwards-compatible (Carter)
Date Tue, 09 Sep 2014 18:53:58 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 0916e38..3b53c0a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -184,7 +184,7 @@ public class TestFromClientSide {
      desc.addFamily(hcd);
      TEST_UTIL.getHBaseAdmin().createTable(desc);
      Configuration c = TEST_UTIL.getConfiguration();
-     HTable h = new HTable(c, TABLENAME);
+     Table h = new HTable(c, TABLENAME);
 
      long ts = System.currentTimeMillis();
      Put p = new Put(T1, ts);
@@ -244,7 +244,7 @@ public class TestFromClientSide {
      final byte[] COLUMN = Bytes.toBytes("column");
      final byte[] VALUE = Bytes.toBytes("value");
 
-     HTable table = TEST_UTIL.createTable(TABLENAME, FAMILY);
+     Table table = TEST_UTIL.createTable(TABLENAME, FAMILY);
 
      // future timestamp
      long ts = System.currentTimeMillis() * 2;
@@ -386,7 +386,7 @@ public class TestFromClientSide {
     byte[] TABLE = Bytes.toBytes("testGetConfiguration");
     byte[][] FAMILIES = new byte[][] { Bytes.toBytes("foo") };
     Configuration conf = TEST_UTIL.getConfiguration();
-    HTable table = TEST_UTIL.createTable(TABLE, FAMILIES, conf);
+    Table table = TEST_UTIL.createTable(TABLE, FAMILIES, conf);
     assertSame(conf, table.getConfiguration());
   }
 
@@ -415,7 +415,7 @@ public class TestFromClientSide {
     putRows(ht, 3, value2, keyPrefix1);
     putRows(ht, 3, value2, keyPrefix2);
     putRows(ht, 3, value2, keyPrefix3);
-    HTable table = new HTable(TEST_UTIL.getConfiguration(), TABLE);
+    Table table = new HTable(TEST_UTIL.getConfiguration(), TABLE);
     System.out.println("Checking values for key: " + keyPrefix1);
     assertEquals("Got back incorrect number of rows from scan", 3,
         getNumberOfRows(keyPrefix1, value2, table));
@@ -442,7 +442,7 @@ public class TestFromClientSide {
       getNumberOfRows(keyPrefix2, value2, table));
   }
 
-  private void deleteColumns(HTable ht, String value, String keyPrefix)
+  private void deleteColumns(Table ht, String value, String keyPrefix)
   throws IOException {
     ResultScanner scanner = buildScanner(keyPrefix, value, ht);
     Iterator<Result> it = scanner.iterator();
@@ -457,7 +457,7 @@ public class TestFromClientSide {
     assertEquals("Did not perform correct number of deletes", 3, count);
   }
 
-  private int getNumberOfRows(String keyPrefix, String value, HTable ht)
+  private int getNumberOfRows(String keyPrefix, String value, Table ht)
       throws Exception {
     ResultScanner resultScanner = buildScanner(keyPrefix, value, ht);
     Iterator<Result> scanner = resultScanner.iterator();
@@ -474,7 +474,7 @@ public class TestFromClientSide {
     return numberOfResults;
   }
 
-  private ResultScanner buildScanner(String keyPrefix, String value, HTable ht)
+  private ResultScanner buildScanner(String keyPrefix, String value, Table ht)
       throws IOException {
     // OurFilterList allFilters = new OurFilterList();
     FilterList allFilters = new FilterList(/* FilterList.Operator.MUST_PASS_ALL */);
@@ -500,7 +500,7 @@ public class TestFromClientSide {
     return ht.getScanner(scan);
   }
 
-  private void putRows(HTable ht, int numRows, String value, String key)
+  private void putRows(Table ht, int numRows, String value, String key)
       throws IOException {
     for (int i = 0; i < numRows; i++) {
       String row = key + "_" + UUID.randomUUID().toString();
@@ -614,7 +614,7 @@ public class TestFromClientSide {
    * @return Count of rows in table.
    * @throws IOException
    */
-  private int countRows(final HTable t, final Scan s)
+  private int countRows(final Table t, final Scan s)
   throws IOException {
     // Assert all rows in table.
     ResultScanner scanner = t.getScanner(s);
@@ -627,7 +627,7 @@ public class TestFromClientSide {
     return count;
   }
 
-  private void assertRowCount(final HTable t, final int expected)
+  private void assertRowCount(final Table t, final int expected)
   throws IOException {
     assertEquals(expected, countRows(t, new Scan()));
   }
@@ -675,7 +675,7 @@ public class TestFromClientSide {
   @Test
   public void testSuperSimple() throws Exception {
     byte [] TABLE = Bytes.toBytes("testSuperSimple");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     Put put = new Put(ROW);
     put.add(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
@@ -692,7 +692,7 @@ public class TestFromClientSide {
     byte [] TABLE = Bytes.toBytes("testMaxKeyValueSize");
     Configuration conf = TEST_UTIL.getConfiguration();
     String oldMaxSize = conf.get("hbase.client.keyvalue.maxsize");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte[] value = new byte[4 * 1024 * 1024];
     Put put = new Put(ROW);
     put.add(FAMILY, QUALIFIER, value);
@@ -712,7 +712,7 @@ public class TestFromClientSide {
   @Test
   public void testFilters() throws Exception {
     byte [] TABLE = Bytes.toBytes("testFilters");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte [][] ROWS = makeN(ROW, 10);
     byte [][] QUALIFIERS = {
         Bytes.toBytes("col0-<d2v1>-<d3v2>"), Bytes.toBytes("col1-<d2v1>-<d3v2>"),
@@ -748,7 +748,7 @@ public class TestFromClientSide {
   @Test
   public void testKeyOnlyFilter() throws Exception {
     byte [] TABLE = Bytes.toBytes("testKeyOnlyFilter");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte [][] ROWS = makeN(ROW, 10);
     byte [][] QUALIFIERS = {
         Bytes.toBytes("col0-<d2v1>-<d3v2>"), Bytes.toBytes("col1-<d2v1>-<d3v2>"),
@@ -785,7 +785,7 @@ public class TestFromClientSide {
   @Test
   public void testSimpleMissing() throws Exception {
     byte [] TABLE = Bytes.toBytes("testSimpleMissing");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte [][] ROWS = makeN(ROW, 4);
 
     // Try to get a row on an empty table
@@ -901,7 +901,7 @@ public class TestFromClientSide {
     byte [][] QUALIFIERS = makeN(QUALIFIER, 10);
     byte [][] VALUES = makeN(VALUE, 10);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES);
 
     Get get;
     Scan scan;
@@ -1210,7 +1210,7 @@ public class TestFromClientSide {
       fail("Creating a table with a null family passed, should fail");
     } catch(Exception e) {}
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
 
     // Null row (should NOT work)
     try {
@@ -1309,7 +1309,7 @@ public class TestFromClientSide {
     long [] STAMPS = makeStamps(20);
     byte [][] VALUES = makeNAscii(VALUE, 20);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Insert 4 versions of same column
     Put put = new Put(ROW);
@@ -1523,7 +1523,7 @@ public class TestFromClientSide {
     int [] LIMITS = {1,3,5};
     long [] STAMPS = makeStamps(10);
     byte [][] VALUES = makeNAscii(VALUE, 10);
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, LIMITS);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, LIMITS);
 
     // Insert limit + 1 on each family
     Put put = new Put(ROW);
@@ -1719,7 +1719,7 @@ public class TestFromClientSide {
     byte [][] VALUES = makeN(VALUE, 5);
     long [] ts = {1000, 2000, 3000, 4000, 5000};
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 5);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 5);
 
     Put put = new Put(ROW);
     for (int q = 0; q < 1; q++)
@@ -1758,7 +1758,7 @@ public class TestFromClientSide {
     long [] ts = {1000, 2000, 3000, 4000, 5000};
 
     HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 5);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 5);
     Put put = null;
     Result result = null;
     Get get = null;
@@ -1873,7 +1873,7 @@ public class TestFromClientSide {
     byte [][] VALUES = makeN(VALUE, 5);
     long [] ts = {1000, 2000, 3000, 4000, 5000};
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, 3);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, 3);
 
     Put put = new Put(ROW);
     put.add(FAMILIES[0], QUALIFIER, ts[0], VALUES[0]);
@@ -2240,7 +2240,7 @@ public class TestFromClientSide {
     byte [][] ROWS = makeN(ROW, numRows);
     byte [][] QUALIFIERS = makeN(QUALIFIER, numColsPerRow);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
 
     // Insert rows
 
@@ -2323,7 +2323,7 @@ public class TestFromClientSide {
     byte [][] VALUES = makeNAscii(VALUE, 7);
     long [] STAMPS = makeStamps(7);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Insert three versions
 
@@ -2387,7 +2387,7 @@ public class TestFromClientSide {
     byte [][] VALUES = makeNAscii(VALUE, 7);
     long [] STAMPS = makeStamps(7);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Insert lots versions
 
@@ -2434,7 +2434,7 @@ public class TestFromClientSide {
 
     byte [] TABLE = Bytes.toBytes("testJiraTest1014");
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     long manualStamp = 12345;
 
@@ -2461,7 +2461,7 @@ public class TestFromClientSide {
     byte [][] VALUES = makeNAscii(VALUE, 7);
     long [] STAMPS = makeStamps(7);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Insert lots versions
 
@@ -2504,7 +2504,7 @@ public class TestFromClientSide {
     byte [][] VALUES = makeNAscii(VALUE, 7);
     long [] STAMPS = makeStamps(7);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Insert lots versions
 
@@ -2533,7 +2533,7 @@ public class TestFromClientSide {
   // Bulk Testers
   //
 
-  private void getVersionRangeAndVerifyGreaterThan(HTable ht, byte [] row,
+  private void getVersionRangeAndVerifyGreaterThan(Table ht, byte [] row,
       byte [] family, byte [] qualifier, long [] stamps, byte [][] values,
       int start, int end)
   throws IOException {
@@ -2545,7 +2545,7 @@ public class TestFromClientSide {
     assertNResult(result, row, family, qualifier, stamps, values, start+1, end);
   }
 
-  private void getVersionRangeAndVerify(HTable ht, byte [] row, byte [] family,
+  private void getVersionRangeAndVerify(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long [] stamps, byte [][] values, int start, int end)
   throws IOException {
     Get get = new Get(row);
@@ -2556,7 +2556,7 @@ public class TestFromClientSide {
     assertNResult(result, row, family, qualifier, stamps, values, start, end);
   }
 
-  private void getAllVersionsAndVerify(HTable ht, byte [] row, byte [] family,
+  private void getAllVersionsAndVerify(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long [] stamps, byte [][] values, int start, int end)
   throws IOException {
     Get get = new Get(row);
@@ -2566,7 +2566,7 @@ public class TestFromClientSide {
     assertNResult(result, row, family, qualifier, stamps, values, start, end);
   }
 
-  private void scanVersionRangeAndVerifyGreaterThan(HTable ht, byte [] row,
+  private void scanVersionRangeAndVerifyGreaterThan(Table ht, byte [] row,
       byte [] family, byte [] qualifier, long [] stamps, byte [][] values,
       int start, int end)
   throws IOException {
@@ -2578,7 +2578,7 @@ public class TestFromClientSide {
     assertNResult(result, row, family, qualifier, stamps, values, start+1, end);
   }
 
-  private void scanVersionRangeAndVerify(HTable ht, byte [] row, byte [] family,
+  private void scanVersionRangeAndVerify(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long [] stamps, byte [][] values, int start, int end)
   throws IOException {
     Scan scan = new Scan(row);
@@ -2589,7 +2589,7 @@ public class TestFromClientSide {
     assertNResult(result, row, family, qualifier, stamps, values, start, end);
   }
 
-  private void scanAllVersionsAndVerify(HTable ht, byte [] row, byte [] family,
+  private void scanAllVersionsAndVerify(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long [] stamps, byte [][] values, int start, int end)
   throws IOException {
     Scan scan = new Scan(row);
@@ -2599,7 +2599,7 @@ public class TestFromClientSide {
     assertNResult(result, row, family, qualifier, stamps, values, start, end);
   }
 
-  private void getVersionAndVerify(HTable ht, byte [] row, byte [] family,
+  private void getVersionAndVerify(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long stamp, byte [] value)
   throws Exception {
     Get get = new Get(row);
@@ -2610,7 +2610,7 @@ public class TestFromClientSide {
     assertSingleResult(result, row, family, qualifier, stamp, value);
   }
 
-  private void getVersionAndVerifyMissing(HTable ht, byte [] row, byte [] family,
+  private void getVersionAndVerifyMissing(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long stamp)
   throws Exception {
     Get get = new Get(row);
@@ -2621,7 +2621,7 @@ public class TestFromClientSide {
     assertEmptyResult(result);
   }
 
-  private void scanVersionAndVerify(HTable ht, byte [] row, byte [] family,
+  private void scanVersionAndVerify(Table ht, byte [] row, byte [] family,
       byte [] qualifier, long stamp, byte [] value)
   throws Exception {
     Scan scan = new Scan(row);
@@ -2632,7 +2632,7 @@ public class TestFromClientSide {
     assertSingleResult(result, row, family, qualifier, stamp, value);
   }
 
-  private void scanVersionAndVerifyMissing(HTable ht, byte [] row,
+  private void scanVersionAndVerifyMissing(Table ht, byte [] row,
       byte [] family, byte [] qualifier, long stamp)
   throws Exception {
     Scan scan = new Scan(row);
@@ -2643,7 +2643,7 @@ public class TestFromClientSide {
     assertNullResult(result);
   }
 
-  private void getTestNull(HTable ht, byte [] row, byte [] family,
+  private void getTestNull(Table ht, byte [] row, byte [] family,
       byte [] value)
   throws Exception {
 
@@ -2668,12 +2668,12 @@ public class TestFromClientSide {
 
   }
 
-  private void scanTestNull(HTable ht, byte[] row, byte[] family, byte[] value)
+  private void scanTestNull(Table ht, byte[] row, byte[] family, byte[] value)
       throws Exception {
     scanTestNull(ht, row, family, value, false);
   }
 
-  private void scanTestNull(HTable ht, byte[] row, byte[] family, byte[] value,
+  private void scanTestNull(Table ht, byte[] row, byte[] family, byte[] value,
       boolean isReversedScan) throws Exception {
 
     Scan scan = new Scan();
@@ -2701,7 +2701,7 @@ public class TestFromClientSide {
 
   }
 
-  private void singleRowGetTest(HTable ht, byte [][] ROWS, byte [][] FAMILIES,
+  private void singleRowGetTest(Table ht, byte [][] ROWS, byte [][] FAMILIES,
       byte [][] QUALIFIERS, byte [][] VALUES)
   throws Exception {
 
@@ -2799,7 +2799,7 @@ public class TestFromClientSide {
 
   }
 
-  private void singleRowScanTest(HTable ht, byte [][] ROWS, byte [][] FAMILIES,
+  private void singleRowScanTest(Table ht, byte [][] ROWS, byte [][] FAMILIES,
       byte [][] QUALIFIERS, byte [][] VALUES)
   throws Exception {
 
@@ -2901,7 +2901,7 @@ public class TestFromClientSide {
    * Expects family and qualifier arrays to be valid for at least
    * the range:  idx-2 < idx < idx+2
    */
-  private void getVerifySingleColumn(HTable ht,
+  private void getVerifySingleColumn(Table ht,
       byte [][] ROWS, int ROWIDX,
       byte [][] FAMILIES, int FAMILYIDX,
       byte [][] QUALIFIERS, int QUALIFIERIDX,
@@ -2959,7 +2959,7 @@ public class TestFromClientSide {
    * the range:  idx-2 to idx+2
    * Expects row array to be valid for at least idx to idx+2
    */
-  private void scanVerifySingleColumn(HTable ht,
+  private void scanVerifySingleColumn(Table ht,
       byte [][] ROWS, int ROWIDX,
       byte [][] FAMILIES, int FAMILYIDX,
       byte [][] QUALIFIERS, int QUALIFIERIDX,
@@ -3019,7 +3019,7 @@ public class TestFromClientSide {
    * Verify we do not read any values by accident around a single column
    * Same requirements as getVerifySingleColumn
    */
-  private void getVerifySingleEmpty(HTable ht,
+  private void getVerifySingleEmpty(Table ht,
       byte [][] ROWS, int ROWIDX,
       byte [][] FAMILIES, int FAMILYIDX,
       byte [][] QUALIFIERS, int QUALIFIERIDX)
@@ -3050,7 +3050,7 @@ public class TestFromClientSide {
 
   }
 
-  private void scanVerifySingleEmpty(HTable ht,
+  private void scanVerifySingleEmpty(Table ht,
       byte [][] ROWS, int ROWIDX,
       byte [][] FAMILIES, int FAMILYIDX,
       byte [][] QUALIFIERS, int QUALIFIERIDX)
@@ -3275,7 +3275,7 @@ public class TestFromClientSide {
   // Helpers
   //
 
-  private Result getSingleScanResult(HTable ht, Scan scan) throws IOException {
+  private Result getSingleScanResult(Table ht, Scan scan) throws IOException {
     ResultScanner scanner = ht.getScanner(scan);
     Result result = scanner.next();
     scanner.close();
@@ -3335,7 +3335,7 @@ public class TestFromClientSide {
     long [] STAMPS = makeStamps(20);
     byte [][] VALUES = makeNAscii(VALUE, 20);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Insert 4 versions of same column
     Put put = new Put(ROW);
@@ -3546,7 +3546,7 @@ public class TestFromClientSide {
   public void testUpdates() throws Exception {
 
     byte [] TABLE = Bytes.toBytes("testUpdates");
-    HTable hTable = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table hTable = TEST_UTIL.createTable(TABLE, FAMILY, 10);
 
     // Write a column with values at timestamp 1, 2 and 3
     byte[] row = Bytes.toBytes("row1");
@@ -3597,7 +3597,7 @@ public class TestFromClientSide {
 
     String tableName = "testUpdatesWithMajorCompaction";
     byte [] TABLE = Bytes.toBytes(tableName);
-    HTable hTable = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table hTable = TEST_UTIL.createTable(TABLE, FAMILY, 10);
     HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
 
     // Write a column with values at timestamp 1, 2 and 3
@@ -3659,7 +3659,7 @@ public class TestFromClientSide {
 
     String tableName = "testMajorCompactionBetweenTwoUpdates";
     byte [] TABLE = Bytes.toBytes(tableName);
-    HTable hTable = TEST_UTIL.createTable(TABLE, FAMILY, 10);
+    Table hTable = TEST_UTIL.createTable(TABLE, FAMILY, 10);
     HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
 
     // Write a column with values at timestamp 1, 2 and 3
@@ -3724,7 +3724,7 @@ public class TestFromClientSide {
 
   @Test
   public void testGet_EmptyTable() throws IOException {
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testGet_EmptyTable"), FAMILY);
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testGet_EmptyTable"), FAMILY);
     Get get = new Get(ROW);
     get.addFamily(FAMILY);
     Result r = table.get(get);
@@ -3733,7 +3733,7 @@ public class TestFromClientSide {
 
   @Test
   public void testGet_NullQualifier() throws IOException {
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testGet_NullQualifier"), FAMILY);
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testGet_NullQualifier"), FAMILY);
     Put put = new Put(ROW);
     put.add(FAMILY, QUALIFIER, VALUE);
     table.put(put);
@@ -3756,7 +3756,7 @@ public class TestFromClientSide {
 
   @Test
   public void testGet_NonExistentRow() throws IOException {
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testGet_NonExistentRow"), FAMILY);
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testGet_NonExistentRow"), FAMILY);
     Put put = new Put(ROW);
     put.add(FAMILY, QUALIFIER, VALUE);
     table.put(put);
@@ -3783,7 +3783,7 @@ public class TestFromClientSide {
     final byte [] row1 = Bytes.toBytes("row1");
     final byte [] row2 = Bytes.toBytes("row2");
     final byte [] value = Bytes.toBytes("abcd");
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testPut"),
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testPut"),
       new byte [][] {CONTENTS_FAMILY, SMALL_FAMILY});
     Put put = new Put(row1);
     put.add(CONTENTS_FAMILY, null, value);
@@ -3820,7 +3820,7 @@ public class TestFromClientSide {
   public void testPutNoCF() throws IOException {
     final byte[] BAD_FAM = Bytes.toBytes("BAD_CF");
     final byte[] VAL = Bytes.toBytes(100);
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testPutNoCF"), new byte[][]{FAMILY});
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testPutNoCF"), new byte[][]{FAMILY});
 
     boolean caughtNSCFE = false;
 
@@ -3841,7 +3841,7 @@ public class TestFromClientSide {
     final byte[] SMALL_FAMILY = Bytes.toBytes("smallfam");
     final int NB_BATCH_ROWS = 10;
     final byte[] value = Bytes.toBytes("abcd");
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testRowsPut"),
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testRowsPut"),
       new byte[][] {CONTENTS_FAMILY, SMALL_FAMILY });
     ArrayList<Put> rowsUpdate = new ArrayList<Put>();
     for (int i = 0; i < NB_BATCH_ROWS; i++) {
@@ -3974,7 +3974,7 @@ public class TestFromClientSide {
     final byte [] FAM1 = Bytes.toBytes("fam1");
     final byte [] FAM2 = Bytes.toBytes("fam2");
     // Open table
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testHBase737"),
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testHBase737"),
       new byte [][] {FAM1, FAM2});
     // Insert some values
     Put put = new Put(ROW);
@@ -4069,7 +4069,7 @@ public class TestFromClientSide {
     for (int i = 0; i < tables.length; i++) {
       TEST_UTIL.createTable(tables[i], FAMILY);
     }
-    HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
+    Admin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
     HTableDescriptor[] ts = admin.listTables();
     HashSet<HTableDescriptor> result = new HashSet<HTableDescriptor>(ts.length);
     for (int i = 0; i < ts.length; i++) {
@@ -4156,14 +4156,14 @@ public class TestFromClientSide {
     final byte[] attrValue = Bytes.toBytes("somevalue");
     byte[] value = Bytes.toBytes("value");
 
-    HTable a = TEST_UTIL.createTable(tableAname, HConstants.CATALOG_FAMILY);
-    HTable b = TEST_UTIL.createTable(tableBname, HConstants.CATALOG_FAMILY);
+    Table a = TEST_UTIL.createTable(tableAname, HConstants.CATALOG_FAMILY);
+    Table b = TEST_UTIL.createTable(tableBname, HConstants.CATALOG_FAMILY);
     Put put = new Put(ROW);
     put.add(HConstants.CATALOG_FAMILY, null, value);
     a.put(put);
 
     // open a new connection to A and a connection to b
-    HTable newA = new HTable(TEST_UTIL.getConfiguration(), tableAname);
+    Table newA = new HTable(TEST_UTIL.getConfiguration(), tableAname);
 
     // copy data from A to B
     Scan scan = new Scan();
@@ -4183,7 +4183,7 @@ public class TestFromClientSide {
     }
 
     // Opening a new connection to A will cause the tables to be reloaded
-    HTable anotherA = new HTable(TEST_UTIL.getConfiguration(), tableAname);
+    Table anotherA = new HTable(TEST_UTIL.getConfiguration(), tableAname);
     Get get = new Get(ROW);
     get.addFamily(HConstants.CATALOG_FAMILY);
     anotherA.get(get);
@@ -4345,7 +4345,7 @@ public class TestFromClientSide {
     final byte [] TABLENAME = Bytes.toBytes("testMultiRowMutation");
     final byte [] ROW1 = Bytes.toBytes("testRow1");
 
-    HTable t = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table t = TEST_UTIL.createTable(TABLENAME, FAMILY);
     Put p = new Put(ROW);
     p.add(FAMILY, QUALIFIER, VALUE);
     MutationProto m1 = ProtobufUtil.toMutation(MutationType.PUT, p);
@@ -4374,7 +4374,7 @@ public class TestFromClientSide {
   public void testRowMutation() throws Exception {
     LOG.info("Starting testRowMutation");
     final byte [] TABLENAME = Bytes.toBytes("testRowMutation");
-    HTable t = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table t = TEST_UTIL.createTable(TABLENAME, FAMILY);
     byte [][] QUALIFIERS = new byte [][] {
         Bytes.toBytes("a"), Bytes.toBytes("b")
     };
@@ -4406,7 +4406,7 @@ public class TestFromClientSide {
   public void testAppend() throws Exception {
     LOG.info("Starting testAppend");
     final byte [] TABLENAME = Bytes.toBytes("testAppend");
-    HTable t = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table t = TEST_UTIL.createTable(TABLENAME, FAMILY);
     byte[] v1 = Bytes.toBytes("42");
     byte[] v2 = Bytes.toBytes("23");
     byte [][] QUALIFIERS = new byte [][] {
@@ -4436,7 +4436,7 @@ public class TestFromClientSide {
     LOG.info("Starting testIncrementWithDeletes");
     final TableName TABLENAME =
         TableName.valueOf("testIncrementWithDeletes");
-    HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
     final byte[] COLUMN = Bytes.toBytes("column");
 
     ht.incrementColumnValue(ROW, FAMILY, COLUMN, 5);
@@ -4457,7 +4457,7 @@ public class TestFromClientSide {
   public void testIncrementingInvalidValue() throws Exception {
     LOG.info("Starting testIncrementingInvalidValue");
     final byte [] TABLENAME = Bytes.toBytes("testIncrementingInvalidValue");
-    HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
     final byte[] COLUMN = Bytes.toBytes("column");
     Put p = new Put(ROW);
     // write an integer here (not a Long)
@@ -4483,7 +4483,7 @@ public class TestFromClientSide {
   public void testIncrementInvalidArguments() throws Exception {
     LOG.info("Starting testIncrementInvalidArguments");
     final byte[] TABLENAME = Bytes.toBytes("testIncrementInvalidArguments");
-    HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
     final byte[] COLUMN = Bytes.toBytes("column");
     try {
       // try null row
@@ -4538,7 +4538,7 @@ public class TestFromClientSide {
   public void testIncrementOutOfOrder() throws Exception {
     LOG.info("Starting testIncrementOutOfOrder");
     final byte [] TABLENAME = Bytes.toBytes("testIncrementOutOfOrder");
-    HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
 
     byte [][] QUALIFIERS = new byte [][] {
       Bytes.toBytes("B"), Bytes.toBytes("A"), Bytes.toBytes("C")
@@ -4578,7 +4578,7 @@ public class TestFromClientSide {
   public void testIncrement() throws Exception {
     LOG.info("Starting testIncrement");
     final byte [] TABLENAME = Bytes.toBytes("testIncrement");
-    HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLENAME, FAMILY);
 
     byte [][] ROWS = new byte [][] {
         Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c"),
@@ -4656,7 +4656,7 @@ public class TestFromClientSide {
     conf.set(HConstants.HBASE_CLIENT_IPC_POOL_TYPE, "round-robin");
     conf.setInt(HConstants.HBASE_CLIENT_IPC_POOL_SIZE, poolSize);
 
-    HTable table = TEST_UTIL.createTable(tableName, new byte[][] { FAMILY },
+    Table table = TEST_UTIL.createTable(tableName, new byte[][] { FAMILY },
         conf, Integer.MAX_VALUE);
 
     final long ts = EnvironmentEdgeManager.currentTime();
@@ -4693,7 +4693,7 @@ public class TestFromClientSide {
     conf.set(HConstants.HBASE_CLIENT_IPC_POOL_TYPE, "thread-local");
     conf.setInt(HConstants.HBASE_CLIENT_IPC_POOL_SIZE, poolSize);
 
-    final HTable table = TEST_UTIL.createTable(tableName,
+    final Table table = TEST_UTIL.createTable(tableName,
         new byte[][] { FAMILY }, conf, 3);
 
     final long ts = EnvironmentEdgeManager.currentTime();
@@ -4771,7 +4771,7 @@ public class TestFromClientSide {
     final byte [] anotherrow = Bytes.toBytes("anotherrow");
     final byte [] value2 = Bytes.toBytes("abcd");
 
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testCheckAndPut"),
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testCheckAndPut"),
       new byte [][] {FAMILY});
     Put put1 = new Put(ROW);
     put1.add(FAMILY, QUALIFIER, VALUE);
@@ -4813,7 +4813,7 @@ public class TestFromClientSide {
     final byte [] value3 = Bytes.toBytes("cccc");
     final byte [] value4 = Bytes.toBytes("dddd");
 
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testCheckAndPutWithCompareOp"),
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testCheckAndPutWithCompareOp"),
         new byte [][] {FAMILY});
 
     Put put2 = new Put(ROW);
@@ -4879,7 +4879,7 @@ public class TestFromClientSide {
     final byte [] value3 = Bytes.toBytes("cccc");
     final byte [] value4 = Bytes.toBytes("dddd");
 
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testCheckAndDeleteWithCompareOp"),
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testCheckAndDeleteWithCompareOp"),
         new byte [][] {FAMILY});
 
     Put put2 = new Put(ROW);
@@ -5176,7 +5176,7 @@ public class TestFromClientSide {
     byte [] family1 = Bytes.toBytes("f1");
     byte [] family2 = Bytes.toBytes("f2");
     HTable table = TEST_UTIL.createTable(TABLE, new byte[][] {family1, family2}, 10);
-    HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
+    Admin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
     Map <HRegionInfo, ServerName> regionsMap = table.getRegionLocations();
     assertEquals(1, regionsMap.size());
     HRegionInfo regionInfo = regionsMap.keySet().iterator().next();
@@ -5272,7 +5272,7 @@ public class TestFromClientSide {
   @Test
   public void testJira6912() throws Exception {
     byte [] TABLE = Bytes.toBytes("testJira6912");
-    HTable foo = TEST_UTIL.createTable(TABLE, new byte[][] {FAMILY}, 10);
+    Table foo = TEST_UTIL.createTable(TABLE, new byte[][] {FAMILY}, 10);
 
     List<Put> puts = new ArrayList<Put>();
     for (int i=0;i !=100; i++){
@@ -5297,7 +5297,7 @@ public class TestFromClientSide {
 
   @Test
   public void testScan_NullQualifier() throws IOException {
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testScan_NullQualifier"), FAMILY);
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testScan_NullQualifier"), FAMILY);
     Put put = new Put(ROW);
     put.add(FAMILY, QUALIFIER, VALUE);
     table.put(put);
@@ -5326,7 +5326,7 @@ public class TestFromClientSide {
 
   @Test
   public void testNegativeTimestamp() throws IOException {
-    HTable table = TEST_UTIL.createTable(Bytes.toBytes("testNegativeTimestamp"), FAMILY);
+    Table table = TEST_UTIL.createTable(Bytes.toBytes("testNegativeTimestamp"), FAMILY);
 
     try {
       Put put = new Put(ROW, -1);
@@ -5471,7 +5471,7 @@ public class TestFromClientSide {
   @Test
   public void testRawScanRespectsVersions() throws Exception {
     byte[] TABLE = Bytes.toBytes("testRawScan");
-    HTable table = TEST_UTIL.createTable(TABLE, new byte[][] { FAMILY });
+    Table table = TEST_UTIL.createTable(TABLE, new byte[][] { FAMILY });
     byte[] row = Bytes.toBytes("row");
 
     // put the same row 4 times, with different values
@@ -5547,7 +5547,7 @@ public class TestFromClientSide {
   public void testSmallScan() throws Exception {
     // Test Initialization.
     byte[] TABLE = Bytes.toBytes("testSmallScan");
-    HTable table = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table table = TEST_UTIL.createTable(TABLE, FAMILY);
 
     // Insert one row each region
     int insertNum = 10;
@@ -5583,7 +5583,7 @@ public class TestFromClientSide {
   @Test
   public void testSuperSimpleWithReverseScan() throws Exception {
     byte[] TABLE = Bytes.toBytes("testSuperSimpleWithReverseScan");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     Put put = new Put(Bytes.toBytes("0-b11111-0000000000000000000"));
     put.add(FAMILY, QUALIFIER, VALUE);
     ht.put(put);
@@ -5629,7 +5629,7 @@ public class TestFromClientSide {
   @Test
   public void testFiltersWithReverseScan() throws Exception {
     byte[] TABLE = Bytes.toBytes("testFiltersWithReverseScan");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte[][] ROWS = makeN(ROW, 10);
     byte[][] QUALIFIERS = { Bytes.toBytes("col0-<d2v1>-<d3v2>"),
         Bytes.toBytes("col1-<d2v1>-<d3v2>"),
@@ -5669,7 +5669,7 @@ public class TestFromClientSide {
   @Test
   public void testKeyOnlyFilterWithReverseScan() throws Exception {
     byte[] TABLE = Bytes.toBytes("testKeyOnlyFilterWithReverseScan");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte[][] ROWS = makeN(ROW, 10);
     byte[][] QUALIFIERS = { Bytes.toBytes("col0-<d2v1>-<d3v2>"),
         Bytes.toBytes("col1-<d2v1>-<d3v2>"),
@@ -5710,7 +5710,7 @@ public class TestFromClientSide {
   @Test
   public void testSimpleMissingWithReverseScan() throws Exception {
     byte[] TABLE = Bytes.toBytes("testSimpleMissingWithReverseScan");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     byte[][] ROWS = makeN(ROW, 4);
 
     // Try to get a row on an empty table
@@ -5775,7 +5775,7 @@ public class TestFromClientSide {
   @Test
   public void testNullWithReverseScan() throws Exception {
     byte[] TABLE = Bytes.toBytes("testNullWithReverseScan");
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
     // Null qualifier (should work)
     Put put = new Put(ROW);
     put.add(FAMILY, null, VALUE);
@@ -5816,7 +5816,7 @@ public class TestFromClientSide {
     byte[][] FAMILIES = makeNAscii(FAMILY, 3);
     byte[][] VALUES = makeN(VALUE, 5);
     long[] ts = { 1000, 2000, 3000, 4000, 5000 };
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES,
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES,
         TEST_UTIL.getConfiguration(), 3);
 
     Put put = new Put(ROW);
@@ -6091,7 +6091,7 @@ public class TestFromClientSide {
     table.close();
   }
 
-  private void reverseScanTest(HTable table, boolean small) throws IOException {
+  private void reverseScanTest(Table table, boolean small) throws IOException {
     // scan backward
     Scan scan = new Scan();
     scan.setReversed(true);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
index 64ced17..5858e75 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
@@ -98,7 +98,7 @@ public class TestFromClientSide3 {
     // Nothing to do.
   }
 
-  private void randomCFPuts(HTable table, byte[] row, byte[] family, int nPuts)
+  private void randomCFPuts(Table table, byte[] row, byte[] family, int nPuts)
       throws Exception {
     Put put = new Put(row);
     for (int i = 0; i < nPuts; i++) {
@@ -269,7 +269,7 @@ public class TestFromClientSide3 {
 
   @Test
   public void testHTableBatchWithEmptyPut() throws Exception {
-    HTable table = TEST_UTIL.createTable(
+    Table table = TEST_UTIL.createTable(
       Bytes.toBytes("testHTableBatchWithEmptyPut"), new byte[][] { FAMILY });
     try {
       List actions = (List) new ArrayList();
@@ -296,7 +296,7 @@ public class TestFromClientSide3 {
 
     // Test with a single region table.
 
-    HTable table = TEST_UTIL.createTable(
+    Table table = TEST_UTIL.createTable(
       Bytes.toBytes("testHTableExistsMethodSingleRegionSingleGet"), new byte[][] { FAMILY });
 
     Put put = new Put(ROW);
@@ -336,7 +336,7 @@ public class TestFromClientSide3 {
   @Test
   public void testHTableExistsMethodMultipleRegionsSingleGet() throws Exception {
 
-    HTable table = TEST_UTIL.createTable(
+    Table table = TEST_UTIL.createTable(
       Bytes.toBytes("testHTableExistsMethodMultipleRegionsSingleGet"), new byte[][] { FAMILY }, 1,
       new byte[] { 0x00 }, new byte[] { (byte) 0xff }, 255);
     Put put = new Put(ROW);
@@ -409,7 +409,7 @@ public class TestFromClientSide3 {
     HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(Bytes.toBytes("test")));
     desc.addFamily(new HColumnDescriptor(FAMILY));
     admin.createTable(desc);
-    HTable table = new HTable(TEST_UTIL.getConfiguration(), "test");
+    Table table = new HTable(TEST_UTIL.getConfiguration(), "test");
 
     Put put = new Put(ROW_BYTES);
     put.add(FAMILY, COL_QUAL, VAL_BYTES);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java
index ea92bd5..82819da 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java
@@ -36,7 +36,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 import org.mortbay.log.Log;
-import org.apache.hadoop.hbase.client.HConnectionTestingUtility;
 
 import com.google.protobuf.RpcController;
 import com.google.protobuf.ServiceException;
@@ -71,7 +70,7 @@ public class TestHBaseAdminNoCluster {
         thenThrow(new ServiceException("Test fail").initCause(new PleaseHoldException("test")));
     Mockito.when(connection.getKeepAliveMasterService()).thenReturn(masterAdmin);
     // Mock up our admin Interfaces
-    HBaseAdmin admin = new HBaseAdmin(configuration);
+    Admin admin = new HBaseAdmin(configuration);
     try {
       HTableDescriptor htd =
           new HTableDescriptor(TableName.valueOf("testMasterMonitorCollableRetries"));

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
index 0b84ec9..7a818aa 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
@@ -212,7 +212,7 @@ public class TestHCM {
   @Test
   public void testAdminFactory() throws IOException {
     HConnection con1 = HConnectionManager.createConnection(TEST_UTIL.getConfiguration());
-    HBaseAdmin admin = (HBaseAdmin)con1.getAdmin();
+    Admin admin = con1.getAdmin();
     assertTrue(admin.getConnection() == con1);
     assertTrue(admin.getConfiguration() == TEST_UTIL.getConfiguration());
     con1.close();
@@ -425,7 +425,7 @@ public class TestHCM {
     c2.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1); // Don't retry: retry = test failed
     c2.setInt(RpcClient.IDLE_TIME, idleTime);
 
-    final HTable table = new HTable(c2, tableName.getBytes());
+    final Table table = new HTable(c2, tableName.getBytes());
 
     Put put = new Put(ROW);
     put.add(FAM_NAM, ROW, ROW);
@@ -777,9 +777,9 @@ public class TestHCM {
    */
   @Test
   public void testConnectionManagement() throws Exception{
-    HTable table0 = TEST_UTIL.createTable(TABLE_NAME1, FAM_NAM);
+    Table table0 = TEST_UTIL.createTable(TABLE_NAME1, FAM_NAM);
     HConnection conn = HConnectionManager.createConnection(TEST_UTIL.getConfiguration());
-    HTableInterface table = conn.getTable(TABLE_NAME1.getName());
+    Table table = conn.getTable(TABLE_NAME1.getName());
     table.close();
     assertFalse(conn.isClosed());
     assertFalse(((HTable)table).getPool().isShutdown());
@@ -1233,7 +1233,7 @@ public class TestHCM {
       try {
         c1 = ConnectionManager.getConnectionInternal(config);
         LOG.info("HTable connection " + i + " " + c1);
-        HTable table = new HTable(config, TABLE_NAME4, pool);
+        Table table = new HTable(config, TABLE_NAME4, pool);
         table.close();
         LOG.info("HTable connection " + i + " closed " + c1);
       } catch (Exception e) {
@@ -1273,7 +1273,7 @@ public class TestHCM {
     TEST_UTIL.createTable(tableName.getName(), new byte[][] {FAM_NAM}, config).close();
 
     HConnection connection = HConnectionManager.createConnection(config);
-    HTableInterface table = connection.getTable(tableName);
+    Table table = connection.getTable(tableName);
 
     // this will cache the meta location and table's region location
     table.get(new Get(Bytes.toBytes("foo")));

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
index 322ebaa..cf6ea92 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
@@ -21,6 +21,10 @@ package org.apache.hadoop.hbase.client;
 import java.io.IOException;
 
 import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.PoolMap.PoolType;
 import org.junit.*;
@@ -60,14 +64,14 @@ public class TestHTablePool {
 			String tableName = Bytes.toString(TABLENAME);
 
 			// Request a table from an empty pool
-			HTableInterface table = pool.getTable(tableName);
+			Table table = pool.getTable(tableName);
 			Assert.assertNotNull(table);
 
 			// Close table (returns table to the pool)
 			table.close();
 
 			// Request a table of the same name
-			HTableInterface sameTable = pool.getTable(tableName);
+			Table sameTable = pool.getTable(tableName);
 			Assert.assertSame(
 					((HTablePool.PooledHTable) table).getWrappedTable(),
 					((HTablePool.PooledHTable) sameTable).getWrappedTable());
@@ -79,14 +83,14 @@ public class TestHTablePool {
 					Integer.MAX_VALUE, getPoolType());
 
 			// Request a table from an empty pool
-			HTableInterface table = pool.getTable(TABLENAME);
+			Table table = pool.getTable(TABLENAME);
 			Assert.assertNotNull(table);
 
 			// Close table (returns table to the pool)
 			table.close();
 
 			// Request a table of the same name
-			HTableInterface sameTable = pool.getTable(TABLENAME);
+			Table sameTable = pool.getTable(TABLENAME);
 			Assert.assertSame(
 					((HTablePool.PooledHTable) table).getWrappedTable(),
 					((HTablePool.PooledHTable) sameTable).getWrappedTable());
@@ -104,8 +108,8 @@ public class TestHTablePool {
 			TEST_UTIL.createTable(otherTable, HConstants.CATALOG_FAMILY);
 
 			// Request a table from an empty pool
-			HTableInterface table1 = pool.getTable(TABLENAME);
-			HTableInterface table2 = pool.getTable(otherTable);
+			Table table1 = pool.getTable(TABLENAME);
+			Table table2 = pool.getTable(otherTable);
 			Assert.assertNotNull(table2);
 
 			// Close tables (returns tables to the pool)
@@ -113,8 +117,8 @@ public class TestHTablePool {
 			table2.close();
 
 			// Request tables of the same names
-			HTableInterface sameTable1 = pool.getTable(TABLENAME);
-			HTableInterface sameTable2 = pool.getTable(otherTable);
+			Table sameTable1 = pool.getTable(TABLENAME);
+			Table sameTable2 = pool.getTable(otherTable);
 			Assert.assertSame(
 					((HTablePool.PooledHTable) table1).getWrappedTable(),
 					((HTablePool.PooledHTable) sameTable1).getWrappedTable());
@@ -129,7 +133,7 @@ public class TestHTablePool {
       String tableName = Bytes.toString(TABLENAME);// Request a table from
                               // an
                               // empty pool
-      HTableInterface table = pool.getTable(tableName);
+      Table table = pool.getTable(tableName);
 
       // Test if proxy implementation is returned
       Assert.assertTrue(table instanceof HTablePool.PooledHTable);
@@ -150,7 +154,7 @@ public class TestHTablePool {
       pool.putTable(table);
 
       // Request a table of the same name
-      HTableInterface sameTable = pool.getTable(tableName);
+      Table sameTable = pool.getTable(tableName);
 
       // test no proxy over proxy created
       Assert.assertSame(((HTablePool.PooledHTable) table).getWrappedTable(),
@@ -166,7 +170,7 @@ public class TestHTablePool {
                               // empty pool
 
       // get table will return proxy implementation
-      final HTableInterface table = pool.getTable(tableName);
+      final Table table = pool.getTable(tableName);
       HTableInterface alienTable = new HTable(TEST_UTIL.getConfiguration(),
           TABLENAME) {
         // implementation doesn't matter as long the table is not from
@@ -188,7 +192,7 @@ public class TestHTablePool {
       String tableName = Bytes.toString(TABLENAME);
 
       // Request a table from an empty pool
-      HTableInterface table = pool.getTable(tableName);
+      Table table = pool.getTable(tableName);
       Assert.assertNotNull(table);
       Assert.assertTrue(((HTablePool.PooledHTable) table).isOpen());
       // Close table (returns table to the pool)
@@ -223,9 +227,9 @@ public class TestHTablePool {
 					getPoolType());
 
 			// Request tables from an empty pool
-			HTableInterface table1 = pool.getTable(TABLENAME);
-			HTableInterface table2 = pool.getTable(TABLENAME);
-			HTableInterface table3 = pool.getTable(TABLENAME);
+			Table table1 = pool.getTable(TABLENAME);
+			Table table2 = pool.getTable(TABLENAME);
+			Table table3 = pool.getTable(TABLENAME);
 
 			// Close tables (returns tables to the pool)
 			table1.close();
@@ -234,9 +238,9 @@ public class TestHTablePool {
 			table3.close();
 
 			// Request tables of the same name
-			HTableInterface sameTable1 = pool.getTable(TABLENAME);
-			HTableInterface sameTable2 = pool.getTable(TABLENAME);
-			HTableInterface sameTable3 = pool.getTable(TABLENAME);
+			Table sameTable1 = pool.getTable(TABLENAME);
+			Table sameTable2 = pool.getTable(TABLENAME);
+			Table sameTable3 = pool.getTable(TABLENAME);
 			Assert.assertSame(
 					((HTablePool.PooledHTable) table1).getWrappedTable(),
 					((HTablePool.PooledHTable) sameTable1).getWrappedTable());
@@ -264,7 +268,7 @@ public class TestHTablePool {
 			admin.createTable(tableDescriptor);
 
 			// Request tables from an empty pool
-			HTableInterface[] tables = new HTableInterface[4];
+			Table[] tables = new Table[4];
 			for (int i = 0; i < 4; ++i) {
 				tables[i] = pool.getTable(TABLENAME);
 			}
@@ -298,9 +302,9 @@ public class TestHTablePool {
 					getPoolType());
 
 			// Request tables from an empty pool
-			HTableInterface table1 = pool.getTable(TABLENAME);
-			HTableInterface table2 = pool.getTable(TABLENAME);
-			HTableInterface table3 = pool.getTable(TABLENAME);
+			Table table1 = pool.getTable(TABLENAME);
+			Table table2 = pool.getTable(TABLENAME);
+			Table table3 = pool.getTable(TABLENAME);
 
 			// Close tables (returns tables to the pool)
 			table1.close();
@@ -310,9 +314,9 @@ public class TestHTablePool {
 			table3.close();
 
 			// Request tables of the same name
-			HTableInterface sameTable1 = pool.getTable(TABLENAME);
-			HTableInterface sameTable2 = pool.getTable(TABLENAME);
-			HTableInterface sameTable3 = pool.getTable(TABLENAME);
+			Table sameTable1 = pool.getTable(TABLENAME);
+			Table sameTable2 = pool.getTable(TABLENAME);
+			Table sameTable3 = pool.getTable(TABLENAME);
 			Assert.assertSame(
 					((HTablePool.PooledHTable) table3).getWrappedTable(),
 					((HTablePool.PooledHTable) sameTable1).getWrappedTable());
@@ -340,7 +344,7 @@ public class TestHTablePool {
 			admin.createTable(tableDescriptor);
 
 			// Request tables from an empty pool
-			HTableInterface[] tables = new HTableInterface[4];
+			Table[] tables = new Table[4];
 			for (int i = 0; i < 4; ++i) {
 				tables[i] = pool.getTable(TABLENAME);
 			}

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
index 9fc0565..6e2ff13 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
@@ -147,7 +147,7 @@ public class TestMultiParallel {
    */
   @Test(timeout=300000)
   public void testActiveThreadsCount() throws Exception{
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
     List<Row> puts = constructPutRequests(); // creates a Put for every region
     table.batch(puts);
     Field poolField = table.getClass().getDeclaredField("pool");
@@ -160,7 +160,7 @@ public class TestMultiParallel {
   @Test(timeout=300000)
   public void testBatchWithGet() throws Exception {
     LOG.info("test=testBatchWithGet");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     // load test data
     List<Row> puts = constructPutRequests();
@@ -199,7 +199,7 @@ public class TestMultiParallel {
   @Test
   public void testBadFam() throws Exception {
     LOG.info("test=testBadFam");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     List<Row> actions = new ArrayList<Row>();
     Put p = new Put(Bytes.toBytes("row1"));
@@ -321,7 +321,7 @@ public class TestMultiParallel {
   @Test (timeout=300000)
   public void testBatchWithPut() throws Exception {
     LOG.info("test=testBatchWithPut");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     // put multiple rows using a batch
     List<Row> puts = constructPutRequests();
@@ -354,7 +354,7 @@ public class TestMultiParallel {
   @Test(timeout=300000)
   public void testBatchWithDelete() throws Exception {
     LOG.info("test=testBatchWithDelete");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     // Load some data
     List<Row> puts = constructPutRequests();
@@ -383,7 +383,7 @@ public class TestMultiParallel {
   @Test(timeout=300000)
   public void testHTableDeleteWithList() throws Exception {
     LOG.info("test=testHTableDeleteWithList");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     // Load some data
     List<Row> puts = constructPutRequests();
@@ -412,7 +412,7 @@ public class TestMultiParallel {
   @Test(timeout=300000)
   public void testBatchWithManyColsInOneRowGetAndPut() throws Exception {
     LOG.info("test=testBatchWithManyColsInOneRowGetAndPut");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     List<Row> puts = new ArrayList<Row>();
     for (int i = 0; i < 100; i++) {
@@ -453,7 +453,7 @@ public class TestMultiParallel {
     final byte[] QUAL2 = Bytes.toBytes("qual2");
     final byte[] QUAL3 = Bytes.toBytes("qual3");
     final byte[] QUAL4 = Bytes.toBytes("qual4");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
     Delete d = new Delete(ONE_ROW);
     table.delete(d);
     Put put = new Put(ONE_ROW);
@@ -531,7 +531,7 @@ public class TestMultiParallel {
         Runnable r = new Runnable() {
           @Override
           public void run() {
-            HTable table = null;
+            Table table = null;
             try {
               table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
             } catch (IOException e) {
@@ -573,7 +573,7 @@ public class TestMultiParallel {
   @Test(timeout=300000)
   public void testBatchWithMixedActions() throws Exception {
     LOG.info("test=testBatchWithMixedActions");
-    HTable table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE);
 
     // Load some data to start
     Object[] results = table.batch(constructPutRequests());
@@ -666,7 +666,7 @@ public class TestMultiParallel {
     return puts;
   }
 
-  private void validateLoadedData(HTable table) throws IOException {
+  private void validateLoadedData(Table table) throws IOException {
     // get the data back and validate that it is correct
     for (byte[] k : KEYS) {
       Get get = new Get(k);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
index 69cad8a..a28b828 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
@@ -87,7 +87,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     Integer[] putRows = new Integer[] {1, 3, 5, 7};
     Integer[] putColumns = new Integer[] { 1, 3, 5};
@@ -129,7 +129,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     Integer[] putRows = new Integer[] {1, 3, 5, 7};
     Integer[] putColumns = new Integer[] { 1, 3, 5};
@@ -170,7 +170,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     Integer[] putRows = new Integer[] {1, 3, 5, 7};
     Integer[] putColumns = new Integer[] { 1, 3, 5};
@@ -223,7 +223,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     Integer[] putRows1 = new Integer[] {1, 2, 3};
     Integer[] putColumns1 = new Integer[] { 2, 5, 6};
@@ -293,7 +293,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     // For row:0, col:0: insert versions 1 through 5.
     putNVersions(ht, FAMILY, 0, 0, 1, 5);
@@ -327,7 +327,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     // For row:0, col:0: insert versions 1 through 5.
     putNVersions(ht, FAMILY, 0, 0, 1, 5);
@@ -353,7 +353,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     // For row:0, col:0: insert versions 1 through 5.
     putNVersions(ht, FAMILY, 0, 0, 1, 5);
@@ -379,7 +379,7 @@ public class TestMultipleTimestamps {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     // For row:0, col:0: insert versions 1 through 5.
     putNVersions(ht, FAMILY, 0, 0, 1, 5);
@@ -428,7 +428,7 @@ public class TestMultipleTimestamps {
    * versions for the row/column specified by rowIdx & colIdx.
    *
    */
-  private  Cell[] getNVersions(HTable ht, byte[] cf, int rowIdx,
+  private  Cell[] getNVersions(Table ht, byte[] cf, int rowIdx,
       int colIdx, List<Long> versions)
   throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
@@ -442,7 +442,7 @@ public class TestMultipleTimestamps {
     return result.rawCells();
   }
 
-  private  ResultScanner scan(HTable ht, byte[] cf,
+  private  ResultScanner scan(Table ht, byte[] cf,
       Integer[] rowIndexes, Integer[] columnIndexes,
       Long[] versions, int maxVersions)
   throws IOException {
@@ -463,7 +463,7 @@ public class TestMultipleTimestamps {
     return scanner;
   }
 
-  private void put(HTable ht, byte[] cf, Integer[] rowIndexes,
+  private void put(Table ht, byte[] cf, Integer[] rowIndexes,
       Integer[] columnIndexes, Long[] versions)
   throws IOException {
     for (int rowIdx: rowIndexes) {
@@ -485,7 +485,7 @@ public class TestMultipleTimestamps {
    * Insert in specific row/column versions with timestamps
    * versionStart..versionEnd.
    */
-  private void putNVersions(HTable ht, byte[] cf, int rowIdx, int colIdx,
+  private void putNVersions(Table ht, byte[] cf, int rowIdx, int colIdx,
       long versionStart, long versionEnd)
   throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
@@ -504,7 +504,7 @@ public class TestMultipleTimestamps {
    * For row/column specified by rowIdx/colIdx, delete the cell
    * corresponding to the specified version.
    */
-  private void deleteOneVersion(HTable ht, byte[] cf, int rowIdx,
+  private void deleteOneVersion(Table ht, byte[] cf, int rowIdx,
       int colIdx, long version)
   throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
@@ -518,7 +518,7 @@ public class TestMultipleTimestamps {
    * For row/column specified by rowIdx/colIdx, delete all cells
    * preceeding the specified version.
    */
-  private void deleteAllVersionsBefore(HTable ht, byte[] cf, int rowIdx,
+  private void deleteAllVersionsBefore(Table ht, byte[] cf, int rowIdx,
       int colIdx, long version)
   throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
@@ -528,7 +528,7 @@ public class TestMultipleTimestamps {
     ht.delete(del);
   }
 
-  private void deleteColumn(HTable ht, byte[] cf, int rowIdx, int colIdx) throws IOException {
+  private void deleteColumn(Table ht, byte[] cf, int rowIdx, int colIdx) throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
     byte column[] = Bytes.toBytes("column:" + colIdx);
     Delete del = new Delete(row);
@@ -536,7 +536,7 @@ public class TestMultipleTimestamps {
     ht.delete(del);
   }
 
-  private void deleteFamily(HTable ht, byte[] cf, int rowIdx) throws IOException {
+  private void deleteFamily(Table ht, byte[] cf, int rowIdx) throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
     Delete del = new Delete(row);
     del.deleteFamily(cf);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
index 028a8ba..aaf37cb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java
@@ -52,7 +52,7 @@ public class TestPutWithDelete {
     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

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
index 77a8146..20a30ea 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java
@@ -139,7 +139,7 @@ public class TestReplicaWithCluster {
     HTableDescriptor hdt = HTU.createTableDescriptor("testCreateDeleteTable");
     hdt.setRegionReplication(NB_SERVERS);
     hdt.addCoprocessor(SlowMeCopro.class.getName());
-    HTable table = HTU.createTable(hdt, new byte[][]{f}, HTU.getConfiguration());
+    Table table = HTU.createTable(hdt, new byte[][]{f}, HTU.getConfiguration());
 
     Put p = new Put(row);
     p.add(f, row, row);
@@ -171,7 +171,7 @@ public class TestReplicaWithCluster {
     HTableDescriptor hdt = HTU.createTableDescriptor("testChangeTable");
     hdt.setRegionReplication(NB_SERVERS);
     hdt.addCoprocessor(SlowMeCopro.class.getName());
-    HTable table = HTU.createTable(hdt, new byte[][]{f}, HTU.getConfiguration());
+    Table table = HTU.createTable(hdt, new byte[][]{f}, HTU.getConfiguration());
 
     // basic test: it should work.
     Put p = new Put(row);
@@ -213,7 +213,7 @@ public class TestReplicaWithCluster {
     }
 
     HTU.getHBaseCluster().stopMaster(0);
-    HBaseAdmin admin = new HBaseAdmin(HTU.getConfiguration());
+    Admin admin = new HBaseAdmin(HTU.getConfiguration());
     nHdt =admin.getTableDescriptor(hdt.getTableName());
     Assert.assertEquals("fams=" + Arrays.toString(nHdt.getColumnFamilies()),
         bHdt.getColumnFamilies().length + 1, nHdt.getColumnFamilies().length);
@@ -253,7 +253,7 @@ public class TestReplicaWithCluster {
 
     Put p = new Put(row);
     p.add(row, row, row);
-    final HTable table = new HTable(HTU.getConfiguration(), hdt.getTableName());
+    final Table table = new HTable(HTU.getConfiguration(), hdt.getTableName());
     table.put(p);
 
     HTU.getHBaseAdmin().flush(table.getName());
@@ -277,7 +277,7 @@ public class TestReplicaWithCluster {
     table.close();
     LOG.info("stale get on the first cluster done. Now for the second.");
 
-    final HTable table2 = new HTable(HTU.getConfiguration(), hdt.getTableName());
+    final Table table2 = new HTable(HTU.getConfiguration(), hdt.getTableName());
     Waiter.waitFor(HTU.getConfiguration(), 1000, new Waiter.Predicate<Exception>() {
       @Override
       public boolean evaluate() throws Exception {
@@ -312,7 +312,7 @@ public class TestReplicaWithCluster {
     HTableDescriptor hdt = HTU.createTableDescriptor("testBulkLoad");
     hdt.setRegionReplication(NB_SERVERS);
     hdt.addCoprocessor(SlowMeCopro.class.getName());
-    HTable table = HTU.createTable(hdt, new byte[][]{f}, HTU.getConfiguration());
+    Table table = HTU.createTable(hdt, new byte[][]{f}, HTU.getConfiguration());
 
     // create hfiles to load.
     LOG.debug("Creating test data");

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
index 1f1f3d4..3fa6c95 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java
@@ -174,7 +174,7 @@ public class TestReplicasClient {
     TestRegionServerNoMaster.stopMasterAndAssignMeta(HTU);
     Configuration c = new Configuration(HTU.getConfiguration());
     c.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1);
-    HBaseAdmin ha = new HBaseAdmin(c);
+    Admin ha = new HBaseAdmin(c);
     for (boolean masterRuns = true; masterRuns; ) {
       Thread.sleep(100);
       try {

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
index 02c2ef8..414c4c8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
@@ -130,7 +130,7 @@ public class TestRpcControllerFactory {
     // change one of the connection properties so we get a new HConnection with our configuration
     conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, HConstants.DEFAULT_HBASE_RPC_TIMEOUT + 1);
 
-    HTable table = new HTable(conf, name);
+    Table table = new HTable(conf, name);
     table.setAutoFlushTo(false);
     byte[] row = Bytes.toBytes("row");
     Put p = new Put(row);
@@ -188,7 +188,7 @@ public class TestRpcControllerFactory {
     table.close();
   }
 
-  int doScan(HTable table, Scan scan, int expectedCount) throws IOException {
+  int doScan(Table table, Scan scan, int expectedCount) throws IOException {
     ResultScanner results = table.getScanner(scan);
     results.next();
     results.close();

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
index 65fb0d6..402f798 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
@@ -65,7 +65,7 @@ public class TestScannerTimeout {
     c.setInt(HConstants.THREAD_WAKE_FREQUENCY, THREAD_WAKE_FREQUENCY);
     // We need more than one region server for this test
     TEST_UTIL.startMiniCluster(2);
-    HTable table = TEST_UTIL.createTable(TABLE_NAME, SOME_BYTES);
+    Table table = TEST_UTIL.createTable(TABLE_NAME, SOME_BYTES);
      for (int i = 0; i < NB_ROWS; i++) {
       Put put = new Put(Bytes.toBytes(i));
       put.add(SOME_BYTES, SOME_BYTES, SOME_BYTES);
@@ -99,7 +99,7 @@ public class TestScannerTimeout {
     LOG.info("START ************ test2481");
     Scan scan = new Scan();
     scan.setCaching(1);
-    HTable table =
+    Table table =
       new HTable(new Configuration(TEST_UTIL.getConfiguration()), TABLE_NAME);
     ResultScanner r = table.getScanner(scan);
     int count = 0;
@@ -139,7 +139,7 @@ public class TestScannerTimeout {
     // this new table
     Configuration conf = new Configuration(TEST_UTIL.getConfiguration());
     conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT * 100);
-    HTable higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
+    Table higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
     ResultScanner r = higherScanTimeoutTable.getScanner(scan);
     // This takes way less than SCANNER_TIMEOUT*100
     rs.abort("die!");
@@ -173,7 +173,7 @@ public class TestScannerTimeout {
     Configuration conf = new Configuration(TEST_UTIL.getConfiguration());
     conf.setInt(
         HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT*100);
-    HTable table = new HTable(conf, TABLE_NAME);
+    Table table = new HTable(conf, TABLE_NAME);
     LOG.info("START ************ TEST3686A---22");
 
     ResultScanner r = table.getScanner(scan);
@@ -212,7 +212,7 @@ public class TestScannerTimeout {
     // this new table
     Configuration conf = new Configuration(TEST_UTIL.getConfiguration());
     conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SCANNER_TIMEOUT * 100);
-    HTable higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
+    Table higherScanTimeoutTable = new HTable(conf, TABLE_NAME);
     ResultScanner r = higherScanTimeoutTable.getScanner(scan);
     int count = 1;
     r.next();

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
index 8723219..ee5b4ed 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java
@@ -106,7 +106,7 @@ public class TestScannersFromClientSide {
     byte [] TABLE = Bytes.toBytes("testScanBatch");
     byte [][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, 8);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILY);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILY);
 
     Put put;
     Scan scan;
@@ -182,7 +182,7 @@ public class TestScannersFromClientSide {
     byte [][] FAMILIES = HTestConst.makeNAscii(FAMILY, 3);
     byte [][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, 20);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES);
 
     Get get;
     Put put;
@@ -303,7 +303,7 @@ public class TestScannersFromClientSide {
     byte [][] FAMILIES = HTestConst.makeNAscii(FAMILY, 3);
     byte [][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, 10);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES);
 
     Put put;
     Scan scan;
@@ -352,7 +352,7 @@ public class TestScannersFromClientSide {
     byte [][] FAMILIES = HTestConst.makeNAscii(FAMILY, 3);
     byte [][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, 20);
 
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES);
 
     Get get;
     Put put;

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
index d0da0b2..5f2d2c5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
@@ -212,7 +212,7 @@ public class TestSnapshotCloneIndependence {
       TableName cloneTableName = TableName.valueOf("test-clone-" + localTableName);
       admin.cloneSnapshot(snapshotName, cloneTableName);
 
-      HTable clonedTable = new HTable(UTIL.getConfiguration(), cloneTableName);
+      Table clonedTable = new HTable(UTIL.getConfiguration(), cloneTableName);
 
       try {
         final int clonedTableRowCount = UTIL.countRows(clonedTable);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
index f441d59..f417649 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
@@ -169,7 +169,7 @@ public class TestSnapshotMetadata {
     assertTrue(htd.getConfiguration().size() > 0);
 
     admin.createTable(htd);
-    HTable original = new HTable(UTIL.getConfiguration(), originalTableName);
+    Table original = new HTable(UTIL.getConfiguration(), originalTableName);
     originalTableName = TableName.valueOf(sourceTableNameAsString);
     originalTableDescriptor = admin.getTableDescriptor(originalTableName);
     originalTableDescription = originalTableDescriptor.toStringCustomizedValues();
@@ -201,7 +201,7 @@ public class TestSnapshotMetadata {
       familiesList, snapshotNameAsString, rootDir, fs, /* onlineSnapshot= */ false);
 
     admin.cloneSnapshot(snapshotName, clonedTableName);
-    HTable clonedTable = new HTable(UTIL.getConfiguration(), clonedTableName);
+    Table clonedTable = new HTable(UTIL.getConfiguration(), clonedTableName);
     HTableDescriptor cloneHtd = admin.getTableDescriptor(clonedTableName);
     assertEquals(
       originalTableDescription.replace(originalTableName.getNameAsString(),clonedTableNameAsString),
@@ -312,7 +312,7 @@ public class TestSnapshotMetadata {
     admin.enableTable(originalTableName);
 
     // verify that the descrption is reverted
-    HTable original = new HTable(UTIL.getConfiguration(), originalTableName);
+    Table original = new HTable(UTIL.getConfiguration(), originalTableName);
     try {
       assertTrue(originalTableDescriptor.equals(admin.getTableDescriptor(originalTableName)));
       assertTrue(originalTableDescriptor.equals(original.getTableDescriptor()));

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
index 05f9c53..3e382ea 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
@@ -96,7 +96,7 @@ public class TestTimestampsFilter {
     Cell kvs[];
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     for (int rowIdx = 0; rowIdx < 5; rowIdx++) {
       for (int colIdx = 0; colIdx < 5; colIdx++) {
@@ -171,7 +171,7 @@ public class TestTimestampsFilter {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     Put p = new Put(Bytes.toBytes("row"));
     p.add(FAMILY, Bytes.toBytes("column0"), 3, Bytes.toBytes("value0-3"));
@@ -231,7 +231,7 @@ public class TestTimestampsFilter {
     byte [][] FAMILIES = new byte[][] { FAMILY };
 
     // create table; set versions to max...
-    HTable ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
+    Table ht = TEST_UTIL.createTable(TABLE, FAMILIES, Integer.MAX_VALUE);
 
     // For row:0, col:0: insert versions 1 through 5.
     putNVersions(ht, FAMILY, 0, 0, 1, 5);
@@ -254,7 +254,7 @@ public class TestTimestampsFilter {
     ht.close();
   }
 
-  private void verifyInsertedValues(HTable ht, byte[] cf) throws IOException {
+  private void verifyInsertedValues(Table ht, byte[] cf) throws IOException {
     for (int rowIdx = 0; rowIdx < 5; rowIdx++) {
       for (int colIdx = 0; colIdx < 5; colIdx++) {
         // ask for versions that exist.
@@ -313,7 +313,7 @@ public class TestTimestampsFilter {
    * versions for the row/column specified by rowIdx & colIdx.
    *
    */
-  private  Cell[] getNVersions(HTable ht, byte[] cf, int rowIdx,
+  private  Cell[] getNVersions(Table ht, byte[] cf, int rowIdx,
                                    int colIdx, List<Long> versions)
     throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
@@ -332,7 +332,7 @@ public class TestTimestampsFilter {
    * Uses the TimestampFilter on a Scan to request a specified list of
    * versions for the rows from startRowIdx to endRowIdx (both inclusive).
    */
-  private Result[] scanNVersions(HTable ht, byte[] cf, int startRowIdx,
+  private Result[] scanNVersions(Table ht, byte[] cf, int startRowIdx,
                                  int endRowIdx, List<Long> versions)
     throws IOException {
     byte startRow[] = Bytes.toBytes("row:" + startRowIdx);
@@ -349,7 +349,7 @@ public class TestTimestampsFilter {
    * Insert in specific row/column versions with timestamps
    * versionStart..versionEnd.
    */
-  private void putNVersions(HTable ht, byte[] cf, int rowIdx, int colIdx,
+  private void putNVersions(Table ht, byte[] cf, int rowIdx, int colIdx,
                             long versionStart, long versionEnd)
       throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);
@@ -368,7 +368,7 @@ public class TestTimestampsFilter {
    * For row/column specified by rowIdx/colIdx, delete the cell
    * corresponding to the specified version.
    */
-  private void deleteOneVersion(HTable ht, byte[] cf, int rowIdx,
+  private void deleteOneVersion(Table ht, byte[] cf, int rowIdx,
                                 int colIdx, long version)
     throws IOException {
     byte row[] = Bytes.toBytes("row:" + rowIdx);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
index 919fd24..5b30625 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.After;
@@ -80,7 +81,7 @@ public class TestConstraint {
     Constraints.add(desc, CheckWasRunConstraint.class);
 
     util.getHBaseAdmin().createTable(desc);
-    HTable table = new HTable(util.getConfiguration(), tableName);
+    Table table = new HTable(util.getConfiguration(), tableName);
     try {
       // test that we don't fail on a valid put
       Put put = new Put(row1);
@@ -112,7 +113,7 @@ public class TestConstraint {
     Constraints.add(desc, AllFailConstraint.class);
 
     util.getHBaseAdmin().createTable(desc);
-    HTable table = new HTable(util.getConfiguration(), tableName);
+    Table table = new HTable(util.getConfiguration(), tableName);
 
     // test that we do fail on violation
     Put put = new Put(row1);
@@ -155,7 +156,7 @@ public class TestConstraint {
     Constraints.disableConstraint(desc, AllFailConstraint.class);
 
     util.getHBaseAdmin().createTable(desc);
-    HTable table = new HTable(util.getConfiguration(), tableName);
+    Table table = new HTable(util.getConfiguration(), tableName);
     try {
       // test that we don't fail because its disabled
       Put put = new Put(row1);
@@ -187,7 +188,7 @@ public class TestConstraint {
     Constraints.disable(desc);
 
     util.getHBaseAdmin().createTable(desc);
-    HTable table = new HTable(util.getConfiguration(), tableName);
+    Table table = new HTable(util.getConfiguration(), tableName);
     try {
       // test that we do fail on violation
       Put put = new Put(row1);
@@ -219,7 +220,7 @@ public class TestConstraint {
     CheckWasRunConstraint.wasRun = false;
 
     util.getHBaseAdmin().createTable(desc);
-    HTable table = new HTable(util.getConfiguration(), tableName);
+    Table table = new HTable(util.getConfiguration(), tableName);
 
     // test that we do fail on violation
     Put put = new Put(row1);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b1750429/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
index 655d663..8891525 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
@@ -25,6 +25,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -83,14 +85,14 @@ public class TestBatchCoprocessorEndpoint {
     conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
         ProtobufCoprocessorService.class.getName());
     util.startMiniCluster(2);
-    HBaseAdmin admin = new HBaseAdmin(conf);
+    Admin admin = new HBaseAdmin(conf);
     HTableDescriptor desc = new HTableDescriptor(TEST_TABLE);
     desc.addFamily(new HColumnDescriptor(TEST_FAMILY));
     admin.createTable(desc, new byte[][]{ROWS[rowSeperator1], ROWS[rowSeperator2]});
     util.waitUntilAllRegionsAssigned(TEST_TABLE);
     admin.close();
 
-    HTable table = new HTable(conf, TEST_TABLE);
+    Table table = new HTable(conf, TEST_TABLE);
     for (int i = 0; i < ROWSIZE; i++) {
       Put put = new Put(ROWS[i]);
       put.add(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes(i));
@@ -106,7 +108,7 @@ public class TestBatchCoprocessorEndpoint {
 
   @Test
   public void testAggregationNullResponse() throws Throwable {
-    HTable table = new HTable(util.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(util.getConfiguration(), TEST_TABLE);
     ColumnAggregationWithNullResponseProtos.SumRequest.Builder builder =
         ColumnAggregationWithNullResponseProtos.SumRequest
         .newBuilder();
@@ -143,7 +145,7 @@ public class TestBatchCoprocessorEndpoint {
     return ret;
   }
 
-  private Map<byte[], SumResponse> sum(final HTable table, final byte[] family,
+  private Map<byte[], SumResponse> sum(final Table table, final byte[] family,
       final byte[] qualifier, final byte[] start, final byte[] end) throws ServiceException,
       Throwable {
     ColumnAggregationProtos.SumRequest.Builder builder = ColumnAggregationProtos.SumRequest
@@ -159,7 +161,7 @@ public class TestBatchCoprocessorEndpoint {
 
   @Test
   public void testAggregationWithReturnValue() throws Throwable {
-    HTable table = new HTable(util.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(util.getConfiguration(), TEST_TABLE);
     Map<byte[], SumResponse> results = sum(table, TEST_FAMILY, TEST_QUALIFIER, ROWS[0],
         ROWS[ROWS.length - 1]);
     int sumResult = 0;
@@ -195,7 +197,7 @@ public class TestBatchCoprocessorEndpoint {
 
   @Test
   public void testAggregation() throws Throwable {
-    HTable table = new HTable(util.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(util.getConfiguration(), TEST_TABLE);
     Map<byte[], SumResponse> results = sum(table, TEST_FAMILY, TEST_QUALIFIER,
         ROWS[0], ROWS[ROWS.length - 1]);
     int sumResult = 0;
@@ -228,7 +230,7 @@ public class TestBatchCoprocessorEndpoint {
 
   @Test
   public void testAggregationWithErrors() throws Throwable {
-    HTable table = new HTable(util.getConfiguration(), TEST_TABLE);
+    Table table = new HTable(util.getConfiguration(), TEST_TABLE);
     final Map<byte[], ColumnAggregationWithErrorsProtos.SumResponse> results =
         Collections.synchronizedMap(
             new TreeMap<byte[], ColumnAggregationWithErrorsProtos.SumResponse>(


Mime
View raw message