vldpyatkov commented on code in PR #2475:
URL: https://github.com/apache/ignite-3/pull/2475#discussion_r1302836347


##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -970,28 +976,41 @@ private CompletableFuture<Void> continueIndexScan(
                         return completedFuture(null); // End of range reached. 
Exit loop.
                     }
 
-                    return lockManager.acquire(txId, new LockKey(tableId(), 
currentRow.rowId()), LockMode.S)
+                    RowId rowId = currentRow.rowId();
+
+                    return lockManager.acquire(txId, new LockKey(tableId(), 
rowId), LockMode.S)
                             .thenComposeAsync(rowLock -> { // Table row S lock
-                                ReadResult readResult = 
mvDataStorage.read(currentRow.rowId(), HybridTimestamp.MAX_VALUE);
-                                return 
resolveAndCheckReadCompatibility(readResult, txId)
-                                        .thenCompose(resolvedReadResult -> {
-                                            if (resolvedReadResult != null) {
-                                                if 
(indexRowMatches(currentRow, resolvedReadResult, schemaAwareIndexStorage)) {
-                                                    
result.add(resolvedReadResult);
-                                                }
-                                            }
-
-                                            // Proceed scan.
-                                            return continueIndexScan(
-                                                    txId,
-                                                    schemaAwareIndexStorage,
-                                                    indexLocker,
-                                                    indexCursor,
-                                                    batchSize,
-                                                    result,
-                                                    isUpperBoundAchieved
-                                            );
-                                        });
+                                ReadResult readResult = 
mvDataStorage.read(rowId, HybridTimestamp.MAX_VALUE);
+                                return 
resolveAndCheckReadCompatibility(readResult, txId, () -> {
+                                    if (readResult.newestCommitTimestamp() == 
null) {

Review Comment:
   I am not sure it is needed. We already have the same logic for the 
resolution in other places. In the code where we check it for a cursor, we are 
doing this to avoid additional calculations on a commit candidate, but when the 
closure is invoked, we might be sure the committed value is really needed.



-- 
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

Reply via email to