From ace9d913b7dd65b507a3a7758e22e080e1ec59dc Mon Sep 17 00:00:00 2001 From: WeiXinChan Date: Thu, 27 Nov 2025 12:01:23 +0800 Subject: [PATCH] adapt weak read new interface --- src/main/java/com/alipay/oceanbase/hbase/OHTable.java | 6 +++--- .../hbase/execute/AbstractObTableMetaExecutor.java | 1 - .../alipay/oceanbase/hbase/util/ObTableClientManager.java | 5 +++-- .../com/alipay/oceanbase/hbase/ObTableWeakReadTest.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java index f6b55441..41b5e7c6 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java +++ b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java @@ -2382,7 +2382,7 @@ private BatchOperation buildBatchOperation(String tableName, List try { query.setRowKey(row(colVal("K", Bytes.toString(get.getRow())), colVal("Q", null), colVal("T", Integer.MAX_VALUE))); if (isWeakRead(get)) { - query.setReadConsistency("weak"); + query.setReadConsistency(ObReadConsistency.WEAK); } } catch (Exception e) { logger.error("unexpected error occurs when set row key", e); @@ -2568,7 +2568,7 @@ private ObTableQueryRequest buildObTableQueryRequest(ObTableQuery obTableQuery, request.setTableQuery(obTableQuery); request.setTableName(targetTableName); if (isWeakRead) { - request.setConsistencyLevel(ObTableConsistencyLevel.EVENTUAL); + request.setConsistencyLevel(ObReadConsistency.WEAK); } request.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient)); request.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient)); @@ -2591,7 +2591,7 @@ private ObTableQueryAsyncRequest buildObTableQueryAsyncRequest(ObTableQuery obTa asyncRequest.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient)); asyncRequest.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient)); if (isWeakRead) { - asyncRequest.setConsistencyLevel(ObTableConsistencyLevel.EVENTUAL); + asyncRequest.setConsistencyLevel(ObReadConsistency.WEAK); } asyncRequest.setHbaseOpType(opType); return asyncRequest; diff --git a/src/main/java/com/alipay/oceanbase/hbase/execute/AbstractObTableMetaExecutor.java b/src/main/java/com/alipay/oceanbase/hbase/execute/AbstractObTableMetaExecutor.java index 05b48b4a..d5d321e5 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/execute/AbstractObTableMetaExecutor.java +++ b/src/main/java/com/alipay/oceanbase/hbase/execute/AbstractObTableMetaExecutor.java @@ -19,7 +19,6 @@ import com.alipay.oceanbase.hbase.util.OHBaseExceptionUtil; import com.alipay.oceanbase.rpc.ObTableClient; -import com.alipay.oceanbase.rpc.exception.ObTableException; import com.alipay.oceanbase.rpc.meta.ObTableMetaRequest; import com.alipay.oceanbase.rpc.meta.ObTableMetaResponse; import com.alipay.oceanbase.rpc.table.ObTable; diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java b/src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java index 85e10930..ac1cd357 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java +++ b/src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java @@ -20,6 +20,7 @@ import com.alipay.oceanbase.rpc.ObTableClient; import com.alipay.oceanbase.rpc.constant.Constants; import com.alipay.oceanbase.rpc.location.model.ObRoutePolicy; +import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObReadConsistency; import com.alipay.oceanbase.hbase.OHTable; import com.google.common.base.Objects; import org.apache.hadoop.classification.InterfaceAudience; @@ -123,10 +124,10 @@ public static ObTableClient getOrCreateObTableClient(ObTableClientKey obTableCli obTableClient.setCurrentIDC(connectionConfig.getIdc()); } if (connectionConfig.getRoutePolicy() != null) { - obTableClient.setRoutePolicy(connectionConfig.getRoutePolicy()); + obTableClient.setRoutePolicy(ObRoutePolicy.getByName(connectionConfig.getRoutePolicy())); } if (connectionConfig.getGlobalWeakRead() != null) { - obTableClient.setReadConsistency(connectionConfig.getGlobalWeakRead());; + obTableClient.setReadConsistency(ObReadConsistency.getByName(connectionConfig.getGlobalWeakRead())); } obTableClient.init(); OB_TABLE_CLIENT_INSTANCE.put(obTableClientKey, obTableClient); diff --git a/src/test/java/com/alipay/oceanbase/hbase/ObTableWeakReadTest.java b/src/test/java/com/alipay/oceanbase/hbase/ObTableWeakReadTest.java index a02423a6..17b1bf77 100644 --- a/src/test/java/com/alipay/oceanbase/hbase/ObTableWeakReadTest.java +++ b/src/test/java/com/alipay/oceanbase/hbase/ObTableWeakReadTest.java @@ -169,8 +169,8 @@ public class ObTableWeakReadTest { private static String ODP_IP = "ip-addr"; private static int ODP_PORT = 0; private static String ODP_DATABASE = "database-name"; - private static String JDBC_IP = "6.12.233.118"; - private static String JDBC_PORT = "10207"; + private static String JDBC_IP = ""; + private static String JDBC_PORT = ""; private static String JDBC_DATABASE = "test"; private static String JDBC_URL = "jdbc:mysql://" + JDBC_IP