From e489ada1d5ba57605e48290ba98573f2c90cb6f3 Mon Sep 17 00:00:00 2001
From: hexueyu <hexueyu.hxy@antgroup.com>
Date: Fri, 6 Sep 2024 11:48:10 +0800
Subject: [PATCH] Optimize obkv_params method

---
 .../com/alipay/oceanbase/hbase/OHTable.java   | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java
index 7efb7669..17e37c49 100644
--- a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java
+++ b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java
@@ -515,11 +515,10 @@ public Result call() throws IOException {
                             scan.setCaching(1);
                             scan.setReversed(true);
                             obTableQuery = buildObTableQuery(filter, scan);
-                            obTableQuery.setObKVParams(buildOBKVParams(scan));
                         } else {
                             obTableQuery = buildObTableQuery(filter, get.getRow(), true,
                                 get.getRow(), true);
-                            obTableQuery.setObKVParams(buildOBKVParams(get));
+                            obTableQuery.setHBaseParams(buildObHBaseParams(get));
                         }
                         request = buildObTableQueryRequest(obTableQuery,
                             getTargetTableName(tableNameString));
@@ -538,11 +537,10 @@ public Result call() throws IOException {
                                 scan.setCaching(1);
                                 scan.setReversed(true);
                                 obTableQuery = buildObTableQuery(filter, scan);
-                                obTableQuery.setObKVParams(buildOBKVParams(scan));
                             } else {
                                 obTableQuery = buildObTableQuery(filter, get.getRow(), true,
                                     get.getRow(), true);
-                                obTableQuery.setObKVParams(buildOBKVParams(get));
+                                obTableQuery.setHBaseParams(buildObHBaseParams(get));
                             }
                             request = buildObTableQueryRequest(obTableQuery,
                                 getTargetTableName(tableNameString, Bytes.toString(family)));
@@ -709,8 +707,7 @@ private void validatePut(Put put) {
         }
     }
 
-    private ObKVParams buildOBKVParams(final Scan scan) {
-        ObKVParams obKVParams = new ObKVParams();
+    private ObHBaseParams buildObHBaseParams(final Scan scan) {
         ObHBaseParams obHBaseParams = new ObHBaseParams();
         if (scan != null) {
             obHBaseParams.setCaching(scan.getCaching());
@@ -718,17 +715,14 @@ private ObKVParams buildOBKVParams(final Scan scan) {
             obHBaseParams.setCacheBlock(scan.isGetScan());
             obHBaseParams.setAllowPartialResults(scan.getAllowPartialResults());
         }
-        obKVParams.setObParamsBase(obHBaseParams);
-        return obKVParams;
+        return obHBaseParams;
     }
 
-    private ObKVParams buildOBKVParams(final Get get) {
-        ObKVParams obKVParams = new ObKVParams();
+    private ObHBaseParams buildObHBaseParams(final Get get) {
         ObHBaseParams obHBaseParams = new ObHBaseParams();
         obHBaseParams.setCheckExistenceOnly(get.isCheckExistenceOnly());
         obHBaseParams.setCacheBlock(get.getCacheBlocks());
-        obKVParams.setObParamsBase(obHBaseParams);
-        return obKVParams;
+        return obHBaseParams;
     }
 
     /**
@@ -1471,7 +1465,7 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, final Scan scan) {
         obTableQuery.setMaxResultSize(scan.getMaxResultSize() > 0 ? scan.getMaxResultSize()
             : configuration.getLong(HConstants.HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE_KEY,
                 HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE));
-        obTableQuery.setObKVParams(buildOBKVParams(scan));
+        obTableQuery.setHBaseParams(buildObHBaseParams(scan));
         return obTableQuery;
     }