kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: MINOR: Remove stray comma from PartitionInfo.toString
Date Thu, 05 Jan 2017 10:26:12 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 0cd5afdb6 -> d3572648b


MINOR: Remove stray comma from PartitionInfo.toString

Removed the extra ',' character while printing the replicas / in-sync replicas
array.

Author: Kamal <kamal@nmsworks.co.in>

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

Closes #2306 from Kamal15/trunk


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

Branch: refs/heads/trunk
Commit: d3572648b6c3524784fc3f60964a7f28817cbd55
Parents: 0cd5afd
Author: Kamal <kamal@nmsworks.co.in>
Authored: Thu Jan 5 10:11:57 2017 +0000
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Thu Jan 5 10:26:02 2017 +0000

----------------------------------------------------------------------
 .../org/apache/kafka/common/PartitionInfo.java  | 19 +++++------
 .../apache/kafka/common/PartitionInfoTest.java  | 36 ++++++++++++++++++++
 2 files changed, 44 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/d3572648/clients/src/main/java/org/apache/kafka/common/PartitionInfo.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/common/PartitionInfo.java b/clients/src/main/java/org/apache/kafka/common/PartitionInfo.java
index 05ad0b5..73109d4 100644
--- a/clients/src/main/java/org/apache/kafka/common/PartitionInfo.java
+++ b/clients/src/main/java/org/apache/kafka/common/PartitionInfo.java
@@ -72,21 +72,18 @@ public class PartitionInfo {
         return String.format("Partition(topic = %s, partition = %d, leader = %s, replicas
= %s, isr = %s)",
                              topic,
                              partition,
-                             leader == null ? "none" : leader.id(),
-                             fmtNodeIds(replicas),
-                             fmtNodeIds(inSyncReplicas));
+                             leader == null ? "none" : leader.idString(),
+                             formatNodeIds(replicas),
+                             formatNodeIds(inSyncReplicas));
     }
 
     /* Extract the node ids from each item in the array and format for display */
-    private String fmtNodeIds(Node[] nodes) {
+    private String formatNodeIds(Node[] nodes) {
         StringBuilder b = new StringBuilder("[");
-        for (int i = 0; i < nodes.length - 1; i++) {
-            b.append(Integer.toString(nodes[i].id()));
-            b.append(',');
-        }
-        if (nodes.length > 0) {
-            b.append(Integer.toString(nodes[nodes.length - 1].id()));
-            b.append(',');
+        for (int i = 0; i < nodes.length; i++) {
+            b.append(nodes[i].idString());
+            if (i < nodes.length - 1)
+                b.append(',');
         }
         b.append("]");
         return b.toString();

http://git-wip-us.apache.org/repos/asf/kafka/blob/d3572648/clients/src/test/java/org/apache/kafka/common/PartitionInfoTest.java
----------------------------------------------------------------------
diff --git a/clients/src/test/java/org/apache/kafka/common/PartitionInfoTest.java b/clients/src/test/java/org/apache/kafka/common/PartitionInfoTest.java
new file mode 100644
index 0000000..7c2de57
--- /dev/null
+++ b/clients/src/test/java/org/apache/kafka/common/PartitionInfoTest.java
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PartitionInfoTest {
+    
+    @Test
+    public void testToString() {
+        String topic = "sample";
+        int partition = 0;
+        Node leader = new Node(0, "localhost", 9092);
+        Node r1 = new Node(1, "localhost", 9093);
+        Node r2 = new Node(2, "localhost", 9094); 
+        Node[] replicas = new Node[] {leader, r1, r2};
+        Node[] inSyncReplicas = new Node[] {leader, r1, r2};
+        PartitionInfo partitionInfo = new PartitionInfo(topic, partition, leader, replicas,
inSyncReplicas);
+        
+        String expected = String.format("Partition(topic = %s, partition = %d, leader = %s,
replicas = %s, isr = %s)",
+                topic, partition, leader.idString(), "[0,1,2]", "[0,1,2]");
+        Assert.assertEquals(expected, partitionInfo.toString());
+    }
+
+}
\ No newline at end of file


Mime
View raw message