fix hbase put sinlge cf table

Author: JackShi148

src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java

@@ -1193,7 +1193,10 @@ public void dealWithRpcTimeoutForBatchTablet(ObServerAddr addr, String tableName
      */
     public String tryGetTableNameFromTableGroupCache(final String tableGroupName,
                                                      final boolean refresh) throws Exception {
-        return tableRoute.tryGetTableNameFromTableGroupCache(tableGroupName, refresh);
+        if (isTableGroupName(tableGroupName)) {
+            return tableRoute.tryGetTableNameFromTableGroupCache(tableGroupName, refresh);
+        }
+        return tableGroupName;
     }
 
     /**
@@ -2401,17 +2404,13 @@ public ObPayload execute(final ObHbaseRequest request) throws Exception {
             // get the first cell from the first cfRows to route
             // use the first table in tablegroup to route
             String realTableName = null;
-            try {
-                realTableName = tryGetTableNameFromTableGroupCache(request.getTableName(), false);
-            } catch (ObTableNotExistException e) {
-                if (request.getCfRows().size() != 1) {
-                    throw new ObTableUnexpectedException("multi-cf operations must create tablegroup and binding tables");
-                } else {
-                    realTableName = request.getCfRows().get(0).getRealTableName();
-                }
+            if (request.getCfRows().isEmpty()) {
+                throw new ObTableUnexpectedException("no cf rows");
             }
-            if (realTableName == null) {
-                throw new ObTableUnexpectedException("realTableName is null");
+            if (request.getCfRows().size() > 1) {
+                realTableName = tryGetTableNameFromTableGroupCache(request.getTableName(), false);
+            } else {
+                realTableName = request.getCfRows().get(0).getRealTableName();
             }
             int keyIdx = request.getCfRows().get(0).getKeyIndex(0);
             row.add("K", request.getKeys().get(keyIdx).getValue());

src/main/java/com/alipay/oceanbase/rpc/location/model/TableGroupCache.java

@@ -150,7 +150,11 @@ private String refreshTableNameByTableGroup(String physicalTableName, String tab
 
     public void eraseTableGroupFromCache(String tableGroupName) {
         // clear table group cache
-        TableGroupInverted.remove(TableGroupCache.get(tableGroupName));
+        String tableName = TableGroupCache.get(tableGroupName);
+        if (tableName != null) {
+            // maybe in concurrent situation, other thread has erased name already
+            TableGroupInverted.remove(tableName);
+        }
         TableGroupCache.remove(tableGroupName);
         TableGroupCacheLocks.remove(tableGroupName);
     }

src/main/java/com/alipay/oceanbase/rpc/stream/ObTableClientQueryAsyncStreamResult.java

@@ -21,6 +21,7 @@
 import com.alipay.oceanbase.rpc.exception.*;
 import com.alipay.oceanbase.rpc.location.model.TableEntry;
 import com.alipay.oceanbase.rpc.location.model.partition.ObPair;
+import com.alipay.oceanbase.rpc.location.model.partition.ObPartitionLevel;
 import com.alipay.oceanbase.rpc.protocol.payload.Constants;
 import com.alipay.oceanbase.rpc.protocol.payload.ObPayload;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.*;
@@ -190,22 +191,26 @@ public boolean queryLastStreamResultInNext() throws Exception {
                 TableEntry entry = client.getOrRefreshTableEntry(realTableName, false);
                 // Calculate the next partition only when the range partition is affected by a split, based on the keys already scanned.
                 if (entry.isPartitionTable()
+                        && entry.getPartitionInfo().getLevel() == ObPartitionLevel.LEVEL_ONE
                         && entry.getPartitionInfo().getFirstPartDesc().getPartFuncType()
                         .isRangePart()) {
                     this.asyncRequest.getObTableQueryRequest().getTableQuery()
                             .adjustStartKey(currentStartKey);
                     setExpectant(refreshPartition(this.asyncRequest
                             .getObTableQueryRequest().getTableQuery(), realTableName));
                     setEnd(true);
+                } else {
+                    // non one-level-range partitioned table does not retry, inform user to rescan
+                    throw e;
                 }
             } else {
                 throw e;
             }
         }
         // remove useless expectant if it is end
-        if (isEnd())
+        if (isEnd()) {
             it.remove();
-
+        }
         if (!cacheRows.isEmpty()) {
             nextRow();
             return true;
@@ -230,12 +235,16 @@ public boolean queryNewStreamResultInNext() throws Exception {
                             tableName);
                     TableEntry tableEntry = client.getOrRefreshTableEntry(realTableName, false);
                     if (tableEntry.isPartitionTable()
+                            && tableEntry.getPartitionInfo().getLevel() == ObPartitionLevel.LEVEL_ONE
                             && tableEntry.getPartitionInfo().getFirstPartDesc().getPartFuncType()
                             .isRangePart()) {
                         this.asyncRequest.getObTableQueryRequest().getTableQuery()
                                 .adjustStartKey(currentStartKey);
                         setExpectant(refreshPartition(this.asyncRequest
                                 .getObTableQueryRequest().getTableQuery(), realTableName));
+                    }  else {
+                        // non one-level-range partitioned table does not retry, inform user to rescan
+                        throw e;
                     }
                     it = expectant.entrySet().iterator();
                     retryTimes++;
@@ -253,9 +262,9 @@ public boolean queryNewStreamResultInNext() throws Exception {
             }
 
             // remove useless expectant if it is end
-            if (isEnd())
+            if (isEnd()) {
                 it.remove();
-
+            }
             if (!cacheRows.isEmpty()) {
                 hasNext = true;
                 nextRow();