iamaleksey commented on code in PR #4119: URL: https://github.com/apache/cassandra/pull/4119#discussion_r2085074005
########## src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java: ########## @@ -404,42 +406,13 @@ protected void onClose() } @Override - public UnfilteredPartitionIterator augmentResultWithMutations(UnfilteredPartitionIterator result, Collection<Mutation> mutations) - { - if (mutations.isEmpty()) - return result; - - List<UnfilteredPartitionIterator> partitions = new ArrayList<>(mutations.size() + 1); - partitions.add(result); - - for (Mutation mutation : mutations) - { - UnfilteredPartitionIterator iterator = queryMutation(mutation); - if (iterator != null) partitions.add(iterator); - } - - return UnfilteredPartitionIterators.merge(partitions, UnfilteredPartitionIterators.MergeListener.NOOP); - } - - @Override - public UnfilteredPartitionIterator queryJournal(Collection<ShortMutationId> mutationIds) + protected PartialTrackedRead createInProgressRead(UnfilteredPartitionIterator iterator, + ReadExecutionController executionController, + Index.Searcher searcher, + ColumnFamilyStore cfs, + long startTimeNanos) { - if (mutationIds.isEmpty()) - return EmptyIterators.unfilteredPartition(metadata()); - - ArrayList<UnfilteredPartitionIterator> iterators = new ArrayList<>(mutationIds.size()); - - for (ShortMutationId mutationId : mutationIds) - { - Mutation mutation = MutationJournal.instance.read(mutationId); - Preconditions.checkNotNull(mutation); - UnfilteredPartitionIterator iterator = queryMutation(mutation); - if (iterator != null) iterators.add(iterator); - } - - return iterators.isEmpty() - ? EmptyIterators.unfilteredPartition(metadata()) - : UnfilteredPartitionIterators.merge(iterators, UnfilteredPartitionIterators.MergeListener.NOOP); + return PartialTrackedRangeRead.create(executionController, searcher, cfs, startTimeNanos, this, iterator); } @Nullable Review Comment: `queryMutation()` below is also dead code now, can clean up -- 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: pr-unsubscr...@cassandra.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For additional commands, e-mail: pr-h...@cassandra.apache.org