Restrict refreshTableLocationByTabletId to execute only on partitioned tables in version 4.x and above

Author: maochongxin

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

@@ -789,9 +789,11 @@ private <T> T executeMutation(String tableName, MutationExecuteCallback<T> callb
                     if (null != callback.getRowKey()) {
                         // in the case of retry, the location always needs to be refreshed here
                         if (tryTimes > 1) {
-                            TableEntry entry = getOrRefreshTableEntry(tableName, false, false, false);
-                            Long partId = getPartition(entry, callback.getRowKey());
-                            refreshTableLocationByTabletId(entry, tableName, getTabletIdByPartId(entry, partId));
+                                TableEntry entry = getOrRefreshTableEntry(tableName, false, false, false);
+                            if (ObGlobal.obVsnMajor() >= 4 && entry.isPartitionTable()) {
+                                Long partId = getPartition(entry, callback.getRowKey());
+                                refreshTableLocationByTabletId(entry, tableName, getTabletIdByPartId(entry, partId));
+                            }
                         }
                         // using row key
                         obPair = getTable(tableName, callback.getRowKey(), needRefreshTableEntry, tableEntryRefreshIntervalWait, false, route);
@@ -1340,7 +1342,7 @@ public TableEntry refreshTableLocationByTabletId(TableEntry tableEntry, String t
             }
             long lastRefreshTime = tableEntry.getPartitionEntry().getPartitionInfo(tabletId).getLastUpdateTime();
             long currentTime = System.currentTimeMillis();
-            if (currentTime - lastRefreshTime < 1000) {
+            if (currentTime - lastRefreshTime < tableEntryRefreshIntervalCeiling) {
                 return tableEntry;
             }
             tableEntry = loadTableEntryLocationWithPriority(serverRoster, tableEntryKey, tableEntry, tabletId,
@@ -1662,7 +1664,9 @@ private ObPair<Long, ObTableParam> getTable(String tableName, Object[] rowKey,
 
         long partId = getPartition(tableEntry, row); // partition id in 3.x, origin partId in 4.x, logicId
         if (refresh) {
-            refreshTableLocationByTabletId(tableEntry, tableName, getTabletIdByPartId(tableEntry, partId));
+            if (ObGlobal.obVsnMajor() >= 4 && tableEntry.isPartitionTable()) {
+                refreshTableLocationByTabletId(tableEntry, tableName, getTabletIdByPartId(tableEntry, partId));
+            }
         }
         return getTableInternal(tableName, tableEntry, partId, waitForRefresh, route);
     }

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

@@ -568,8 +568,10 @@ public void executeWithRetry(ObTableClient client,
                 if (retryTimes > 1) {
                     TableEntry tableEntry = client.getOrRefreshTableEntry(tableName, false, false,
                         false);
-                    client.refreshTableLocationByTabletId(tableEntry, tableName, entry.getValue()
-                        .getRight().getPartitionId());
+                    if (ObGlobal.obVsnMajor() >= 4 && tableEntry.isPartitionTable()) {
+                        client.refreshTableLocationByTabletId(tableEntry, tableName, entry.getValue()
+                                .getRight().getPartitionId());
+                    }
                 }
                 operation.accept(entry.getValue());
 

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

@@ -17,6 +17,7 @@
 
 package com.alipay.oceanbase.rpc.table;
 
+import com.alipay.oceanbase.rpc.ObGlobal;
 import com.alipay.oceanbase.rpc.ObTableClient;
 import com.alipay.oceanbase.rpc.exception.*;
 import com.alipay.oceanbase.rpc.location.model.ObServerRoute;
@@ -355,7 +356,9 @@ public void partitionExecute(ObTableOperationResult[] results,
                         }
                         TableEntry entry = obTableClient.getOrRefreshTableEntry(tableName, false,
                             false, false);
-                        obTableClient.refreshTableLocationByTabletId(entry, tableName, partId);
+                        if (ObGlobal.obVsnMajor() >= 4 && entry.isPartitionTable()) {
+                            obTableClient.refreshTableLocationByTabletId(entry, tableName, partId);
+                        }
                         ObTableParam newParam = obTableClient.getTableWithPartId(tableName, partId,
                             false, obTableClient.isTableEntryRefreshIntervalWait(), needFetchAllRouteInfo, route)
                             .getRight();

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

@@ -17,6 +17,7 @@
 
 package com.alipay.oceanbase.rpc.table;
 
+import com.alipay.oceanbase.rpc.ObGlobal;
 import com.alipay.oceanbase.rpc.ObTableClient;
 import com.alipay.oceanbase.rpc.checkandmutate.CheckAndInsUp;
 import com.alipay.oceanbase.rpc.exception.*;
@@ -476,7 +477,9 @@ public void partitionExecute(ObTableSingleOpResult[] results,
                         }
                         TableEntry entry = obTableClient.getOrRefreshTableEntry(tableName, false,
                                 false, false);
-                        obTableClient.refreshTableLocationByTabletId(entry, tableName, obTableClient.getTabletIdByPartId(entry, originPartId));
+                        if (ObGlobal.obVsnMajor() >= 4 && entry.isPartitionTable()) {
+                            obTableClient.refreshTableLocationByTabletId(entry, tableName, obTableClient.getTabletIdByPartId(entry, originPartId));
+                        }
                         subObTable = obTableClient.getTableWithPartId(tableName, originPartId, needRefreshTableEntry,
                                         obTableClient.isTableEntryRefreshIntervalWait(), false, route).
                                             getRight().getObTable();