You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2016/03/21 04:19:59 UTC
kafka git commit: MINOR: Fix FetchRequest.getErrorResponse for
version 1
Repository: kafka
Updated Branches:
refs/heads/trunk 95eabc8c8 -> 4f048c4f1
MINOR: Fix FetchRequest.getErrorResponse for version 1
Author: Grant Henke <gr...@gmail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>, Jun Rao <ju...@gmail.com>
Closes #1091 from granthenke/fetch-error
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/4f048c4f
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/4f048c4f
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/4f048c4f
Branch: refs/heads/trunk
Commit: 4f048c4f194a90ded5f0df35e4e23379272d5bc6
Parents: 95eabc8
Author: Grant Henke <gr...@gmail.com>
Authored: Sun Mar 20 20:19:54 2016 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Sun Mar 20 20:19:54 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/kafka/common/requests/FetchRequest.java | 8 +++++---
.../apache/kafka/common/requests/RequestResponseTest.java | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/4f048c4f/clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java
index a7d8349..f8b7fe3 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java
@@ -3,9 +3,9 @@
* 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.
@@ -27,7 +27,7 @@ import org.apache.kafka.common.protocol.types.Struct;
import org.apache.kafka.common.utils.CollectionUtils;
public class FetchRequest extends AbstractRequest {
-
+
public static final int CONSUMER_REPLICA_ID = -1;
private static final Schema CURRENT_SCHEMA = ProtoUtils.currentRequestSchema(ApiKeys.FETCH.id);
private static final String REPLICA_ID_KEY_NAME = "replica_id";
@@ -132,6 +132,8 @@ public class FetchRequest extends AbstractRequest {
switch (versionId) {
case 0:
+ return new FetchResponse(responseData);
+ case 1:
return new FetchResponse(responseData, 0);
default:
throw new IllegalArgumentException(String.format("Version %d is not valid. Valid versions for %s are 0 to %d",
http://git-wip-us.apache.org/repos/asf/kafka/blob/4f048c4f/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
----------------------------------------------------------------------
diff --git a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
index b7f0caf..a4c5238 100644
--- a/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java
@@ -51,7 +51,7 @@ public class RequestResponseTest {
createControlledShutdownResponse(),
createControlledShutdownRequest().getErrorResponse(1, new UnknownServerException()),
createFetchRequest(),
- createFetchRequest().getErrorResponse(0, new UnknownServerException()),
+ createFetchRequest().getErrorResponse(1, new UnknownServerException()),
createFetchResponse(),
createHeartBeatRequest(),
createHeartBeatRequest().getErrorResponse(0, new UnknownServerException()),
@@ -98,6 +98,7 @@ public class RequestResponseTest {
for (AbstractRequestResponse req : requestResponseList)
checkSerialization(req, null);
+ checkSerialization(createFetchRequest().getErrorResponse(0, new UnknownServerException()), 0);
checkSerialization(createOffsetCommitRequest(0), 0);
checkSerialization(createOffsetCommitRequest(0).getErrorResponse(0, new UnknownServerException()), 0);
checkSerialization(createOffsetCommitRequest(1), 1);