Skip to content

KAFKA-3644: Use Boolean protocol type for StopReplicaRequest delete_p… #1296

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

Closed
granthenke wants to merge 1 commit into from
Closed

KAFKA-3644: Use Boolean protocol type for StopReplicaRequest delete_p… #1296

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
6 changes: 2 additions & 4 deletions clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import static org.apache.kafka.common.protocol.types.Type.INT16;
import static org.apache.kafka.common.protocol.types.Type.INT32;
import static org.apache.kafka.common.protocol.types.Type.INT64;
import static org.apache.kafka.common.protocol.types.Type.INT8;
import static org.apache.kafka.common.protocol.types.Type.STRING;
import static org.apache.kafka.common.protocol.types.Type.NULLABLE_STRING;

Expand Down Expand Up @@ -671,8 +670,7 @@ public class Protocol {

public static final Schema STOP_REPLICA_REQUEST_V0 = new Schema(new Field("controller_id", INT32, "The controller id."),
new Field("controller_epoch", INT32, "The controller epoch."),
new Field("delete_partitions",
INT8,
new Field("delete_partitions", BOOLEAN,
"Boolean which indicates if replica's partitions must be deleted."),
new Field("partitions",
new ArrayOf(STOP_REPLICA_REQUEST_PARTITION_V0)));
Expand Down Expand Up @@ -1008,4 +1006,4 @@ public static void main(String[] args) {
System.out.println(toHtml());
}

}
}
4 changes: 2 additions & 2 deletions clients/src/main/java/org/apache/kafka/common/requests/StopReplicaRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public StopReplicaRequest(int controllerId, int controllerEpoch, boolean deleteP

struct.set(CONTROLLER_ID_KEY_NAME, controllerId);
struct.set(CONTROLLER_EPOCH_KEY_NAME, controllerEpoch);
struct.set(DELETE_PARTITIONS_KEY_NAME, deletePartitions ? (byte) 1 : (byte) 0);
struct.set(DELETE_PARTITIONS_KEY_NAME, deletePartitions);

List<Struct> partitionDatas = new ArrayList<>(partitions.size());
for (TopicPartition partition : partitions) {
Expand Down Expand Up @@ -80,7 +80,7 @@ public StopReplicaRequest(Struct struct) {

controllerId = struct.getInt(CONTROLLER_ID_KEY_NAME);
controllerEpoch = struct.getInt(CONTROLLER_EPOCH_KEY_NAME);
deletePartitions = ((byte) struct.get(DELETE_PARTITIONS_KEY_NAME)) != 0;
deletePartitions = struct.getBoolean(DELETE_PARTITIONS_KEY_NAME);
}

@Override
Expand Down
11 changes: 6 additions & 5 deletions clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ public void testSerialization() throws Exception {
createProduceRequest(),
createProduceRequest().getErrorResponse(2, new UnknownServerException()),
createProduceResponse(),
createStopReplicaRequest(),
createStopReplicaRequest().getErrorResponse(0, new UnknownServerException()),
createStopReplicaRequest(true),
createStopReplicaRequest(false),
createStopReplicaRequest(true).getErrorResponse(0, new UnknownServerException()),
createStopReplicaResponse(),
createUpdateMetadataRequest(2, "rack1"),
createUpdateMetadataRequest(2, null),
Expand Down Expand Up @@ -348,9 +349,9 @@ private AbstractRequestResponse createProduceResponse() {
return new ProduceResponse(responseData, 0);
}

private AbstractRequest createStopReplicaRequest() {
private AbstractRequest createStopReplicaRequest(boolean deletePartitions) {
Set<TopicPartition> partitions = new HashSet<>(Arrays.asList(new TopicPartition("test", 0)));
return new StopReplicaRequest(0, 1, true, partitions);
return new StopReplicaRequest(0, 1, deletePartitions, partitions);
}

private AbstractRequestResponse createStopReplicaResponse() {
Expand Down Expand Up @@ -450,4 +451,4 @@ private AbstractRequestResponse createApiVersionResponse() {
List<ApiVersionsResponse.ApiVersion> apiVersions = Arrays.asList(new ApiVersionsResponse.ApiVersion((short) 0, (short) 0, (short) 2));
return new ApiVersionsResponse(Errors.NONE.code(), apiVersions);
}
}
}