Skip to content

Commit c08a2c8

Browse files
committed
add NeedTabletId flag
1 parent 45b5485 commit c08a2c8

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2373,6 +2373,7 @@ private BatchOperation buildBatchOperation(String tableName, List<? extends Row>
23732373
}
23742374
batch.setEntityType(ObTableEntityType.HKV);
23752375
batch.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
2376+
batch.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
23762377
return batch;
23772378
}
23782379

@@ -2478,6 +2479,7 @@ private ObTableQueryRequest buildObTableQueryRequest(ObTableQuery obTableQuery,
24782479
request.setTableQuery(obTableQuery);
24792480
request.setTableName(targetTableName);
24802481
request.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
2482+
request.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
24812483
return request;
24822484
}
24832485

@@ -2492,6 +2494,7 @@ private ObTableQueryAsyncRequest buildObTableQueryAsyncRequest(ObTableQuery obTa
24922494
asyncRequest.setTableName(targetTableName);
24932495
asyncRequest.setObTableQueryRequest(request);
24942496
asyncRequest.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
2497+
asyncRequest.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
24952498
return asyncRequest;
24962499
}
24972500

@@ -2507,6 +2510,7 @@ private ObTableQueryAndMutateRequest buildObTableQueryAndMutateRequest(ObTableQu
25072510
request.setEntityType(ObTableEntityType.HKV);
25082511
request.setReturningAffectedEntity(true);
25092512
request.setServerCanRetry(OHBaseFuncUtils.serverCanRetry(obTableClient));
2513+
request.setNeedTabletId(OHBaseFuncUtils.needTabletId(obTableClient));
25102514
return request;
25112515
}
25122516

src/main/java/com/alipay/oceanbase/hbase/util/OHBaseFuncUtils.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,15 @@ public static boolean serverCanRetry(ObTableClient tableClient) {
111111
return true;
112112
}
113113
}
114+
115+
public static boolean needTabletId(ObTableClient tableClient) {
116+
if (tableClient.isOdpMode()) {
117+
return ObGlobal.isDistributeNeedTabletIdSupport()
118+
&& ObGlobal.OB_PROXY_VERSION >= ObGlobal.OB_PROXY_VERSION_4_3_6_0
119+
&& tableClient.getServerCapacity().isSupportDistributedExecute();
120+
} else {
121+
return ObGlobal.isDistributeNeedTabletIdSupport()
122+
&& tableClient.getServerCapacity().isSupportDistributedExecute();
123+
}
124+
}
114125
}

0 commit comments

Comments
 (0)