kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject kafka git commit: HOTFIX: Remove duplicate entry from ApiVersion
Date Thu, 06 Apr 2017 22:57:25 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 0baea2ac1 -> 76a10e23f


HOTFIX: Remove duplicate entry from ApiVersion

Author: Ismael Juma <ismael@juma.me.uk>

Reviewers: Jun Rao <junrao@gmail.com>

Closes #2818 from ijuma/fix-api-version


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/76a10e23
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/76a10e23
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/76a10e23

Branch: refs/heads/trunk
Commit: 76a10e23f0a3d89e4a0a88854d0ec3926e7f6827
Parents: 0baea2a
Author: Ismael Juma <ismael@juma.me.uk>
Authored: Thu Apr 6 15:57:21 2017 -0700
Committer: Jun Rao <junrao@gmail.com>
Committed: Thu Apr 6 15:57:21 2017 -0700

----------------------------------------------------------------------
 .../kafka/common/requests/OffsetsForLeaderEpochRequest.java  | 8 ++++----
 core/src/main/scala/kafka/api/ApiVersion.scala               | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/76a10e23/clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequest.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequest.java
b/clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequest.java
index fed8910..38fabf0 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequest.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/OffsetsForLeaderEpochRequest.java
@@ -145,9 +145,9 @@ public class OffsetsForLeaderEpochRequest extends AbstractRequest {
         return new OffsetsForLeaderEpochResponse(errorResponse);
     }
 
-    private class PartitionLeaderEpoch {
-        int partitionId;
-        int epoch;
+    private static class PartitionLeaderEpoch {
+        final int partitionId;
+        final int epoch;
 
         public PartitionLeaderEpoch(int partitionId, int epoch) {
             this.partitionId = partitionId;
@@ -172,4 +172,4 @@ public class OffsetsForLeaderEpochRequest extends AbstractRequest {
             return result;
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/kafka/blob/76a10e23/core/src/main/scala/kafka/api/ApiVersion.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/api/ApiVersion.scala b/core/src/main/scala/kafka/api/ApiVersion.scala
index 051c5d6..62d5d12 100644
--- a/core/src/main/scala/kafka/api/ApiVersion.scala
+++ b/core/src/main/scala/kafka/api/ApiVersion.scala
@@ -67,8 +67,7 @@ object ApiVersion {
     "0.11.0-IV0" -> KAFKA_0_11_0_IV0,
     // introduced DeleteRecordsRequest v0 and FetchRequest v4 in KIP-107
     "0.11.0-IV1" -> KAFKA_0_11_0_IV1,
-    "0.11.0" -> KAFKA_0_11_0_IV1,
-    // Introduce leader epoch fetches to the replica fetcher via KIP-101
+    // Introduced leader epoch fetches to the replica fetcher via KIP-101
     "0.11.0-IV2" -> KAFKA_0_11_0_IV2,
     "0.11.0" -> KAFKA_0_11_0_IV2
   )
@@ -171,4 +170,4 @@ case object KAFKA_0_11_0_IV2 extends ApiVersion {
   val version: String = "0.11.0-IV2"
   val messageFormatVersion: Byte = RecordBatch.MAGIC_VALUE_V2
   val id: Int = 12
-}
\ No newline at end of file
+}


Mime
View raw message