Add partial result to AggregateCursor continuation #3254
Merged
+1,182
−136
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pengpeng-lu
commented
Mar 19, 2025
| (prefixLength < highBytes.length) && | ||
| (lowBytes[prefixLength] == highBytes[prefixLength])) { | ||
| (prefixLength < highBytes.length) && | ||
| (lowBytes[prefixLength] == highBytes[prefixLength])) { |
Contributor
Author
There was a problem hiding this comment.
weird auto formating, will remove it in the next commit.
alecgrieser
requested changes
May 21, 2025
...ayer-core/src/main/java/com/apple/foundationdb/record/cursors/aggregate/AggregateCursor.java
Show resolved
Hide resolved
...ayer-core/src/main/java/com/apple/foundationdb/record/cursors/aggregate/AggregateCursor.java
Show resolved
Hide resolved
| if (previousResult != null && !previousResult.hasNext()) { | ||
| // we are done | ||
| return CompletableFuture.completedFuture(RecordCursorResult.exhausted()); | ||
| return CompletableFuture.completedFuture(RecordCursorResult.withoutNextValue(new AggregateCursorContinuation(previousResult.getContinuation(), serializationMode), |
Collaborator
There was a problem hiding this comment.
I think this also needs to include the partialAggregationResult, though. I'm thinking of a case like:
try (RecordCursor<QueryResult> cursor = getAggregateCursor()) {
RecordCursor<QueryResult> curr = cursor.getNext();
while (curr.hasNext()) {
// do something with curr
curr = cursor.getNext();
}
RecordCursor<QueryResult> last = cursor.getNext();
assert !last.hasNext(); // should succeed
assert last.getContinution().equals(curr.getContinuation()); // I think will fail as last is missing any partial aggregation result
}The last value there is the second result from the cursor where .hasNext() is false.
...ayer-core/src/main/java/com/apple/foundationdb/record/cursors/aggregate/AggregateCursor.java
Show resolved
Hide resolved
...ore/src/test/java/com/apple/foundationdb/relational/recordlayer/query/GroupByQueryTests.java
Outdated
Show resolved
Hide resolved
...java/com/apple/foundationdb/record/provider/foundationdb/query/FDBStreamAggregationTest.java
Outdated
Show resolved
Hide resolved
...java/com/apple/foundationdb/record/provider/foundationdb/query/FDBStreamAggregationTest.java
Show resolved
Hide resolved
alecgrieser
requested changes
May 30, 2025
...java/com/apple/foundationdb/record/provider/foundationdb/query/FDBStreamAggregationTest.java
Outdated
Show resolved
Hide resolved
| if (previousResult != null && !previousResult.hasNext()) { | ||
| // we are done | ||
| return CompletableFuture.completedFuture(RecordCursorResult.exhausted()); | ||
| return CompletableFuture.completedFuture(RecordCursorResult.withoutNextValue(new AggregateCursorContinuation(previousResult.getContinuation(), serializationMode), |
Collaborator
There was a problem hiding this comment.
I don't see the partialAggregationResult at the moment. And did you add a test that called .getNext() a second time on a partially completed cursor?
...ayer-core/src/main/java/com/apple/foundationdb/record/cursors/aggregate/AggregateCursor.java
Show resolved
Hide resolved
alecgrieser
approved these changes
Jun 5, 2025
alecgrieser
added a commit
to alecgrieser/fdb-record-layer
that referenced
this pull request
Jul 28, 2025
…der 4.3 versions With FoundationDB#3495, we are no longer compatible in mixed modes with versions that do not have FoundationDB#3254, which was introduced in version 4.3.4.0. To highlight that this version can be safely upgraded from 4.4 but requires more care when upgrading from 4.3, this updates the minor version to 4.5.
alecgrieser
added a commit
that referenced
this pull request
Jul 29, 2025
…der 4.3 versions (#3508) With #3495, we are no longer compatible in mixed modes with versions that do not have #3254, which was introduced in version 4.3.4.0. To highlight that this version can be safely upgraded from 4.4 but requires more care when upgrading from 4.3, this updates the minor version to 4.5.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
AggregateCursor.AggregateCursorContinuation, which contains partialAggregationResult.