You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by "sashapolo (via GitHub)" <gi...@apache.org> on 2025/07/23 15:41:45 UTC
[PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
sashapolo opened a new pull request, #6309:
URL: https://github.com/apache/ignite-3/pull/6309
https://issues.apache.org/jira/browse/IGNITE-26008
Thank you for submitting the pull request.
To streamline the review process of the patch and ensure better code quality
we ask both an author and a reviewer to verify the following:
### The Review Checklist
- [ ] **Formal criteria:** TC status, codestyle, mandatory documentation. Also make sure to complete the following:
\- There is a single JIRA ticket related to the pull request.
\- The web-link to the pull request is attached to the JIRA ticket.
\- The JIRA ticket has the Patch Available state.
\- The description of the JIRA ticket explains WHAT was made, WHY and HOW.
\- The pull request title is treated as the final commit message. The following pattern must be used: IGNITE-XXXX Change summary where XXXX - number of JIRA issue.
- [ ] **Design:** new code conforms with the design principles of the components it is added to.
- [ ] **Patch quality:** patch cannot be split into smaller pieces, its size must be reasonable.
- [ ] **Code quality:** code is clean and readable, necessary developer documentation is added if needed.
- [ ] **Tests code quality:** test set covers positive/negative scenarios, happy/edge cases. Tests are effective in terms of execution time and resources.
### Notes
- [Apache Ignite Coding Guidelines](https://cwiki.apache.org/confluence/display/IGNITE/Java+Code+Style+Guide)
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "ibessonov (via GitHub)" <gi...@apache.org>.
ibessonov commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2235346913
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
I'm too afraid to respond =)
Probably? Let's not do it here, there may be some consequences
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "ibessonov (via GitHub)" <gi...@apache.org>.
ibessonov commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2235370370
##########
modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTableScanTest.java:
##########
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.distributed;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.IntStream;
+import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
+import org.apache.ignite.tx.Transaction;
+import org.junit.jupiter.api.Test;
+
+class ItTableScanTest extends ClusterPerClassIntegrationTest {
+ private static final String ZONE_NAME = "TEST_ZONE";
+
+ private static final String TABLE_NAME = "TEST";
+
+ @Override
+ protected int initialNodes() {
+ return 1;
+ }
+
+ @Test
+ void testScanOrderIsPreservedWithWriteIntents() {
Review Comment:
Very nice test, thank you!
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -974,6 +997,42 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
});
}
+ private static void mergeRowsWithResolvedWriteIntents(
+ List<BinaryRow> rows,
+ Int2ObjectMap<CompletableFuture<TimedBinaryRow>> resolutionFutures,
+ List<BinaryRow> result
+ ) {
+ int curIndex = 0;
+ int rowsIndex = 0;
+
+ for (Entry<CompletableFuture<TimedBinaryRow>> entry : resolutionFutures.int2ObjectEntrySet()) {
Review Comment:
What if we pre-inserted `null` into an original list, and then instead of joining sub-lists we would just do a `set` in a loop? Such an algorithm seems much more simple to me.
Why have you decided to make it this complicated?
Another option, even more efficient one. Have a `List<Object>`. When we're done, replace each completable future value with its result, and cast this list to `List<BinaryRow>`. A little bit dirty, but with a good comment it might be the best solution
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2230393500
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
I mean, can we move this code inside the lambda now? Or will it break something?
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2227914787
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
Why do we call it outside, btw? Also, do you want me to create a ticket?
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "ibessonov (via GitHub)" <gi...@apache.org>.
ibessonov commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2235398525
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -974,6 +997,42 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
});
}
+ private static void mergeRowsWithResolvedWriteIntents(
+ List<BinaryRow> rows,
+ Int2ObjectMap<CompletableFuture<TimedBinaryRow>> resolutionFutures,
+ List<BinaryRow> result
+ ) {
+ int curIndex = 0;
+ int rowsIndex = 0;
+
+ for (Entry<CompletableFuture<TimedBinaryRow>> entry : resolutionFutures.int2ObjectEntrySet()) {
Review Comment:
What if we pre-inserted `null` into an original list, and then instead of joining sub-lists we would just do a `set` in a loop? Such an algorithm seems much more simple to me.
Why have you decided to make it this complicated?
Another option, even more efficient one (edit: questionable statement, I know). Have a `List<Object>`. When we're done, replace each completable future value with its result, and cast this list to `List<BinaryRow>`. A little bit dirty, but with a good comment it might be the best solution
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2235466824
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -974,6 +997,42 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
});
}
+ private static void mergeRowsWithResolvedWriteIntents(
+ List<BinaryRow> rows,
+ Int2ObjectMap<CompletableFuture<TimedBinaryRow>> resolutionFutures,
+ List<BinaryRow> result
+ ) {
+ int curIndex = 0;
+ int rowsIndex = 0;
+
+ for (Entry<CompletableFuture<TimedBinaryRow>> entry : resolutionFutures.int2ObjectEntrySet()) {
Review Comment:
> What if we pre-inserted null into an original list, and then instead of joining sub-lists we would just do a set in a loop?
This seems not possible, because a write intent can resolve into a `null` and we do not return nulls
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "Copilot (via GitHub)" <gi...@apache.org>.
Copilot commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2227563415
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
- resolutionFuts.add(resolveReadResult(readResult, txId, readTimestamp, () -> candidate));
- }
+ candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
+ }
- return allOf(resolutionFuts.toArray(new CompletableFuture[0])).thenCompose(unused -> {
- var rows = new ArrayList<BinaryRow>(count);
+ resolutionFuts.add(resolveWriteIntentAsync(readResult, readTimestamp, () -> candidate));
Review Comment:
The method resolveWriteIntentAsync is being called but this method is not defined or visible in the current diff. This appears to be a new method that should replace resolveReadResult, but without seeing its implementation, this could cause a compilation error.
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -3225,9 +3237,7 @@ private CompletableFuture<IgniteBiTuple<RowId, Collection<Lock>>> takeLocksForRe
@Nullable HybridTimestamp timestamp,
Supplier<@Nullable TimedBinaryRow> lastCommitted
) {
Review Comment:
The null check for readResult was removed, but the method still accesses readResult.isWriteIntent() without verifying readResult is not null. This could cause a NullPointerException if readResult is null.
```suggestion
) {
if (readResult == null) {
return completedFuture(null);
}
```
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2239038522
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
https://issues.apache.org/jira/browse/IGNITE-26052
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2239079725
##########
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:
ok, I'll create a ticket
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo merged PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "ibessonov (via GitHub)" <gi...@apache.org>.
ibessonov commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2230385436
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
If you can create a ticket then that would be awesome.
> Why do we call it outside, btw?
Lack of care for performance, I guess
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2238863847
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
I'll add a ticket
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "Cyrill (via GitHub)" <gi...@apache.org>.
Cyrill commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2238922703
##########
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:
So I see this method was inlined. There is one more usage of it in the code, don't we need to inline that as well?
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "Cyrill (via GitHub)" <gi...@apache.org>.
Cyrill commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2239002909
##########
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:
My assumption is that such change will boost the performance of RO scans. Now we create a few futures per row. They're completed futures if it is not a write intent. Feels like we can improve the code by creating fewer futures, for the whole scan, for example
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2227954453
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
Review Comment:
Makes sense, I'll rework this part and add a test
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "ibessonov (via GitHub)" <gi...@apache.org>.
ibessonov commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2227622538
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
Review Comment:
The order of rows retrieved from the cursor will be violated if there are write intents. Old behavior is not preserved, it might be dangerous
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -891,27 +891,37 @@ private CompletableFuture<List<BinaryRow>> retrieveExactEntriesUntilCursorEmpty(
)
).cursor();
- var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>(count);
+ var rows = new ArrayList<BinaryRow>(count);
- while (resolutionFuts.size() < count && cursor.hasNext()) {
+ var resolutionFuts = new ArrayList<CompletableFuture<TimedBinaryRow>>();
+
+ while ((rows.size() + resolutionFuts.size()) < count && cursor.hasNext()) {
ReadResult readResult = cursor.next();
- HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- TimedBinaryRow candidate;
- if (newestCommitTimestamp == null || !readResult.isWriteIntent()) {
- candidate = null;
+ BinaryRow row = readResult.binaryRow();
+ UUID retrievedResultTxId = readResult.transactionId();
+
+ if (!readResult.isWriteIntent() || (readTimestamp == null && txId.equals(retrievedResultTxId))) {
+ if (row != null) {
+ rows.add(row);
+ }
} else {
- BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
+ HybridTimestamp newestCommitTimestamp = readResult.newestCommitTimestamp();
- candidate = committedRow == null ? null : new TimedBinaryRow(committedRow, newestCommitTimestamp);
- }
+ TimedBinaryRow candidate;
+ if (newestCommitTimestamp == null) {
+ candidate = null;
+ } else {
+ BinaryRow committedRow = cursor.committed(newestCommitTimestamp);
Review Comment:
I want to share my thoughts for the future. Calling `cursor.committed(newestCommitTimestamp)` outside of the `() -> candidate` leads to performance degradation if we encounter a lot of write intents. Maybe we need to add a TODO
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] IGNITE-26008 Reduce the number of CompletableFutures produced by PartitionReplicaListener [ignite-3]
Posted by "sashapolo (via GitHub)" <gi...@apache.org>.
sashapolo commented on code in PR #6309:
URL: https://github.com/apache/ignite-3/pull/6309#discussion_r2239880463
##########
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:
https://issues.apache.org/jira/browse/IGNITE-26055
--
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-unsubscribe@ignite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org