Skip to content

fix(issues680): fix S3StreamsMetadataImage#getObjects #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 16, 2024
Merged

fix(issues680): fix S3StreamsMetadataImage#getObjects #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b81225
fix(issues680): fix S3StreamsMetadataImage#getObjects
superhx Jan 16, 2024
dea705a
fix: fix CR
superhx Jan 16, 2024
148b8cb
Merge branch 'develop' into issues680
mooc9988 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions metadata/src/main/java/org/apache/kafka/image/S3StreamsMetadataImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,14 @@ public InRangeObjects getObjects(long streamId, long startOffset, long endOffset
for (; streamObjectIndex != -1 && streamObjectIndex < streamObjects.size(); streamObjectIndex++) {
S3StreamObject streamObject = streamObjects.get(streamObjectIndex);
if (streamObject.startOffset() != nextStartOffset) {
if (!(objects.isEmpty() && streamObject.endOffset() > nextStartOffset)) {
// it's the first object, we only need the stream object contains the startOffset
//noinspection StatementWithEmptyBody
if (objects.isEmpty() && streamObject.startOffset() <= nextStartOffset && streamObject.endOffset() > nextStartOffset) {
// it's the first object, we only need the stream object contains the nextStartOffset
} else if (streamObject.endOffset() <= nextStartOffset) {
// the stream object not match the requirement, move to the next stream object
continue;
} else {
// the streamObject.startOffset() > nextStartOffset
break;
}
}
Expand Down
6 changes: 6 additions & 0 deletions metadata/src/test/java/org/apache/kafka/image/S3StreamsMetadataImageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,5 +186,11 @@ public void testGetObjects() {
assertEquals(600, objects.endOffset());
assertEquals(4, objects.objects().size());
assertEquals(expectedObjectIds.subList(7, 11), objects.objects().stream().map(S3ObjectMetadata::objectId).collect(Collectors.toList()));

objects = streamsImage.getObjects(STREAM0, 101, 400L, Integer.MAX_VALUE);
assertEquals(100L, objects.startOffset());
assertEquals(400L, objects.endOffset());
assertEquals(7, objects.objects().size());
assertEquals(expectedObjectIds.subList(1, 8), objects.objects().stream().map(S3ObjectMetadata::objectId).collect(Collectors.toList()));
}
}