adapt master after rebase

Author: JackShi148

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

@@ -62,7 +62,6 @@
 import static com.alipay.oceanbase.rpc.location.model.TableEntry.HBASE_ROW_KEY_ELEMENT;
 import static com.alipay.oceanbase.rpc.location.model.partition.ObPartIdCalculator.*;
 import static com.alipay.oceanbase.rpc.property.Property.*;
-import static com.alipay.oceanbase.rpc.protocol.payload.ResultCodes.OB_ERR_KV_ROUTE_ENTRY_EXPIRE;
 import static com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableOperationType.*;
 import static com.alipay.oceanbase.rpc.util.TableClientLoggerFactory.*;
 import static java.lang.String.format;
@@ -2315,8 +2314,9 @@ private List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuer
             ObTableParam param = new ObTableParam(obTable);
             param.setPartId(partId);
             partId = getTabletIdByPartId(tableEntry, partId);
-            param.setLsId(tableEntry.getPartitionEntry().getPartitionInfo(partId).getTabletLsId());
-
+            if (ObGlobal.obVsnMajor() >= 4 && tableEntry != null) {
+                param.setLsId(tableEntry.getPartitionEntry().getPartitionInfo(partId).getTabletLsId());
+            }
             param.setTableId(tableEntry.getTableId());
             // real partition(tablet) id
             param.setPartitionId(partId);

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

@@ -171,8 +171,8 @@ private AbstractQueryStreamResult commonExecute(InitQueryResultCallback<Abstract
                 }
             }
             if (getPartId() != null && tableQuery.getIndexName() == null) {
+                String realTableName = tableName;
                 try {
-                    String realTableName = tableName;
                     if (this.entityType == ObTableEntityType.HKV
                             && obTableClient.isTableGroupName(tableName)) {
                         indexTableName = obTableClient.tryGetTableNameFromTableGroupCache(tableName,
@@ -190,7 +190,7 @@ private AbstractQueryStreamResult commonExecute(InitQueryResultCallback<Abstract
                         } else if (((ObTableException) e).getErrorCode() == ResultCodes.OB_ERR_KV_ROUTE_ENTRY_EXPIRE.errorCode) {
                             // retry one time with force-renew flag
                             ObPair<Long, ObTableParam> odpTable = obTableClient.getODPTableWithPartId(
-                                    tableName, getPartId(), true);
+                                    realTableName, getPartId(), true);
                             partitionObTables.put(odpTable.getLeft(), odpTable);
                         } else {
                             throw e;
@@ -199,7 +199,7 @@ private AbstractQueryStreamResult commonExecute(InitQueryResultCallback<Abstract
                         throw e;
                     }
                 }
-            }  else {
+            } else {
                 partitionObTables.put(0L, new ObPair<Long, ObTableParam>(0L, new ObTableParam(
                         obTableClient.getOdpTable())));
             }

src/test/java/com/alipay/oceanbase/rpc/ObGetPartitionTest.java

@@ -17,20 +17,13 @@
 
 package com.alipay.oceanbase.rpc;
 
-import com.alipay.oceanbase.rpc.exception.ObTableException;
 import com.alipay.oceanbase.rpc.location.model.partition.Partition;
 import com.alipay.oceanbase.rpc.mutation.*;
 import com.alipay.oceanbase.rpc.mutation.result.BatchOperationResult;
 import com.alipay.oceanbase.rpc.mutation.result.MutationResult;
-import com.alipay.oceanbase.rpc.property.Property;
-import com.alipay.oceanbase.rpc.protocol.payload.impl.ObObj;
 import com.alipay.oceanbase.rpc.stream.QueryResultSet;
 import com.alipay.oceanbase.rpc.table.api.TableBatchOps;
-import com.alipay.oceanbase.rpc.table.api.TableQuery;
-import com.alipay.oceanbase.rpc.threadlocal.ThreadLocalMap;
 import com.alipay.oceanbase.rpc.util.ObTableClientTestUtil;
-import net.bytebuddy.implementation.auxiliary.MethodCallProxy;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,9 +37,6 @@
 import static com.alipay.oceanbase.rpc.mutation.MutationFactory.*;
 import static com.alipay.oceanbase.rpc.util.ObTableClientTestUtil.cleanTable;
 import static com.alipay.oceanbase.rpc.util.ObTableClientTestUtil.generateRandomStringByUUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 public class ObGetPartitionTest {
 
     public ObTableClient        client;