fix lsop retry fail

Author: maochongxin

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

@@ -1364,7 +1364,7 @@ public TableEntry refreshTableLocationByTabletId(TableEntry tableEntry, String t
             RUNTIME.error("RefreshTableEntry encountered an exception", e);
             throw e;
         } catch (Exception e) {
-            String errorMsg = String.format("Failed to get table entry. Key=%s, Original TableEntry=%s", tableEntryKey, tableEntry);
+            String errorMsg = String.format("Failed to get table entry. Key=%s, Original TableEntry=%s, TabletId=%d", tableEntryKey, tableEntry, tabletId);
             RUNTIME.error(LCD.convert("01-00020"), tableEntryKey, tableEntry, e);
             throw new ObTableEntryRefreshException(errorMsg, e);
         }
@@ -1939,7 +1939,7 @@ private List<Long> getPartitionTablePartitionIds(TableEntry tableEntry,
         }
     }
 
-    private long getTabletIdByPartId(TableEntry tableEntry, Long partId) {
+    public long getTabletIdByPartId(TableEntry tableEntry, Long partId) {
         if (ObGlobal.obVsnMajor() >= 4 && tableEntry.isPartitionTable()) {
             ObPartitionInfo partInfo = tableEntry.getPartitionInfo();
             Map<Long, Long> tabletIdMap = partInfo.getPartTabletIdMap();
@@ -2032,17 +2032,17 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
             ObServerAddr addr = replica.getAddr();
             ObTable obTable = tableRoster.get(addr);
             boolean addrExpired = addr.isExpired(serverAddressCachingTimeout);
-//            if (addrExpired || obTable == null) {
-//                logger
-//                    .warn(
-//                        "server address {} is expired={} or can not get ob table. So that will sync refresh metadata",
-//                        addr, addrExpired);
-//                syncRefreshMetadata();
-//                tableEntry = getOrRefreshTableEntry(tableName, true, waitForRefresh, false);
-//                replica = getPartitionLocation(tableEntry, partId, route);
-//                addr = replica.getAddr();
-//                obTable = tableRoster.get(addr);
-//            }
+            if (addrExpired || obTable == null) {
+                logger
+                    .warn(
+                        "server address {} is expired={} or can not get ob table. So that will sync refresh metadata",
+                        addr, addrExpired);
+                syncRefreshMetadata();
+                tableEntry = getOrRefreshTableEntry(tableName, true, waitForRefresh, false);
+                replica = getPartitionLocation(tableEntry, tabletId, route);
+                addr = replica.getAddr();
+                obTable = tableRoster.get(addr);
+            }
 
             if (obTable == null) {
                 RUNTIME.error("cannot get table by addr: " + addr);

src/main/java/com/alipay/oceanbase/rpc/location/LocationUtil.java

@@ -874,7 +874,6 @@ public static TableEntry getTableEntryLocationFromRemote(Connection connection,
                 // ignore
             }
         }
-        // 可能不需要了
         tableEntry.setRefreshTimeMills(System.currentTimeMillis());
         return tableEntry;
     }

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

@@ -740,7 +740,7 @@ public void doTask() {
             // Execute sub-batch operation one by one
             for (final Map.Entry<Long, Map<Long, ObPair<ObTableParam, List<ObPair<Integer, ObTableSingleOp>>>>> entry : lsOperations
                 .entrySet()) {
-                partitionExecute(obTableOperationResults, entry);
+                executeWithRetries(obTableOperationResults, entry, maxRetries);
             }
         }