Skip to content

Commit 2bac7bb

Browse files
authored
[fix] 3.x compatible (#223)
* fix * fix
1 parent 31027b7 commit 2bac7bb

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,8 +1955,11 @@ private List<ObPair<Long, ReplicaLocation>> getPartitionReplica(TableEntry table
19551955
}
19561956
} else {
19571957
for (Long partId : partIds) {
1958-
long partitionId = ObPartIdCalculator.getPartIdx(partId, tableEntry
1959-
.getPartitionInfo().getSubPartDesc().getPartNum());
1958+
long partitionId = partId;
1959+
if (tableEntry.getPartitionInfo().getLevel() == ObPartitionLevel.LEVEL_TWO) {
1960+
partitionId = ObPartIdCalculator.getPartIdx(partId, tableEntry
1961+
.getPartitionInfo().getSubPartDesc().getPartNum());
1962+
}
19601963
replicas.add(new ObPair<Long, ReplicaLocation>(partId, getPartitionLocation(
19611964
tableEntry, partitionId, route)));
19621965
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,10 @@ public static TableEntry getTableEntryLocationFromRemote(Connection connection,
920920
ps.setString(1, key.getTenantName());
921921
ps.setString(2, key.getDatabaseName());
922922
ps.setString(3, key.getTableName());
923-
ps.setString(4, key.getTenantName());
923+
if (ObGlobal.obVsnMajor() >= 4) {
924+
// Only for v4.
925+
ps.setString(4, key.getTenantName());
926+
}
924927
rs = ps.executeQuery();
925928
partitionEntry = getPartitionLocationFromResultSet(tableEntry, rs, partitionEntry);
926929
} catch (Exception e) {

0 commit comments

Comments
 (0)