Skip to content

Enable Increment and Append isReturnResults flag #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable Increment and Append isReturnResults flag #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c30c0c0
add isReturnResults flag to QueryAndMutateRequest in Increment and Ap…
JackShi148 Mar 31, 2025
83892b3
fix runtimeBatchExecutor not set to OHTable in OHTableClient init
JackShi148 Mar 31, 2025
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
8 changes: 2 additions & 6 deletions src/main/java/com/alipay/oceanbase/hbase/OHTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,13 +1357,10 @@ public Result append(Append append) throws IOException {
// the later hbase has supported timeRange
ObHTableFilter filter = buildObHTableFilter(null, null, 1, qualifiers);
ObTableQuery obTableQuery = buildObTableQuery(filter, r, true, r, true, false);
ObTableQueryAndMutate queryAndMutate = new ObTableQueryAndMutate();
queryAndMutate.setTableQuery(obTableQuery);
queryAndMutate.setMutations(batchOperation);
ObTableQueryAndMutateRequest request = buildObTableQueryAndMutateRequest(obTableQuery,
batchOperation,
getTargetTableName(tableNameString, Bytes.toString(f), configuration));
request.setReturningAffectedEntity(true);
request.setReturningAffectedEntity(append.isReturnResults());
ObTableQueryAndMutateResult result = (ObTableQueryAndMutateResult) obTableClient
.execute(request);
ObTableQueryResult queryResult = result.getAffectedEntity();
Expand Down Expand Up @@ -1412,7 +1409,7 @@ public Result increment(Increment increment) throws IOException {

ObTableQueryAndMutateRequest request = buildObTableQueryAndMutateRequest(obTableQuery,
batch, getTargetTableName(tableNameString, Bytes.toString(f), configuration));
request.setReturningAffectedEntity(true);
request.setReturningAffectedEntity(increment.isReturnResults());
ObTableQueryAndMutateResult result = (ObTableQueryAndMutateResult) obTableClient
.execute(request);
ObTableQueryResult queryResult = result.getAffectedEntity();
Expand Down Expand Up @@ -2161,7 +2158,6 @@ private ObTableQueryAndMutateRequest buildObTableQueryAndMutateRequest(ObTableQu
request.setTableName(targetTableName);
request.setTableQueryAndMutate(queryAndMutate);
request.setEntityType(ObTableEntityType.HKV);
request.setReturningAffectedEntity(true);
return request;
}

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/alipay/oceanbase/hbase/OHTableClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class OHTableClient implements HTableInterface, Lifecycle {
private OHTable ohTable;
private volatile boolean initialized = false;
private final Configuration conf;
private ExecutorService runtimeBatchExecutor;
private ExecutorService runtimeBatchExecutor = null;

public void setRuntimeBatchExecutor(ExecutorService runtimeBatchExecutor) {
this.runtimeBatchExecutor = runtimeBatchExecutor;
Expand Down Expand Up @@ -82,7 +82,11 @@ public void init() throws Exception {
lock.lock();
try {
if (!initialized) {
ohTable = new OHTable(conf, tableNameString);
if (runtimeBatchExecutor != null) {
ohTable = new OHTable(conf, tableName, runtimeBatchExecutor);
} else {
ohTable = new OHTable(conf, tableNameString);
}
initialized = true;
}
} finally {
Expand Down