Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/alipay/oceanbase/hbase/OHTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -2382,7 +2382,7 @@ private BatchOperation buildBatchOperation(String tableName, List<? extends Row>
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);
Expand Down Expand Up @@ -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));
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down