Merge pull request #45 from oceanbase/fix_table_group

Fix table group

Author: stuBirdFly

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

@@ -416,6 +416,14 @@ public void getKeyValueFromResult(AbstractQueryStreamResult clientQueryStreamRes
         }
     }
 
+    public String getTargetTableName(String tableNameString) {
+        if (configuration.getBoolean(HBASE_HTABLE_TEST_LOAD_ENABLE, false)) {
+            return tableNameString + configuration.get(HBASE_HTABLE_TEST_LOAD_SUFFIX,
+                    DEFAULT_HBASE_HTABLE_TEST_LOAD_SUFFIX);
+        }
+        return tableNameString;
+    }
+
     public Result get(final Get get) throws IOException {
         if (get.getFamilyMap().keySet() == null || get.getFamilyMap().keySet().size() == 0) {
             // check nothing, use table group;
@@ -437,11 +445,9 @@ public Result call() throws IOException {
                         || get.getFamilyMap().keySet().size() == 0) {
                         filter = buildObHTableFilter(get.getFilter(), get.getTimeRange(),
                             get.getMaxVersions(), null);
-
                         obTableQuery = buildObTableQuery(filter, get.getRow(), true, get.getRow(),
                             true, -1);
-
-                        request = buildObTableQueryRequest(obTableQuery, tableNameString);
+                        request = buildObTableQueryRequest(obTableQuery, getTargetTableName(tableNameString));
 
                         clientQueryStreamResult = (ObTableClientQueryStreamResult) obTableClient
                             .execute(request);
@@ -529,7 +535,7 @@ public ResultScanner call() throws IOException {
                         if (scan.isReversed()) { // reverse scan 时设置为逆序
                             obTableQuery.setScanOrder(ObScanOrder.Reverse);
                         }
-                        request = buildObTableQueryAsyncRequest(obTableQuery, tableNameString);
+                        request = buildObTableQueryAsyncRequest(obTableQuery, getTargetTableName(tableNameString));
                         clientQueryAsyncStreamResult = (ObTableClientQueryAsyncStreamResult) obTableClient
                             .execute(request);
                         return new ClientStreamScanner(clientQueryAsyncStreamResult,

src/test/java/com/alipay/oceanbase/hbase/OHTableClientTest.java

@@ -50,18 +50,6 @@ public void testNew() throws Exception {
         hTable2.init();
         hTable2.getConfiguration().set("rs.list.acquire.read.timeout", "10000");
 
-        try {
-            fail();
-        } catch (Exception e) {
-            assertTrue(true);
-        }
-
-        try {
-            fail();
-        } catch (Exception e) {
-            assertTrue(true);
-        }
-
         assertTrue(hTable2.isAutoFlush());
         hTable2.setAutoFlush(false);
         assertFalse(hTable2.isAutoFlush());