Skip to content
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

fix return_one_result flag not return one result #110

Merged
merged 2 commits into from
Mar 13, 2024
Merged

fix return_one_result flag not return one result #110

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
1bdb60f
fix return_one_result flag not return one result
eemjwu Mar 11, 2024
3479686
fix review
eemjwu Mar 12, 2024
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
22 changes: 19 additions & 3 deletions src/main/java/com/alipay/oceanbase/rpc/ObClusterTableBatchOps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@

package com.alipay.oceanbase.rpc;

import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableBatchOperation;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableBatchOperationResult;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableEntityType;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.*;
import com.alipay.oceanbase.rpc.table.AbstractTableBatchOps;
import com.alipay.oceanbase.rpc.table.ObTableClientBatchOpsImpl;

Expand Down Expand Up @@ -117,6 +115,7 @@ public void put(Object[] rowkeys, String[] columns, Object[] values) {
*/
@Override
public List<Object> execute() throws Exception {
preCheck();
return tableBatchOps.execute();
}

Expand All @@ -125,13 +124,15 @@ public List<Object> execute() throws Exception {
*/
@Override
public List<Object> executeWithResult() throws Exception {
preCheck();
return tableBatchOps.executeWithResult();
}

/*
* Execute internal.
*/
public ObTableBatchOperationResult executeInternal() throws Exception {
preCheck();
return tableBatchOps.executeInternal();
}

Expand Down Expand Up @@ -181,4 +182,19 @@ public void setReturnOneResult(boolean returnOneResult) {
super.setReturnOneResult(returnOneResult);
tableBatchOps.setReturnOneResult(returnOneResult);
}

void preCheck() {
List<ObTableOperation> operations = this.tableBatchOps.getObTableBatchOperation().getTableOperations();
if (operations.isEmpty()) {
throw new IllegalArgumentException("operations is empty");
}
ObTableOperationType lastType = operations.get(0).getOperationType();
if (returnOneResult
&& !(this.tableBatchOps.getObTableBatchOperation().isSameType() && (lastType == ObTableOperationType.INSERT
|| lastType == ObTableOperationType.PUT
|| lastType == ObTableOperationType.REPLACE || lastType == ObTableOperationType.DEL))) {
throw new IllegalArgumentException(
"returnOneResult only support multi-insert/put/replace/del");
}
}
}
80 changes: 49 additions & 31 deletions src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientBatchOpsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,38 +406,50 @@ public void partitionExecute(ObTableOperationResult[] results,
List<ObTableOperationResult> subObTableOperationResults = subObTableBatchOperationResult
.getResults();

if (subObTableOperationResults.size() < subOperations.getTableOperations().size()) {
// only one result when it across failed
// only one result when hkv puts
if (subObTableOperationResults.size() == 1) {
ObTableOperationResult subObTableOperationResult = subObTableOperationResults
.get(0);
if (returnOneResult) {
ObTableOperationResult subObTableOperationResult = subObTableOperationResults.get(0);
if (results[0] == null) {
results[0] = new ObTableOperationResult();
subObTableOperationResult.setExecuteHost(subObTable.getIp());
subObTableOperationResult.setExecutePort(subObTable.getPort());
for (ObPair<Integer, ObTableOperation> aSubOperationWithIndexList : subOperationWithIndexList) {
results[aSubOperationWithIndexList.getLeft()] = subObTableOperationResult;
}
results[0] = subObTableOperationResult;
} else {
// unexpected result found
throw new IllegalArgumentException(
"check batch operation result size error: operation size ["
+ subOperations.getTableOperations().size() + "] result size ["
+ subObTableOperationResults.size() + "]");
results[0].setAffectedRows(results[0].getAffectedRows() + subObTableOperationResult.getAffectedRows());
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to accumulate affected_rows when the table operation spans two or more tablet

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

} else {
if (subOperationWithIndexList.size() != subObTableOperationResults.size()) {
throw new ObTableUnexpectedException("check batch result error: partition "
+ partId + " expect result size "
+ subOperationWithIndexList.size()
+ " actual result size "
+ subObTableOperationResults.size());
}
for (int i = 0; i < subOperationWithIndexList.size(); i++) {
ObTableOperationResult subObTableOperationResult = subObTableOperationResults
.get(i);
subObTableOperationResult.setExecuteHost(subObTable.getIp());
subObTableOperationResult.setExecutePort(subObTable.getPort());
results[subOperationWithIndexList.get(i).getLeft()] = subObTableOperationResult;
if (subObTableOperationResults.size() < subOperations.getTableOperations().size()) {
// only one result when it across failed
// only one result when hkv puts
if (subObTableOperationResults.size() == 1) {
ObTableOperationResult subObTableOperationResult = subObTableOperationResults
.get(0);
subObTableOperationResult.setExecuteHost(subObTable.getIp());
subObTableOperationResult.setExecutePort(subObTable.getPort());
for (ObPair<Integer, ObTableOperation> aSubOperationWithIndexList : subOperationWithIndexList) {
results[aSubOperationWithIndexList.getLeft()] = subObTableOperationResult;
}
} else {
// unexpected result found
throw new IllegalArgumentException(
"check batch operation result size error: operation size ["
+ subOperations.getTableOperations().size() + "] result size ["
+ subObTableOperationResults.size() + "]");
}
} else {
if (subOperationWithIndexList.size() != subObTableOperationResults.size()) {
throw new ObTableUnexpectedException("check batch result error: partition "
+ partId + " expect result size "
+ subOperationWithIndexList.size()
+ " actual result size "
+ subObTableOperationResults.size());
}
for (int i = 0; i < subOperationWithIndexList.size(); i++) {
ObTableOperationResult subObTableOperationResult = subObTableOperationResults
.get(i);
subObTableOperationResult.setExecuteHost(subObTable.getIp());
subObTableOperationResult.setExecutePort(subObTable.getPort());
results[subOperationWithIndexList.get(i).getLeft()] = subObTableOperationResult;
}
}
}
String endpoint = subObTable.getIp() + ":" + subObTable.getPort();
Expand All @@ -457,16 +469,22 @@ public ObTableBatchOperationResult executeInternal() throws Exception {
}
long start = System.currentTimeMillis();
List<ObTableOperation> operations = batchOperation.getTableOperations();
final ObTableOperationResult[] obTableOperationResults = new ObTableOperationResult[operations
.size()];
ObTableOperationResult[] obTableOperationResults = null;
if (returnOneResult) {
obTableOperationResults = new ObTableOperationResult[1];
} else {
obTableOperationResults = new ObTableOperationResult[operations.size()];
}

Map<Long, ObPair<ObTableParam, List<ObPair<Integer, ObTableOperation>>>> partitions = partitionPrepare();
long getTableTime = System.currentTimeMillis();
final Map<Object, Object> context = ThreadLocalMap.getContextMap();
if (executorService != null && !executorService.isShutdown() && partitions.size() > 1) {
final ConcurrentTaskExecutor executor = new ConcurrentTaskExecutor(executorService,
partitions.size());
for (final Map.Entry<Long, ObPair<ObTableParam, List<ObPair<Integer, ObTableOperation>>>> entry : partitions
.entrySet()) {
.entrySet()) {
ObTableOperationResult[] finalObTableOperationResults = obTableOperationResults;
executor.execute(new ConcurrentTask() {
/*
* Do task.
Expand All @@ -475,7 +493,7 @@ public ObTableBatchOperationResult executeInternal() throws Exception {
public void doTask() {
try {
ThreadLocalMap.transmitContextMap(context);
partitionExecute(obTableOperationResults, entry);
partitionExecute(finalObTableOperationResults, entry);
} catch (Exception e) {
logger.error(LCD.convert("01-00026"), e);
executor.collectExceptions(e);
Expand Down
Loading
Loading