fix 3.x null exception (#214)

* fix

* fix regress

Author: miyuan-ljr

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

@@ -1839,14 +1839,20 @@ public ObPair<Long, ObTableParam> getTableInternal(String tableName, TableEntry
                                                        ObServerRoute route) throws Exception {
         ReplicaLocation replica = null;
         long tabletId = getTabletIdByPartId(tableEntry, partId);
+        long partitionId = partId;
         ObPartitionLocationInfo obPartitionLocationInfo = null;
         if (ObGlobal.obVsnMajor() >= 4) {
 
             obPartitionLocationInfo = getOrRefreshPartitionInfo(tableEntry, tableName, tabletId);
 
             replica = getPartitionLocation(obPartitionLocationInfo, route);
         } else {
-            ObPair<Long, ReplicaLocation> partitionReplica = getPartitionReplica(tableEntry, partId,
+            if (tableEntry.isPartitionTable()
+                    && null != tableEntry.getPartitionInfo().getSubPartDesc()) {
+                partitionId = ObPartIdCalculator.getPartIdx(partId, tableEntry
+                        .getPartitionInfo().getSubPartDesc().getPartNum());
+            }
+            ObPair<Long, ReplicaLocation> partitionReplica = getPartitionReplica(tableEntry, partitionId,
                     route);
             replica = partitionReplica.getRight();
         }
@@ -1871,7 +1877,7 @@ public ObPair<Long, ObTableParam> getTableInternal(String tableName, TableEntry
                 replica = getPartitionLocation(obPartitionLocationInfo, route);
             } else {
                 tableEntry = getOrRefreshTableEntry(tableName, true, waitForRefresh, false);
-                replica = getPartitionReplica(tableEntry, partId, route).getRight();
+                replica = getPartitionReplica(tableEntry, partitionId, route).getRight();
             }
 
             addr = replica.getAddr();
@@ -1882,9 +1888,8 @@ public ObPair<Long, ObTableParam> getTableInternal(String tableName, TableEntry
                 throw new ObTableGetException("Cannot get table by addr: " + addr);
             }
         }
-        ObTableParam param = null;
+        ObTableParam param = createTableParam(obTable, tableEntry, obPartitionLocationInfo, partId, tabletId);
         if (ObGlobal.obVsnMajor() >= 4) {
-            param = createTableParam(obTable, tableEntry, obPartitionLocationInfo, partId, tabletId);
         } else {
             param.setPartId(partId);
             param.setTableId(tableEntry.getTableId());
@@ -1900,7 +1905,9 @@ private ObPartitionLocationInfo getOrRefreshPartitionInfo(TableEntry tableEntry,
         ObPartitionLocationInfo obPartitionLocationInfo = tableEntry.getPartitionEntry()
             .getPartitionInfo(tabletId);
         if (!obPartitionLocationInfo.initialized.get()) {
-            tableEntry = refreshTableLocationByTabletId(tableEntry, tableName, tabletId);
+            if (ObGlobal.obVsnMajor() >= 4) {
+                tableEntry = refreshTableLocationByTabletId(tableEntry, tableName, tabletId);
+            }
             obPartitionLocationInfo = tableEntry.getPartitionEntry().getPartitionInfo(tabletId);
             obPartitionLocationInfo.initializationLatch.await();
         }
@@ -1950,10 +1957,19 @@ private List<ObPair<Long, ReplicaLocation>> getPartitionReplica(TableEntry table
         ObPartitionLevel partitionLevel = tableEntry.getPartitionInfo().getLevel();
         List<Long> partIds = getPartitionTablePartitionIds(tableEntry, startRow, startIncluded, endRow, endIncluded, partitionLevel);
 
-        for (Long partId : partIds) {
-            long tabletId = getTabletIdByPartId(tableEntry, partId);
-            ObPartitionLocationInfo locationInfo = getOrRefreshPartitionInfo(tableEntry, tableName, tabletId);
-            replicas.add(new ObPair<>(tabletId, getPartitionLocation(locationInfo, route)));
+        if (ObGlobal.obVsnMajor() >= 4) {
+            for (Long partId : partIds) {
+                long tabletId = getTabletIdByPartId(tableEntry, partId);
+                ObPartitionLocationInfo locationInfo = getOrRefreshPartitionInfo(tableEntry, tableName, tabletId);
+                replicas.add(new ObPair<>(tabletId, getPartitionLocation(locationInfo, route)));
+            }
+        } else {
+            for (Long partId : partIds) {
+                long partitionId = ObPartIdCalculator.getPartIdx(partId, tableEntry
+                        .getPartitionInfo().getSubPartDesc().getPartNum());
+                replicas.add(new ObPair<Long, ReplicaLocation>(partId, getPartitionLocation(
+                        tableEntry, partitionId, route)));
+            }
         }
 
         return replicas;

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

@@ -235,10 +235,10 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
                         }
                     } else if (e instanceof ObTableException) {
                         if ((((ObTableException) e).getErrorCode() == ResultCodes.OB_TABLE_NOT_EXIST.errorCode || ((ObTableException) e)
-                                .getErrorCode() == ResultCodes.OB_NOT_SUPPORTED.errorCode)
-                                && ((request instanceof ObTableQueryAsyncRequest && ((ObTableQueryAsyncRequest) request).getObTableQueryRequest().getTableQuery().isHbaseQuery())
-                                || (request instanceof ObTableQueryRequest && ((ObTableQueryRequest) request).getTableQuery().isHbaseQuery()))
-                                && client.getTableGroupInverted().get(indexTableName) != null) {
+                            .getErrorCode() == ResultCodes.OB_NOT_SUPPORTED.errorCode)
+                            && ((request instanceof ObTableQueryAsyncRequest && ((ObTableQueryAsyncRequest) request).getObTableQueryRequest().getTableQuery().isHbaseQuery())
+                            || (request instanceof ObTableQueryRequest && ((ObTableQueryRequest) request).getTableQuery().isHbaseQuery()))
+                            && client.getTableGroupInverted().get(indexTableName) != null) {
                             // table not exists && hbase mode && table group exists , three condition both
                             client.eraseTableGroupFromCache(tableName);
                         }