Merge pull request #304 from WeiXinChan/tmp_313

set partition id invalid when isDistributedExecuteSupported

Author: stuBirdFly

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

@@ -62,6 +62,7 @@
 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.Constants.INVALID_TABLET_ID;
 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;
@@ -3771,15 +3772,17 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E
                         }
 
                         // Check if partIdMapObTable size is greater than 1
-                        if (partIdMapObTable.size() > 1 && !getServerCapacity().isSupportDistributedExecute()) {
+                        boolean isDistributedExecuteSupported = getServerCapacity().isSupportDistributedExecute();
+                        if (partIdMapObTable.size() > 1 && !isDistributedExecuteSupported) {
                             throw new ObTablePartitionConsistentException(
                                     "query and mutate must be a atomic operation");
                         }
                         // Proceed with the operation
                         Map.Entry<Long, ObTableParam> entry = partIdMapObTable.entrySet().iterator().next();
                         ObTableParam tableParam = entry.getValue();
                         request.setTableId(tableParam.getTableId());
-                        request.setPartitionId(tableParam.getPartitionId());
+                        long partitionId = isDistributedExecuteSupported ? INVALID_TABLET_ID : tableParam.getPartitionId();
+                        request.setPartitionId(partitionId);
                         request.setTimeout(tableParam.getObTable().getObTableOperationTimeout());
                         ObTable obTable = tableParam.getObTable();