KAFKA-9629 Use generated protocol for Fetch API #9008
+1,086
−800
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * 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.kafka.common.protocol; | ||
|
|
||
| import org.apache.kafka.common.record.BaseRecords; | ||
| import org.apache.kafka.common.record.MemoryRecords; | ||
| import org.apache.kafka.common.utils.ByteUtils; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
|
|
||
| /** | ||
| * Implementation of Readable which reads from a byte buffer and can read records as {@link MemoryRecords} | ||
| * | ||
| * @see org.apache.kafka.common.requests.FetchResponse | ||
| */ | ||
| public class RecordsReadable implements Readable { | ||
| private final ByteBuffer buf; | ||
|
|
||
| public RecordsReadable(ByteBuffer buf) { | ||
| this.buf = buf; | ||
| } | ||
|
|
||
| @Override | ||
| public byte readByte() { | ||
| return buf.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public short readShort() { | ||
| return buf.getShort(); | ||
| } | ||
|
|
||
| @Override | ||
| public int readInt() { | ||
| return buf.getInt(); | ||
| } | ||
|
|
||
| @Override | ||
| public long readLong() { | ||
| return buf.getLong(); | ||
| } | ||
|
|
||
| @Override | ||
| public double readDouble() { | ||
| return ByteUtils.readDouble(buf); | ||
| } | ||
|
|
||
| @Override | ||
| public void readArray(byte[] arr) { | ||
| buf.get(arr); | ||
| } | ||
|
|
||
| @Override | ||
| public int readUnsignedVarint() { | ||
| return ByteUtils.readUnsignedVarint(buf); | ||
| } | ||
|
|
||
| @Override | ||
| public ByteBuffer readByteBuffer(int length) { | ||
| ByteBuffer res = buf.slice(); | ||
| res.limit(length); | ||
|
|
||
| buf.position(buf.position() + length); | ||
|
|
||
| return res; | ||
| } | ||
|
|
||
| public BaseRecords readRecords(int length) { | ||
| if (length < 0) { | ||
| // no records | ||
| return null; | ||
| } else { | ||
| ByteBuffer recordsBuffer = readByteBuffer(length); | ||
| return MemoryRecords.readableRecords(recordsBuffer); | ||
| } | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| * 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.kafka.common.protocol; | ||
|
|
||
| import org.apache.kafka.common.network.ByteBufferSend; | ||
| import org.apache.kafka.common.network.Send; | ||
| import org.apache.kafka.common.record.BaseRecords; | ||
| import org.apache.kafka.common.utils.ByteUtils; | ||
|
|
||
| import java.io.DataOutput; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.function.Consumer; | ||
|
|
||
| /** | ||
| * Implementation of Writable which produces a sequence of {@link Send} objects. This allows for deferring the transfer | ||
| * of data from a record-set's file channel to the eventual socket channel. | ||
| * | ||
| * Excepting {@link #writeRecords(BaseRecords)}, calls to the write methods on this class will append to a byte array | ||
| * according to the format specified in {@link DataOutput}. When a call is made to writeRecords, any previously written | ||
| * bytes will be flushed as a new {@link ByteBufferSend} to the given Send consumer. After flushing the pending bytes, | ||
| * another Send is passed to the consumer which wraps the underlying record-set's transfer logic. | ||
| * | ||
| * For example, | ||
| * | ||
| * <pre> | ||
| * recordsWritable.writeInt(10); | ||
| * recordsWritable.writeRecords(records1); | ||
| * recordsWritable.writeInt(20); | ||
| * recordsWritable.writeRecords(records2); | ||
| * recordsWritable.writeInt(30); | ||
| * recordsWritable.flush(); | ||
| * </pre> | ||
| * | ||
| * Will pass 5 Send objects to the consumer given in the constructor. Care must be taken by callers to flush any | ||
| * pending bytes at the end of the writing sequence to ensure everything is flushed to the consumer. This class is | ||
| * intended to be used with {@link org.apache.kafka.common.record.MultiRecordsSend}. | ||
| * | ||
| * @see org.apache.kafka.common.requests.FetchResponse | ||
| */ | ||
| public class RecordsWritable implements Writable { | ||
| private final String dest; | ||
| private final Consumer<Send> sendConsumer; | ||
| private final ByteBuffer buffer; | ||
| private int mark; | ||
|
|
||
| public RecordsWritable(String dest, int messageSizeExcludingRecords, Consumer<Send> sendConsumer) { | ||
| this.dest = dest; | ||
| this.sendConsumer = sendConsumer; | ||
| this.buffer = ByteBuffer.allocate(messageSizeExcludingRecords); | ||
| this.mark = 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeByte(byte val) { | ||
| buffer.put(val); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeShort(short val) { | ||
| buffer.putShort(val); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeInt(int val) { | ||
| buffer.putInt(val); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeLong(long val) { | ||
| buffer.putLong(val); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeDouble(double val) { | ||
| ByteUtils.writeDouble(val, buffer); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeByteArray(byte[] arr) { | ||
| buffer.put(arr); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeUnsignedVarint(int i) { | ||
| ByteUtils.writeUnsignedVarint(i, buffer); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeByteBuffer(ByteBuffer src) { | ||
| buffer.put(src); | ||
| } | ||
|
|
||
| public void writeRecords(BaseRecords records) { | ||
| flush(); | ||
| sendConsumer.accept(records.toSend(dest)); | ||
| } | ||
|
|
||
| /** | ||
| * Flush any pending bytes as a ByteBufferSend | ||
| */ | ||
| public void flush() { | ||
| int end = buffer.position(); | ||
| int len = end - mark; | ||
|
|
||
| if (len > 0) { | ||
| int limit = buffer.limit(); | ||
|
|
||
| // Set the desired absolute position and limit before slicing | ||
| buffer.position(mark); | ||
| buffer.limit(end); | ||
| ByteBuffer slice = buffer.slice(); | ||
|
|
||
| // Restore absolute position and limit on original buffer | ||
| buffer.limit(limit); | ||
| buffer.position(end); | ||
|
|
||
| // Update the mark to the end of slice we just took | ||
| mark = end; | ||
|
|
||
| ByteBufferSend send = new ByteBufferSend(dest, slice); | ||
| sendConsumer.accept(send); | ||
| } | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,4 +17,5 @@ | |
| package org.apache.kafka.common.requests; | ||
|
|
||
| public interface AbstractRequestResponse { | ||
|
|
||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: could probably change this to use
ifPresent