fix bug

Author: JackShi148

src/main/java/com/alipay/oceanbase/rpc/mutation/BatchOperation.java

@@ -197,6 +197,7 @@ private BatchOperationResult executeWithNormalBatchOp() throws Exception {
             throw new IllegalArgumentException("table name is null");
         }
         TableBatchOps batchOps = client.batch(tableName);
+        batchOps.setEntityType(entityType);
         boolean hasSetRowkeyElement = false;
 
         for (Object operation : operations) {
@@ -276,7 +277,6 @@ private BatchOperationResult executeWithNormalBatchOp() throws Exception {
                 throw new ObTableException("unknown operation " + operation);
             }
         }
-        batchOps.setEntityType(entityType);
         batchOps.setAtomicOperation(isAtomic);
         batchOps.setReturnOneResult(returnOneResult);
         return new BatchOperationResult(batchOps.executeWithResult());
@@ -292,6 +292,7 @@ private BatchOperationResult executeWithLSBatchOp() throws Exception {
 
         if (client instanceof ObTableClient) {
             batchOps = new ObTableClientLSBatchOpsImpl(tableName, (ObTableClient) client);
+            batchOps.setEntityType(entityType);
             for (Object operation : operations) {
                 if (operation instanceof CheckAndInsUp) {
                     checkAndInsUpCnt++;
@@ -342,7 +343,6 @@ private BatchOperationResult executeWithLSBatchOp() throws Exception {
         batchOps.setReturningAffectedEntity(withResult);
         batchOps.setReturnOneResult(returnOneResult);
         batchOps.setAtomicOperation(isAtomic);
-        batchOps.setEntityType(entityType);
         return new BatchOperationResult(batchOps.executeWithResult());
     }
 

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

@@ -34,7 +34,7 @@ public enum ObTableOperationType {
 
     private int                                       value;
     private static Map<Integer, ObTableOperationType> map             = new HashMap<Integer, ObTableOperationType>();
-    private static final List<Boolean>                needEncodeQuery = Arrays.asList(false, // GET
+    private static final List<Boolean>                needEncodeQuery = Arrays.asList(true, // GET
                                                                           false, // INSERT
                                                                           false, // DEL
                                                                           false, // UPDATE

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

@@ -242,8 +242,10 @@ public void adjustScanRangeColumns(Map<String, Long> columnNameIdxMap) {
                 adjustStartKey.add(startKey.get((int) pair.origin_idx));
                 adjustEndtKey.add(endKey.get((int) pair.origin_idx));
             }
-            range.getStartKey().setObjs(adjustStartKey);
-            range.getEndKey().setObjs(adjustEndtKey);
+            if (!adjustStartKey.isEmpty() && !adjustEndtKey.isEmpty()) {
+                range.getStartKey().setObjs(adjustStartKey);
+                range.getEndKey().setObjs(adjustEndtKey);
+            }
         }
 
         this.scanRangeBitMap = byteArray;

src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientLSBatchOpsImpl.java

@@ -200,14 +200,11 @@ public void addOperation(TableQuery query) throws Exception {
         ObTableSingleOp singleOp = new ObTableSingleOp();
         if (entityType == ObTableEntityType.HKV) {
             ObTableQuery obTableQuery = query.getObTableQuery();
-            ObTableSingleOpQuery singleOpQuery = ObTableSingleOpQuery.getInstance(obTableQuery.getIndexName(),
-                                                                                  obTableQuery.getKeyRanges(),
-                                                                                  obTableQuery.getSelectColumns(),
-                                                                                  obTableQuery.getScanOrder(),
-                                                                                  obTableQuery.isHbaseQuery(),
-                                                                                  obTableQuery.gethTableFilter(),
-                                                                                  obTableQuery.getObKVParams(),
-                                                                                  obTableQuery.getFilterString());
+            ObTableSingleOpQuery singleOpQuery = ObTableSingleOpQuery.getInstance(
+                obTableQuery.getIndexName(), obTableQuery.getKeyRanges(),
+                obTableQuery.getSelectColumns(), obTableQuery.getScanOrder(),
+                obTableQuery.isHbaseQuery(), obTableQuery.gethTableFilter(),
+                obTableQuery.getObKVParams(), obTableQuery.getFilterString());
             singleOp.setQuery(singleOpQuery);
         }
         singleOp.setSingleOpType(ObTableOperationType.GET);