fix some bugs (#298)

WeiXinChan · web-flow · commit b7e7fecd803b · 2025-02-28T14:56:16.000+08:00
* fix sub expr bug

* fix queryAndMutate in secondary part
diff --git a/src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java b/src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java
@@ -1797,7 +1797,7 @@ public ObPair<Long, ObTableParam> getTable(String tableName, ObTableQuery query,
             }
         }
 
-        if (partIdMapObTable.size() > 1) {
+        if (partIdMapObTable.size() > 1 && !getServerCapacity().isSupportDistributedExecute()) {
             throw new ObTablePartitionConsistentException(
                     "query and mutate must be a atomic operation");
         } else if (partIdMapObTable.size() < 1) {
@@ -3763,7 +3763,7 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E
                         }
 
                         // Check if partIdMapObTable size is greater than 1
-                        if (partIdMapObTable.size() > 1) {
+                        if (partIdMapObTable.size() > 1 && !getServerCapacity().isSupportDistributedExecute()) {
                             throw new ObTablePartitionConsistentException(
                                     "query and mutate must be a atomic operation");
                         }

Original file line number	Diff line number	Diff line change
`@@ -1797,7 +1797,7 @@ public ObPair<Long, ObTableParam> getTable(String tableName, ObTableQuery query,`
`1797`	`1797`	`}`
`1798`	`1798`	`}`
`1799`	`1799`
`1800`		`- if (partIdMapObTable.size() > 1) {`
	`1800`	`+ if (partIdMapObTable.size() > 1 && !getServerCapacity().isSupportDistributedExecute()) {`
`1801`	`1801`	`throw new ObTablePartitionConsistentException(`
`1802`	`1802`	`"query and mutate must be a atomic operation");`
`1803`	`1803`	`} else if (partIdMapObTable.size() < 1) {`
`@@ -3763,7 +3763,7 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E`
`3763`	`3763`	`}`
`3764`	`3764`
`3765`	`3765`	`// Check if partIdMapObTable size is greater than 1`
`3766`		`- if (partIdMapObTable.size() > 1) {`
	`3766`	`+ if (partIdMapObTable.size() > 1 && !getServerCapacity().isSupportDistributedExecute()) {`
`3767`	`3767`	`throw new ObTablePartitionConsistentException(`
`3768`	`3768`	`"query and mutate must be a atomic operation");`
`3769`	`3769`	`}`