sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2238970683
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -882,55 +883,82 @@ private CompletableFuture<List<BinaryRow>>
retrieveExactEntriesUntilCursorEmpty(
FullyQualifiedResourceId cursorId,
int count
) {
- PartitionTimestampCursor cursor =
- remotelyTriggeredResourceRegistry.<CursorResource>register(
- cursorId,
- txCoordinatorId,
- () -> new CursorResource(
- mvDataStorage.scan(readTimestamp == null ?
HybridTimestamp.MAX_VALUE : readTimestamp)
- )
- ).cursor();
+ var result = new ArrayList<BinaryRow>(count);
- var resolutionFuts = new
ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ return retrieveExactEntriesUntilCursorEmpty(txId, txCoordinatorId,
readTimestamp, cursorId, count, result)
+ .thenApply(v -> {
+ closeCursorIfBatchNotFull(result, count, cursorId);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
- ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp =
readResult.newestCommitTimestamp();
+ return result;
+ });
+ }
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
- } else {
- BinaryRow committedRow =
cursor.committed(newestCommitTimestamp);
+ private CompletableFuture<Void> retrieveExactEntriesUntilCursorEmpty(
+ UUID txId,
+ UUID txCoordinatorId,
+ @Nullable HybridTimestamp readTimestamp,
+ FullyQualifiedResourceId cursorId,
+ int count,
+ List<BinaryRow> result
+ ) {
+ CursorResource resource = remotelyTriggeredResourceRegistry.register(
+ cursorId,
+ txCoordinatorId,
+ () -> new CursorResource(mvDataStorage.scan(readTimestamp ==
null ? HybridTimestamp.MAX_VALUE : readTimestamp))
+ );
- candidate = committedRow == null ? null : new
TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ PartitionTimestampCursor cursor = resource.cursor();
- resolutionFuts.add(resolveReadResult(readResult, txId,
readTimestamp, () -> candidate));
Review Comment:
Inlining this method in the other place will not bring any benefits. The
current inlining is needed because we can avoid creating futures. In the other
place it will be inlined as-is. So I think having a separate method is better
from the POV of code cleanliness.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
