[Fix] query in singleOperation

src/main/java/com/alipay/oceanbase/rpc/location/model/partition/ObRangePartDesc.java

@@ -228,9 +228,11 @@ public int getBoundsIdx(Object... rowKey) {
             ObPartitionKey searchKey = ObPartitionKey.getInstance(orderedCompareColumns,
                 comparableElement);
 
-            int pos = upperBound(this.bounds, new ObComparableKV<ObPartitionKey, Long>(searchKey, (long) -1));
+            int pos = upperBound(this.bounds, new ObComparableKV<ObPartitionKey, Long>(searchKey,
+                (long) -1));
             if (pos >= this.bounds.size()) {
-                throw new ArrayIndexOutOfBoundsException("Table has no partition for value in " + this.getPartExpr());
+                throw new ArrayIndexOutOfBoundsException("Table has no partition for value in "
+                                                         + this.getPartExpr());
             } else {
                 return pos;
             }

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

@@ -17,8 +17,7 @@
 
 package com.alipay.oceanbase.rpc.protocol.payload.impl.execute;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public enum ObTableOperationType {
 
@@ -32,7 +31,20 @@ public enum ObTableOperationType {
     CHECK_AND_INSERT_UP(10), INVALID(11);
 
     private int                                       value;
-    private static Map<Integer, ObTableOperationType> map = new HashMap<Integer, ObTableOperationType>();
+    private static Map<Integer, ObTableOperationType> map             = new HashMap<Integer, ObTableOperationType>();
+    private static final List<Boolean>                needEncodeQuery = Arrays.asList(false, // GET
+                                                                          false, // INSERT
+                                                                          false, // DEL
+                                                                          false, // UPDATE
+                                                                          false, // INSERT_OR_UPDATE
+                                                                          false, // REPLACE
+                                                                          false, // INCREMENT
+                                                                          false, // APPEND
+                                                                          false, // SCAN
+                                                                          false, // TTL
+                                                                          true, // CHECK_AND_INSERT_UP
+                                                                          false // INVALID
+                                                                          );
 
     ObTableOperationType(int value) {
         this.value = value;
@@ -71,4 +83,8 @@ public byte getByteValue() {
     public boolean isReadonly() {
         return this.value == GET.value;
     }
+
+    public static boolean needEncodeQuery(ObTableOperationType type) {
+        return needEncodeQuery.get(type.value);
+    }
 }

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

@@ -54,9 +54,11 @@ public byte[] encode() {
         idx += len;
 
         // 3. encode single op query
-        len = (int) query.getPayloadSize();
-        System.arraycopy(query.encode(), 0, bytes, idx, len);
-        idx += len;
+        if (ObTableOperationType.needEncodeQuery(singleOpType)) {
+            len = (int) query.getPayloadSize();
+            System.arraycopy(query.encode(), 0, bytes, idx, len);
+            idx += len;
+        }
 
         // 4. encode entities
         len = Serialization.getNeedBytes(entities.size());
@@ -80,7 +82,9 @@ public Object decode(ByteBuf buf) {
 
         this.singleOpType = ObTableOperationType.valueOf(Serialization.decodeI8(buf.readByte()));
         this.singleOpFlag.setValue(Serialization.decodeVi64(buf));
-        this.query.decode(buf);
+        if (ObTableOperationType.needEncodeQuery(this.singleOpType)) {
+            this.query.decode(buf);
+        }
         int len = (int) Serialization.decodeVi64(buf);
         for (int i = 0; i < len; i++) {
             ObTableSingleOpEntity entity = new ObTableSingleOpEntity();
@@ -96,10 +100,11 @@ public Object decode(ByteBuf buf) {
      */
     @Override
     public long getPayloadContentSize() {
-
         long payloadContentSize = Serialization.getNeedBytes(singleOpType.getByteValue());
         payloadContentSize += Serialization.getNeedBytes(singleOpFlag.getValue());
-        payloadContentSize += query.getPayloadSize();
+        if (ObTableOperationType.needEncodeQuery(singleOpType)) {
+            payloadContentSize += query.getPayloadSize();
+        }
         payloadContentSize += Serialization.getNeedBytes(entities.size());
         for (ObTableSingleOpEntity entity : entities) {
             payloadContentSize += entity.getPayloadSize();

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

@@ -676,7 +676,7 @@ public void testNotInAnyPartition() throws Exception {
             // 1651334400000L -> 2022-05-01 00:00:00 (GMT +8)
             Date date = new Date(1651334400000L);
             long affectedRows = obTableClient.insert(testTable, new Object[] { date, date },
-                    new String[] { "c2" }, new Object[] {"value"});
+                new String[] { "c2" }, new Object[] { "value" });
             Assert.assertTrue("Insert should fail since no partition could be inserted", false);
         } catch (IndexOutOfBoundsException e) {
             // do nothing