Skip to content

feat: add flag field serialization support for ObTableSingleOpQuery #431

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

Merged
WeiXinChan merged 1 commit into from
Jan 6, 2026
+22 −5
Merged

feat: add flag field serialization support for ObTableSingleOpQuery #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ...ain/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/ObTableSingleOpQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ public byte[] encode() {
idx += len;
}
}

// 5. encode flag
len = Serialization.getNeedBytes(flag.getValue());
System.arraycopy(Serialization.encodeVi64(flag.getValue()), 0, bytes, idx, len);
idx += len;

return bytes;
}

Expand Down Expand Up @@ -151,6 +157,9 @@ public void encode(ObByteBuf buf) {
buf.writeBytes(HTABLE_DUMMY_BYTES);
}
}

// encode flag
Serialization.encodeVi64(buf, flag.getValue());
}

/*
Expand Down Expand Up @@ -233,6 +242,10 @@ public long getPayloadContentSize() {
payloadContentSize += HTABLE_DUMMY_BYTES.length;
}
}

// calculate flag size
payloadContentSize += Serialization.getNeedBytes(flag.getValue());

this.payLoadContentSize = payloadContentSize;
}

Expand Down
14 changes: 9 additions & 5 deletions src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientLSBatchOpsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ public void addOperation(TableQuery query) throws Exception {
obTableQuery.getSelectColumns(), obTableQuery.getScanOrder(),
obTableQuery.isHbaseQuery(), obTableQuery.gethTableFilter(),
obTableQuery.getObKVParams(), obTableQuery.getFilterString());
singleOpQuery.setFlag(obTableQuery.getFlag());
singleOp.setQuery(singleOpQuery);
singleOp.setSingleOpType(ObTableOperationType.SCAN);
} else {
Expand All @@ -243,6 +244,7 @@ public void addOperation(QueryAndMutate queryAndMutate) {
obTableQuery.getSelectColumns(), obTableQuery.getScanOrder(),
obTableQuery.isHbaseQuery(), obTableQuery.gethTableFilter(),
obTableQuery.getObKVParams(), obTableQuery.getFilterString());
singleOpQuery.setFlag(obTableQuery.getFlag());
singleOp.setQuery(singleOpQuery);
singleOp.setQuery(singleOpQuery);
singleOp.setSingleOpType(ObTableOperationType.QUERY_AND_MUTATE);
Expand Down Expand Up @@ -859,14 +861,15 @@ private void executeWithRetries(ObTableSingleOpResult[] results,
long costMillis = System.currentTimeMillis() - startExecute;
if (costMillis > runTimeMaxWait) {
errMsg = tableName + " failed to execute operation after retrying " + retryCount
+ " times and it has waited " + costMillis + " ms"
+ " which exceeds runtime max wait timeout " + runTimeMaxWait
+ " ms. Last error Msg:" + "[errCode=" + errCode + "] " + errMsg;
+ " times and it has waited " + costMillis + " ms"
+ " which exceeds runtime max wait timeout " + runTimeMaxWait
+ " ms. Last error Msg:" + "[errCode=" + errCode + "] " + errMsg;
throw new ObTableUnexpectedException(errMsg);
}
boolean allPartitionsSuccess = true;

Iterator<Map.Entry<Long, TabletOperationsMap>> iterator = currentPartitions.entrySet().iterator();
Iterator<Map.Entry<Long, TabletOperationsMap>> iterator = currentPartitions.entrySet()
.iterator();
while (iterator.hasNext()) {
Map.Entry<Long, TabletOperationsMap> currentEntry = iterator.next();
try {
Expand All @@ -876,7 +879,8 @@ private void executeWithRetries(ObTableSingleOpResult[] results,
retryCount++;
errCode = ((ObTableNeedFetchMetaException) e).getErrorCode();
errMsg = e.getMessage();
BatchIdxOperationPairList failedOperations = extractOperations(currentEntry, iterator); // reschedule failed and sequent operations
BatchIdxOperationPairList failedOperations = extractOperations(
currentEntry, iterator); // reschedule failed and sequent operations
currentPartitions = prepareOperations(failedOperations);
allPartitionsSuccess = false;
break;
Expand Down