[Test] fix testcases

Author: shenyunlong

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

@@ -17,6 +17,8 @@
 
 package com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query;
 
+import com.alipay.oceanbase.rpc.exception.FeatureNotSupportedException;
+import com.alipay.oceanbase.rpc.table.ObHBaseParams;
 import com.alipay.oceanbase.rpc.table.ObKVParams;
 import com.alipay.oceanbase.rpc.protocol.payload.AbstractPayload;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.aggregation.ObTableAggregationSingle;
@@ -59,7 +61,7 @@ public class ObTableQuery extends AbstractPayload {
     private long                maxResultSize             = -1;
     private ObHTableFilter      hTableFilter;
 
-    private static final byte[] HTABLE_FILTER_DUMMY_BYTES = new byte[] { 0x01, 0x00 };
+    private static final byte[] HTABLE_DUMMY_BYTES = new byte[] { 0x01, 0x00 };
     private boolean             isHbaseQuery              = false;
     private List<String>        scanRangeColumns          = new LinkedList<String>();
 
@@ -152,8 +154,8 @@ public byte[] encode() {
             len = (int) hTableFilter.getPayloadSize();
             System.arraycopy(hTableFilter.encode(), 0, bytes, idx, len);
         } else {
-            len = HTABLE_FILTER_DUMMY_BYTES.length;
-            System.arraycopy(HTABLE_FILTER_DUMMY_BYTES, 0, bytes, idx, len);
+            len = HTABLE_DUMMY_BYTES.length;
+            System.arraycopy(HTABLE_DUMMY_BYTES, 0, bytes, idx, len);
         }
         idx += len;
 
@@ -181,8 +183,8 @@ public byte[] encode() {
             System.arraycopy(obKVParams.encode(), 0, bytes, idx, len);
             idx += len;
         } else {
-            len = HTABLE_FILTER_DUMMY_BYTES.length;
-            System.arraycopy(HTABLE_FILTER_DUMMY_BYTES, 0, bytes, idx, len);
+            len = HTABLE_DUMMY_BYTES.length;
+            System.arraycopy(HTABLE_DUMMY_BYTES, 0, bytes, idx, len);
             idx += len;
         }
 
@@ -277,7 +279,7 @@ public long getPayloadContentSize() {
             contentSize += hTableFilter.getPayloadSize();
             contentSize += obKVParams.getPayloadSize();
         } else {
-            contentSize += HTABLE_FILTER_DUMMY_BYTES.length;
+            contentSize += 2 * HTABLE_DUMMY_BYTES.length;
         }
         contentSize += Serialization.getNeedBytes(scanRangeColumns.size());
         for (String scanRangeColumn : scanRangeColumns) {
@@ -486,7 +488,10 @@ public void setScanRangeColumns(List<String> scanRangeColumns) {
     }
 
     // This interface is just for OBKV-Hbase
-    public void setObHbaseParams(ObKVParams obKVParams) {
+    public void setObKVParams(ObKVParams obKVParams) {
+        if (!(obKVParams.getObParamsBase() instanceof ObHBaseParams)) {
+            throw new FeatureNotSupportedException("only ObHBaseParams support currently");
+        }
         this.isHbaseQuery = true;
         this.obKVParams = obKVParams;
     }

src/test/java/com/alipay/oceanbase/rpc/hbase/ObHTableOperationRequest.java

@@ -28,6 +28,8 @@
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObNewRange;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObTableQuery;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObTableQueryRequest;
+import com.alipay.oceanbase.rpc.table.ObHBaseParams;
+import com.alipay.oceanbase.rpc.table.ObKVParams;
 
 public class ObHTableOperationRequest {
 
@@ -112,6 +114,13 @@ public void setOperationType(ObTableOperationType operationType) {
         this.operationType = operationType;
     }
 
+    public void setObKVParams(ObTableQuery query) {
+        ObHBaseParams params = new ObHBaseParams();
+        ObKVParams obKVParams = new ObKVParams();
+        obKVParams.setObParamsBase(params);
+        query.setObKVParams(obKVParams);
+    }
+
     public ObTableAbstractOperationRequest obTableOperationRequest() {
         // TODO 这个类仅作为测试用，到时候要移到独立的 JAR 包内
         ObTableAbstractOperationRequest request = null;
@@ -136,6 +145,10 @@ public ObTableAbstractOperationRequest obTableOperationRequest() {
                 ObHTableFilter filter = new ObHTableFilter();
                 filter.addSelectColumnQualifier("qualifierName");
                 obTableQuery.sethTableFilter(filter);
+                ObHBaseParams params = new ObHBaseParams();
+                ObKVParams obKVParams = new ObKVParams();
+                obKVParams.setObParamsBase(params);
+                setObKVParams(obTableQuery);
 
                 ObNewRange obNewRange = new ObNewRange();
                 obNewRange
@@ -187,6 +200,7 @@ public ObTableAbstractOperationRequest obTableGroupOperationRequest() {
                 obTableQuery.addSelectColumn("Q");
                 obTableQuery.addSelectColumn("T");
                 obTableQuery.addSelectColumn("V");
+                setObKVParams(obTableQuery);
 
                 request.setTableName(getTableName());
                 ((ObTableQueryRequest) request).setTableQuery(obTableQuery);
@@ -209,6 +223,7 @@ public ObTableAbstractOperationRequest obTableGroupOperationRequest() {
                 obTableQuery.addSelectColumn("Q");
                 obTableQuery.addSelectColumn("T");
                 obTableQuery.addSelectColumn("V");
+                setObKVParams(obTableQuery);
 
                 request.setTableName(getTableName());
                 ((ObTableQueryRequest) request).setTableQuery(obTableQuery);

src/test/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/ObTableQueryPayloadTest.java

@@ -20,6 +20,8 @@
 import com.alipay.oceanbase.rpc.protocol.payload.impl.*;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableConsistencyLevel;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableEntityType;
+import com.alipay.oceanbase.rpc.table.ObHBaseParams;
+import com.alipay.oceanbase.rpc.table.ObKVParams;
 import com.alipay.oceanbase.rpc.util.ObBytesString;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -79,6 +81,10 @@ public void test_ObTableQuery() {
     public void test_ObTableQueryWithHbaseQuery() {
         ObTableQuery obTableQuery = getObTableQuery();
         obTableQuery.sethTableFilter(getObHTableFilter());
+        ObHBaseParams hBaseParams = new ObHBaseParams();
+        ObKVParams kv_prams = new ObKVParams();
+        kv_prams.setObParamsBase(hBaseParams);
+        obTableQuery.setObKVParams(kv_prams);
 
         byte[] bytes = obTableQuery.encode();
         ByteBuf buf = PooledByteBufAllocator.DEFAULT.buffer();