Skip to content

fix(s3): fix incompatible field name #9

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 2 commits into from
Aug 22, 2023
+13 −13
Merged

fix(s3): fix incompatible field name #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e0e1e
fix(s3): fix incompatible field name
TheR1sing3un Aug 22, 2023
8cb9ecf
Merge branch 'develop' into fix_0
TheR1sing3un Aug 22, 2023
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: 5 additions & 5 deletions core/src/main/scala/kafka/log/s3/SingleWalObjectWriteTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ public class SingleWalObjectWriteTask {
private final List<WalWriteRequest> requests;
private final ObjectManager objectManager;
private final S3Operator s3Operator;
private final List<ObjectStreamRange> streams;
private final List<ObjectStreamRange> streamRanges;
private ByteBuf objectBuf;
private CommitWalObjectResponse response;
private volatile boolean isDone = false;

public SingleWalObjectWriteTask(List<WalWriteRequest> records, ObjectManager objectManager, S3Operator s3Operator) {
Collections.sort(records);
this.requests = records;
this.streams = new LinkedList<>();
this.streamRanges = new LinkedList<>();
this.objectManager = objectManager;
this.s3Operator = s3Operator;
parse();
Expand All @@ -74,7 +74,7 @@ public CompletableFuture<Void> upload() {
CommitWalObjectRequest request = new CommitWalObjectRequest();
request.setObjectId(context.objectId);
request.setObjectSize(objectBuf.readableBytes());
request.setStreamRanges(streams);
request.setStreamRanges(streamRanges);
return objectManager.commitWalObject(request);
})
.thenApply(resp -> {
Expand All @@ -98,7 +98,7 @@ public void parse() {
long currentStreamId = record.getStreamId();
if (streamId != currentStreamId) {
if (streamId != -1) {
streams.add(new ObjectStreamRange(streamId, streamEpoch, streamStartOffset, streamEndOffset));
streamRanges.add(new ObjectStreamRange(streamId, streamEpoch, streamStartOffset, streamEndOffset));
}
streamId = currentStreamId;
streamEpoch = record.getEpoch();
Expand All @@ -116,7 +116,7 @@ public void parse() {
}
// add last stream range
if (streamId != -1) {
streams.add(new ObjectStreamRange(streamId, streamEpoch, streamStartOffset, streamEndOffset));
streamRanges.add(new ObjectStreamRange(streamId, streamEpoch, streamStartOffset, streamEndOffset));
}
objectBuf = Unpooled.wrappedBuffer(compressed.buffer().flip());
}
Expand Down
16 changes: 8 additions & 8 deletions core/src/test/java/kafka/log/s3/S3WalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ public void testAppend() throws Exception {
verify(objectManager).commitWalObject(commitArg.capture());
CommitWalObjectRequest commitReq = commitArg.getValue();
assertEquals(16L, commitReq.getObjectId());
List<ObjectStreamRange> streams = commitReq.getStreamRanges();
assertEquals(2, streams.size());
assertEquals(233, streams.get(0).getStreamId());
assertEquals(10, streams.get(0).getStartOffset());
assertEquals(13, streams.get(0).getEndOffset());
assertEquals(234, streams.get(1).getStreamId());
assertEquals(100, streams.get(1).getStartOffset());
assertEquals(101, streams.get(1).getEndOffset());
List<ObjectStreamRange> streamRanges = commitReq.getStreamRanges();
assertEquals(2, streamRanges.size());
assertEquals(233, streamRanges.get(0).getStreamId());
assertEquals(10, streamRanges.get(0).getStartOffset());
assertEquals(13, streamRanges.get(0).getEndOffset());
assertEquals(234, streamRanges.get(1).getStreamId());
assertEquals(100, streamRanges.get(1).getStartOffset());
assertEquals(101, streamRanges.get(1).getEndOffset());
}

@Test
Expand Down