Merge remote-tracking branch 'ob/master' into fix_global_route_3

Author: GroundWu

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/AbstractQueryStreamResult.java

@@ -160,7 +160,6 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
                     result = subObTable.executeWithConnection(request, connectionRef);
                 } else {
                     result = subObTable.execute(request);
-
                     if (result != null && result.getPcode() == Pcodes.OB_TABLE_API_MOVE) {
                         ObTableApiMove moveResponse = (ObTableApiMove) result;
                         client.getRouteTableRefresher().addTableIfAbsent(indexTableName, true);
@@ -263,7 +262,7 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
                                         ((ObTableException) e).getErrorCode(), tryTimes, e);
                                 // tablet not exists, refresh table entry
                                 if (e instanceof ObTableNeedFetchAllException) {
-                                    client.getOrRefreshTableEntry(tableName, true, true, true);
+                                    client.getOrRefreshTableEntry(indexTableName, true, true, true);
                                     throw e;
                                 }
                             } else {
@@ -581,7 +580,8 @@ public void init() throws Exception {
                                 RUNTIME.error("Fail to get refresh table entry response after {}",
                                         retryTimes);
                                 throw new ObTableRetryExhaustedException(
-                                        "Fail to get refresh table entry response after " + retryTimes);
+                                        "Fail to get refresh table entry response after " + retryTimes +
+                                                "errorCode:" + ((ObTableNeedFetchAllException) e).getErrorCode());
 
                             }
                         } else {

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

@@ -88,7 +88,8 @@ public void init() throws Exception {
                             RUNTIME.error("Fail to get refresh table entry response after {}",
                                 retryTimes);
                             throw new ObTableRetryExhaustedException(
-                                "Fail to get refresh table entry response after " + retryTimes);
+                                "Fail to get refresh table entry response after " + retryTimes
+                                + "errorCode:" + ((ObTableNeedFetchAllException) e).getErrorCode());
 
                         }
                     } else {

src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientQueryImpl.java

@@ -244,7 +244,6 @@ ObTableClientQueryAsyncStreamResult execute() throws Exception {
     public Map<Long, ObPair<Long, ObTableParam>> initPartitions(ObTableQuery tableQuery, String tableName) throws Exception {
         Map<Long, ObPair<Long, ObTableParam>> partitionObTables = new LinkedHashMap<>();
         String indexName = tableQuery.getIndexName();
-        String indexTableName = null;
 
         if (!this.obTableClient.isOdpMode()) {
             indexTableName = obTableClient.getIndexTableName(tableName, indexName, tableQuery.getScanRangeColumns(), false);