You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/06/25 14:29:15 UTC

[1/3] storm git commit: STORM-2568: Fix getTopicsString - String.valueOf returns square bracket, because topics is Collection - removed square bracket to use storm-kafka-monitor

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 1a6933eeb -> e039883f3


STORM-2568: Fix getTopicsString
- String.valueOf returns square bracket, because topics is Collection
- removed square bracket to use storm-kafka-monitor


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

Branch: refs/heads/1.x-branch
Commit: 9fa5311513b631a5392b8b2b86a84fdfa5c9c09e
Parents: 0c2e229
Author: haewanj <ha...@gmail.com>
Authored: Sat Jun 24 15:07:34 2017 +0900
Committer: haewanj <ha...@gmail.com>
Committed: Sat Jun 24 21:46:05 2017 +0900

----------------------------------------------------------------------
 external/storm-kafka-client/pom.xml             |  4 ++
 .../storm/kafka/spout/NamedSubscription.java    |  3 +-
 .../kafka/spout/NamedSubscriptionTest.java      | 54 ++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9fa53115/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index c95c6e2..b6dafab 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -40,6 +40,10 @@
     </developers>
 
     <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
         <!--parent module dependency-->
         <dependency>
             <groupId>org.apache.storm</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/9fa53115/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/NamedSubscription.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/NamedSubscription.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/NamedSubscription.java
index 6c5dcfb..3409184 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/NamedSubscription.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/NamedSubscription.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.storm.task.TopologyContext;
@@ -56,6 +57,6 @@ public class NamedSubscription extends Subscription {
 
     @Override
     public String getTopicsString() {
-        return String.valueOf(topics);
+        return StringUtils.join(topics, ",");
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/9fa53115/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/NamedSubscriptionTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/NamedSubscriptionTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/NamedSubscriptionTest.java
new file mode 100644
index 0000000..56bfddf
--- /dev/null
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/NamedSubscriptionTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.storm.kafka.spout;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
+public class NamedSubscriptionTest {
+
+    private NamedSubscription namedSubscription;
+
+    @Test
+    public void testGetTopicsStringWithOneTopic() throws Exception {
+        Collection<String> topics = new ArrayList<>();
+        topics.add("test-topic1");
+
+        namedSubscription = new NamedSubscription(topics);
+
+        Assert.assertEquals(namedSubscription.getTopicsString(), "test-topic1");
+    }
+
+    @Test
+    public void testGetTopicsStringWithManyTopics() throws Exception {
+        Collection<String> topics = new ArrayList<>();
+        topics.add("test-topic1");
+        topics.add("test-topic2");
+        topics.add("test-topic3");
+
+        namedSubscription = new NamedSubscription(topics);
+
+        Assert.assertEquals(namedSubscription.getTopicsString(), "test-topic1,test-topic2,test-topic3");
+    }
+
+}
\ No newline at end of file


[3/3] storm git commit: STORM-2568: CHANGELOG

Posted by ka...@apache.org.
STORM-2568: CHANGELOG


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

Branch: refs/heads/1.x-branch
Commit: e039883f3b98ab7467af410e5ac785aaeb5b257e
Parents: 78bb490
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Jun 25 23:29:05 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Jun 25 23:29:05 2017 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e039883f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index faa27ed..376ce55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.1
+ * STORM-2568: Fix getTopicsString
  * STORM-2555: handle impersonation properly for HBase delegation token
  * STORM-2551: Thrift client socket timeout
  * STORM-2563: Remove the workaround to handle missing UGI.loginUserFromSubject


[2/3] storm git commit: Merge branch '1.x-branch' of https://github.com/haewanj/storm into STORM-2568-1.x

Posted by ka...@apache.org.
Merge branch '1.x-branch' of https://github.com/haewanj/storm into STORM-2568-1.x


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

Branch: refs/heads/1.x-branch
Commit: 78bb49057a148f602562364f87f75c8cbaa5847c
Parents: 1a6933e 9fa5311
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Jun 25 23:28:42 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Jun 25 23:28:42 2017 +0900

----------------------------------------------------------------------
 external/storm-kafka-client/pom.xml             |  4 ++
 .../storm/kafka/spout/NamedSubscription.java    |  3 +-
 .../kafka/spout/NamedSubscriptionTest.java      | 54 ++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
----------------------------------------------------------------------