Skip to content
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

fix(metadata): avoid getObjects return invalid when endOffset is -1 #992

Merged
merged 1 commit into from
Mar 20, 2024
Merged

fix(metadata): avoid getObjects return invalid when endOffset is -1 #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 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 @@ -17,6 +17,7 @@

package org.apache.kafka.image;

import com.automq.stream.s3.metadata.ObjectUtils;
import com.automq.stream.s3.metadata.S3ObjectMetadata;
import com.automq.stream.s3.metadata.S3ObjectType;
import com.automq.stream.s3.metadata.StreamOffsetRange;
Expand Down Expand Up @@ -72,8 +73,19 @@ public void write(ImageWriter writer, ImageWriterOptions options) {
nodeStreamSetObjectMetadata.forEach((k, v) -> v.write(writer, options));
}

/**
* Get objects in range [startOffset, endOffset) with limit.
*
* @param streamId stream id
* @param startOffset inclusive start offset of the stream
* @param endOffset exclusive end offset of the stream.
* NOTE: NOOP_OFFSET means to retrieve as many objects as it's within the limit.
* @param limit max number of s3 objects to return
* @return s3 objects within the range
*/
@SuppressWarnings({"checkstyle:cyclomaticcomplexity", "checkstyle:npathcomplexity"})
public InRangeObjects getObjects(long streamId, long startOffset, long endOffset, int limit) {
if (streamId < 0 || startOffset > endOffset || limit < 0) {
if (streamId < 0 || limit < 0 || (endOffset != ObjectUtils.NOOP_OFFSET && startOffset > endOffset)) {
return InRangeObjects.INVALID;
}
S3StreamMetadataImage stream = streamsMetadata.get(streamId);
Expand Down Expand Up @@ -110,7 +122,7 @@ public InRangeObjects getObjects(long streamId, long startOffset, long endOffset
}
objects.add(streamObject.toMetadata());
nextStartOffset = streamObject.endOffset();
if (objects.size() >= limit || nextStartOffset >= endOffset) {
if (objects.size() >= limit || (endOffset != ObjectUtils.NOOP_OFFSET && nextStartOffset >= endOffset)) {
return new InRangeObjects(streamId, objects);
}
}
Expand Down Expand Up @@ -141,7 +153,7 @@ public InRangeObjects getObjects(long streamId, long startOffset, long endOffset
objects.add(new S3ObjectMetadata(streamSetObject.objectId(), S3ObjectType.STREAM_SET, List.of(streamOffsetRange),
streamSetObject.dataTimeInMs()));
nextStartOffset = streamOffsetRange.endOffset();
if (objects.size() >= limit || nextStartOffset >= endOffset) {
if (objects.size() >= limit || (endOffset != ObjectUtils.NOOP_OFFSET && nextStartOffset >= endOffset)) {
return new InRangeObjects(streamId, objects);
}
} else {
Expand Down
7 changes: 7 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 @@ -17,6 +17,7 @@

package org.apache.kafka.image;

import com.automq.stream.s3.metadata.ObjectUtils;
import com.automq.stream.s3.metadata.S3ObjectMetadata;
import com.automq.stream.s3.metadata.S3StreamConstant;
import com.automq.stream.s3.metadata.StreamOffsetRange;
Expand Down Expand Up @@ -192,6 +193,12 @@ public void testGetObjects() {
assertEquals(400L, objects.endOffset());
assertEquals(7, objects.objects().size());
assertEquals(expectedObjectIds.subList(1, 8), objects.objects().stream().map(S3ObjectMetadata::objectId).collect(Collectors.toList()));

objects = streamsImage.getObjects(STREAM0, 10, ObjectUtils.NOOP_OFFSET, 9);
assertEquals(10, objects.startOffset());
assertEquals(420, objects.endOffset());
assertEquals(9, objects.objects().size());
assertEquals(List.of(8L, 0L, 1L, 5L, 6L, 2L, 9L, 10L, 3L), objects.objects().stream().map(S3ObjectMetadata::objectId).collect(Collectors.toList()));
}

/**
Expand Down
Loading