[2/3] storm git commit: Merge branch '1.x-branch_STORM-2320_DRPCClient' of https://github.com/hmcl/storm-apache into STORM-2320-1.x-merge

2017-02-07 Thread kabhwan
Merge branch '1.x-branch_STORM-2320_DRPCClient' of 
https://github.com/hmcl/storm-apache into STORM-2320-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 4c2cc455fab187690b5e2475671cba97d9653472
Parents: 090d396 7f63a73
Author: Jungtaek Lim 
Authored: Wed Feb 8 14:02:35 2017 +0900
Committer: Jungtaek Lim 
Committed: Wed Feb 8 14:02:35 2017 +0900

--
 .../TridentKafkaClientWordCountNamedTopics.java | 15 +++-
 .../storm/kafka/trident/DrpcResultsPrinter.java | 85 
 .../trident/TridentKafkaConsumerTopology.java   | 13 ++-
 .../kafka/trident/TridentKafkaWordCount.java|  6 +-
 4 files changed, 114 insertions(+), 5 deletions(-)
--




[1/3] storm git commit: STORM-2320: DRPC client printer class reusable for local and remote DRPC

2017-02-07 Thread kabhwan
Repository: storm
Updated Branches:
  refs/heads/1.x-branch 090d396ba -> 9e06883b9


STORM-2320: DRPC client printer class reusable for local and remote DRPC

  - Client necessary to check for DRPC results while running in distribute mode


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

Branch: refs/heads/1.x-branch
Commit: 7f63a73b7718fc27165bd7b80ed625235a07cec6
Parents: 090d396
Author: Hugo Louro 
Authored: Fri Dec 23 17:09:06 2016 -0800
Committer: Hugo Louro 
Committed: Tue Feb 7 18:38:00 2017 -0800

--
 .../TridentKafkaClientWordCountNamedTopics.java | 15 +++-
 .../storm/kafka/trident/DrpcResultsPrinter.java | 85 
 .../trident/TridentKafkaConsumerTopology.java   | 13 ++-
 .../kafka/trident/TridentKafkaWordCount.java|  6 +-
 4 files changed, 114 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/7f63a73b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
--
diff --git 
a/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
 
b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
index 5861363..83d6884 100644
--- 
a/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
+++ 
b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
@@ -33,6 +33,12 @@ import 
org.apache.storm.kafka.spout.trident.KafkaTridentSpoutOpaque;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.tuple.Values;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static 
org.apache.storm.kafka.spout.KafkaSpoutConfig.FirstPollOffsetStrategy.EARLIEST;
+
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
@@ -59,7 +65,7 @@ public class TridentKafkaClientWordCountNamedTopics {
 public List apply(ConsumerRecord record) {
 return new Values(record.value());
 }
-}
+};
 
 protected KafkaSpoutConfig newKafkaSpoutConfig() {
 return KafkaSpoutConfig.builder(KAFKA_LOCAL_BROKER, TOPIC_1, TOPIC_2)
@@ -82,7 +88,7 @@ public class TridentKafkaClientWordCountNamedTopics {
 new TridentKafkaClientWordCountNamedTopics().run(args);
 }
 
-protected void run(String[] args) throws AlreadyAliveException, 
InvalidTopologyException, AuthorizationException {
+protected void run(String[] args) throws AlreadyAliveException, 
InvalidTopologyException, AuthorizationException, InterruptedException {
 if (args.length > 0 && Arrays.binarySearch(args, "-h") >= 0) {
 System.out.printf("Usage: java %s [%s] [%s] [%s] [%s]\n", 
getClass().getName(),
 "broker_host:broker_port", "topic1", "topic2", 
"topology_name");
@@ -101,6 +107,11 @@ public class TridentKafkaClientWordCountNamedTopics {
 StormSubmitter.submitTopology(topic2 + "-producer", tpConf, 
KafkaProducerTopology.newTopology(brokerUrl, topic2));
 // Consumer
 StormSubmitter.submitTopology("topics-consumer", tpConf, 
TridentKafkaConsumerTopology.newTopology(newKafkaTridentSpoutOpaque()));
+
+// Print results to console, which also causes the print 
filter in the consumer topology to print the results in the worker log
+Thread.sleep(2000);
+DrpcResultsPrinter.remoteClient().printResults(60, 1, 
TimeUnit.SECONDS);
+
 } else { //Submit Local
 
 final LocalSubmitter localSubmitter = 
LocalSubmitter.newInstance();

http://git-wip-us.apache.org/repos/asf/storm/blob/7f63a73b/examples/storm-kafka-examples/src/main/java/org/apache/storm/kafka/trident/DrpcResultsPrinter.java
--
diff --git 
a/examples/storm-kafka-examples/src/main/java/org/apache/storm/kafka/trident/DrpcResultsPrinter.java
 
b/examples/storm-kafka-examples/src/main/java/org/apache/storm/kafka/trident/DrpcResultsPrinter.java
new file mode 100644
index 000..f71e2df
--- /dev/null
+++ 
b/examples/storm-kafka-examples/src/main/java/org/apache/storm/kafka/trident/DrpcResultsPrinter.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ *   or more 

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

2017-02-07 Thread kabhwan
STORM-2320: CHANGELOG


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

Branch: refs/heads/1.x-branch
Commit: 9e06883b9c253ae71bab052fcbc7753f838d61b3
Parents: 4c2cc45
Author: Jungtaek Lim 
Authored: Wed Feb 8 14:03:09 2017 +0900
Committer: Jungtaek Lim 
Committed: Wed Feb 8 14:03:09 2017 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/9e06883b/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f0efc4..c04b5a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-2320: DRPC client printer class reusable for local and remote DRPC
  * STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State 
Exception
  * STORM-2296: Kafka spout no dup on leader changes
  * STORM-2244: Some shaded jars doesn't exclude dependency signature files



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

2017-02-07 Thread kabhwan
STORM-2281: CHANGELOG


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

Branch: refs/heads/1.x-branch
Commit: 090d396ba12a060192bb1114fe52fc02719c8c62
Parents: 5e71392
Author: Jungtaek Lim 
Authored: Wed Feb 8 11:11:06 2017 +0900
Committer: Jungtaek Lim 
Committed: Wed Feb 8 11:11:06 2017 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/090d396b/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f9b726..6f0efc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State 
Exception
  * STORM-2296: Kafka spout no dup on leader changes
  * STORM-2244: Some shaded jars doesn't exclude dependency signature files
  * STORM-2014: New Kafka spout duplicates checking if failed messages have 
reached max retries



[1/3] storm git commit: STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State Exception

2017-02-07 Thread kabhwan
Repository: storm
Updated Branches:
  refs/heads/1.x-branch ff0d6c997 -> 090d396ba


STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State 
Exception

   - Assign topic partitions to tasks running the instance of Kafka consumer 
that has assigned the same list of topic partitions
   - Improve logging
   - Minor code refactoring


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

Branch: refs/heads/1.x-branch
Commit: 1c676fe6a6ce110a55939ad4507d29d78f6b7174
Parents: ff0d6c9
Author: Hugo Louro 
Authored: Mon Jan 30 00:02:42 2017 -0800
Committer: Hugo Louro 
Committed: Tue Feb 7 15:35:10 2017 -0800

--
 .../TridentKafkaClientWordCountNamedTopics.java |  40 ++--
 .../storm/kafka/trident/LocalSubmitter.java |   7 +-
 .../trident/TridentKafkaConsumerTopology.java   |  20 +-
 .../kafka/trident/TridentKafkaWordCount.java|   2 +-
 .../trident/KafkaTridentSpoutBatchMetadata.java |   8 +-
 .../spout/trident/KafkaTridentSpoutEmitter.java | 206 +--
 .../spout/trident/KafkaTridentSpoutManager.java |  85 
 .../spout/trident/KafkaTridentSpoutOpaque.java  |  17 +-
 .../KafkaTridentSpoutOpaqueCoordinator.java |   4 +-
 .../KafkaTridentSpoutTopicPartition.java|   2 +-
 ...KafkaTridentSpoutTopicPartitionRegistry.java |   4 +-
 11 files changed, 231 insertions(+), 164 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/1c676fe6/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
--
diff --git 
a/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
 
b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
index 1ae69c8..5861363 100644
--- 
a/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
+++ 
b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
@@ -18,12 +18,6 @@
 
 package org.apache.storm.kafka.trident;
 
-import static 
org.apache.storm.kafka.spout.KafkaSpoutConfig.FirstPollOffsetStrategy.EARLIEST;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.storm.Config;
 import org.apache.storm.StormSubmitter;
@@ -39,6 +33,13 @@ import 
org.apache.storm.kafka.spout.trident.KafkaTridentSpoutOpaque;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.tuple.Values;
 
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static 
org.apache.storm.kafka.spout.KafkaSpoutConfig.FirstPollOffsetStrategy.EARLIEST;
+
 public class TridentKafkaClientWordCountNamedTopics {
 private static final String TOPIC_1 = "test-trident";
 private static final String TOPIC_2 = "test-trident-1";
@@ -48,16 +49,21 @@ public class TridentKafkaClientWordCountNamedTopics {
 return new KafkaTridentSpoutOpaque<>(newKafkaSpoutConfig());
 }
 
-private static Func, List> 
JUST_VALUE_FUNC = new Func, List>() {
+private static Func, List> 
JUST_VALUE_FUNC = new JustValueFunc();
+
+/**
+ * Needs to be serializable
+ */
+private static class JustValueFunc implements Func, List>, Serializable {
 @Override
 public List apply(ConsumerRecord record) {
 return new Values(record.value());
 }
-};
-
+}
+
 protected KafkaSpoutConfig newKafkaSpoutConfig() {
 return KafkaSpoutConfig.builder(KAFKA_LOCAL_BROKER, TOPIC_1, TOPIC_2)
-.setGroupId("kafkaSpoutTestGroup")
+.setGroupId("kafkaSpoutTestGroup_" + System.nanoTime())
 .setMaxPartitionFectchBytes(200)
 .setRecordTranslator(JUST_VALUE_FUNC, new Fields("str"))
 .setRetry(newRetryService())
@@ -87,7 +93,7 @@ public class TridentKafkaClientWordCountNamedTopics {
 
 System.out.printf("Running with broker_url: [%s], topics: [%s, 
%s]\n", brokerUrl, topic1, topic2);
 
-Config tpConf = LocalSubmitter.defaultConfig();
+Config tpConf = LocalSubmitter.defaultConfig(true);
 
   

[2/3] storm git commit: Merge branch 'Apache_master_STORM-2281_TridentParellism2+' of https://github.com/hmcl/storm-apache into STORM-2281-merge

2017-02-07 Thread kabhwan
Merge branch 'Apache_master_STORM-2281_TridentParellism2+' of 
https://github.com/hmcl/storm-apache into STORM-2281-merge


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

Branch: refs/heads/master
Commit: 469162639ece6e774f1e526c91b799b6cc85daec
Parents: d3250b2 07cf86e
Author: Jungtaek Lim 
Authored: Wed Feb 8 10:25:00 2017 +0900
Committer: Jungtaek Lim 
Committed: Wed Feb 8 10:25:00 2017 +0900

--
 .../TridentKafkaClientWordCountNamedTopics.java |  44 ++--
 .../storm/kafka/trident/LocalSubmitter.java |   7 +-
 .../trident/TridentKafkaConsumerTopology.java   |  20 +-
 .../trident/KafkaTridentSpoutBatchMetadata.java |   8 +-
 .../spout/trident/KafkaTridentSpoutEmitter.java | 206 +--
 .../spout/trident/KafkaTridentSpoutManager.java |  85 
 .../spout/trident/KafkaTridentSpoutOpaque.java  |  17 +-
 .../KafkaTridentSpoutOpaqueCoordinator.java |   4 +-
 .../KafkaTridentSpoutTopicPartition.java|   2 +-
 ...KafkaTridentSpoutTopicPartitionRegistry.java |   4 +-
 10 files changed, 237 insertions(+), 160 deletions(-)
--




[2/3] storm git commit: Merge branch '1.x-branch_STORM-2225_KSSimpler_2' of https://github.com/hmcl/storm-apache into STORM-2281-1.x-merge

2017-02-07 Thread kabhwan
Merge branch '1.x-branch_STORM-2225_KSSimpler_2' of 
https://github.com/hmcl/storm-apache into STORM-2281-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 5e713922dc0fa757a03c7ee5316e42b0eb748b61
Parents: ff0d6c9 1c676fe
Author: Jungtaek Lim 
Authored: Wed Feb 8 11:09:43 2017 +0900
Committer: Jungtaek Lim 
Committed: Wed Feb 8 11:09:43 2017 +0900

--
 .../TridentKafkaClientWordCountNamedTopics.java |  40 ++--
 .../storm/kafka/trident/LocalSubmitter.java |   7 +-
 .../trident/TridentKafkaConsumerTopology.java   |  20 +-
 .../kafka/trident/TridentKafkaWordCount.java|   2 +-
 .../trident/KafkaTridentSpoutBatchMetadata.java |   8 +-
 .../spout/trident/KafkaTridentSpoutEmitter.java | 206 +--
 .../spout/trident/KafkaTridentSpoutManager.java |  85 
 .../spout/trident/KafkaTridentSpoutOpaque.java  |  17 +-
 .../KafkaTridentSpoutOpaqueCoordinator.java |   4 +-
 .../KafkaTridentSpoutTopicPartition.java|   2 +-
 ...KafkaTridentSpoutTopicPartitionRegistry.java |   4 +-
 11 files changed, 231 insertions(+), 164 deletions(-)
--




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

2017-02-07 Thread kabhwan
STORM-2281: CHANGELOG


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

Branch: refs/heads/master
Commit: 3e232e2fc70c8dcc1fa1f79e0e2b50dce37072b0
Parents: 4691626
Author: Jungtaek Lim 
Authored: Wed Feb 8 11:11:24 2017 +0900
Committer: Jungtaek Lim 
Committed: Wed Feb 8 11:11:24 2017 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/3e232e2f/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e705c93..c7fb4c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -197,6 +197,7 @@
  * STORM-1769: Added a test to check local nimbus with notifier plugin
 
 ## 1.1.0
+ * STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State 
Exception
  * STORM-2296: Kafka spout no dup on leader changes
  * STORM-2014: New Kafka spout duplicates checking if failed messages have 
reached max retries
  * STORM-1443: [Storm SQL] Support customizing parallelism in StormSQL



[1/3] storm git commit: STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State Exception

2017-02-07 Thread kabhwan
Repository: storm
Updated Branches:
  refs/heads/master d3250b22f -> 3e232e2fc


STORM-2281: Running Multiple Kafka Spouts (Trident) Throws Illegal State 
Exception

   - Assign topic partitions to tasks running the instance of Kafka consumer 
that has assigned the same list of topic partitions
   - Improve logging
   - Minor code refactoring


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

Branch: refs/heads/master
Commit: 07cf86e95a66e47cac41f67f5b269ab24758d8cb
Parents: d3250b2
Author: Hugo Louro 
Authored: Mon Jan 30 00:02:42 2017 -0800
Committer: Hugo Louro 
Committed: Tue Feb 7 15:43:45 2017 -0800

--
 .../TridentKafkaClientWordCountNamedTopics.java |  44 ++--
 .../storm/kafka/trident/LocalSubmitter.java |   7 +-
 .../trident/TridentKafkaConsumerTopology.java   |  20 +-
 .../trident/KafkaTridentSpoutBatchMetadata.java |   8 +-
 .../spout/trident/KafkaTridentSpoutEmitter.java | 206 +--
 .../spout/trident/KafkaTridentSpoutManager.java |  85 
 .../spout/trident/KafkaTridentSpoutOpaque.java  |  17 +-
 .../KafkaTridentSpoutOpaqueCoordinator.java |   4 +-
 .../KafkaTridentSpoutTopicPartition.java|   2 +-
 ...KafkaTridentSpoutTopicPartitionRegistry.java |   4 +-
 10 files changed, 237 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/07cf86e9/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
--
diff --git 
a/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
 
b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
index 2d08f6c..edd1f09 100644
--- 
a/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
+++ 
b/examples/storm-kafka-client-examples/src/main/java/org/apache/storm/kafka/trident/TridentKafkaClientWordCountNamedTopics.java
@@ -18,16 +18,13 @@
 
 package org.apache.storm.kafka.trident;
 
-import static 
org.apache.storm.kafka.spout.KafkaSpoutConfig.FirstPollOffsetStrategy.EARLIEST;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
+import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.storm.Config;
 import org.apache.storm.StormSubmitter;
 import org.apache.storm.generated.AlreadyAliveException;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.InvalidTopologyException;
+import org.apache.storm.kafka.spout.Func;
 import org.apache.storm.kafka.spout.KafkaSpoutConfig;
 import org.apache.storm.kafka.spout.KafkaSpoutRetryExponentialBackoff;
 import 
org.apache.storm.kafka.spout.KafkaSpoutRetryExponentialBackoff.TimeInterval;
@@ -36,6 +33,13 @@ import 
org.apache.storm.kafka.spout.trident.KafkaTridentSpoutOpaque;
 import org.apache.storm.tuple.Fields;
 import org.apache.storm.tuple.Values;
 
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static 
org.apache.storm.kafka.spout.KafkaSpoutConfig.FirstPollOffsetStrategy.EARLIEST;
+
 public class TridentKafkaClientWordCountNamedTopics {
 private static final String TOPIC_1 = "test-trident";
 private static final String TOPIC_2 = "test-trident-1";
@@ -45,11 +49,23 @@ public class TridentKafkaClientWordCountNamedTopics {
 return new KafkaTridentSpoutOpaque<>(newKafkaSpoutConfig());
 }
 
+private static Func, List> 
JUST_VALUE_FUNC = new JustValueFunc();
+
+/**
+ * Needs to be serializable
+ */
+private static class JustValueFunc implements Func, List>, Serializable {
+@Override
+public List apply(ConsumerRecord record) {
+return new Values(record.value());
+}
+}
+
 protected KafkaSpoutConfig newKafkaSpoutConfig() {
 return KafkaSpoutConfig.builder(KAFKA_LOCAL_BROKER, TOPIC_1, TOPIC_2)
-.setGroupId("kafkaSpoutTestGroup")
+.setGroupId("kafkaSpoutTestGroup_" + System.nanoTime())
 .setMaxPartitionFectchBytes(200)
-.setRecordTranslator((r) -> new Values(r.value()), new 
Fields("str"))
+.setRecordTranslator(JUST_VALUE_FUNC, new Fields("str"))
 .setRetry(newRetryService())
 

[2/3] storm git commit: Revert "[maven-release-plugin] prepare release v1.0.3"

2017-02-07 Thread ptgoetz
Revert "[maven-release-plugin] prepare release v1.0.3"

This reverts commit a81ec2580fce1f2ee6349a9028dcb75763798bec.


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

Branch: refs/heads/1.0.x-branch
Commit: 5609655938e0a5d942b42d8f0d5ef452b5371dc5
Parents: 31c68da
Author: P. Taylor Goetz 
Authored: Tue Feb 7 12:15:42 2017 -0500
Committer: P. Taylor Goetz 
Committed: Tue Feb 7 12:15:42 2017 -0500

--
 examples/storm-starter/pom.xml   |  2 +-
 external/flux/flux-core/pom.xml  |  2 +-
 external/flux/flux-examples/pom.xml  |  2 +-
 external/flux/flux-wrappers/pom.xml  |  2 +-
 external/flux/pom.xml|  2 +-
 external/sql/pom.xml |  2 +-
 external/sql/storm-sql-core/pom.xml  |  2 +-
 external/sql/storm-sql-kafka/pom.xml |  2 +-
 external/sql/storm-sql-runtime/pom.xml   |  2 +-
 external/storm-cassandra/pom.xml |  2 +-
 external/storm-elasticsearch/pom.xml |  2 +-
 external/storm-eventhubs/pom.xml | 10 ++
 external/storm-hbase/pom.xml |  2 +-
 external/storm-hdfs/pom.xml  |  2 +-
 external/storm-hive/pom.xml  |  2 +-
 external/storm-jdbc/pom.xml  |  2 +-
 external/storm-jms/core/pom.xml  |  5 +++--
 external/storm-jms/examples/pom.xml  |  7 ---
 external/storm-jms/pom.xml   |  5 +++--
 external/storm-kafka-client/pom.xml  |  2 +-
 external/storm-kafka/pom.xml |  2 +-
 external/storm-metrics/pom.xml   |  2 +-
 external/storm-mongodb/pom.xml   |  2 +-
 external/storm-mqtt/core/pom.xml |  2 +-
 external/storm-mqtt/examples/pom.xml |  2 +-
 external/storm-mqtt/pom.xml  |  2 +-
 external/storm-redis/pom.xml |  2 +-
 external/storm-solr/pom.xml  |  2 +-
 pom.xml  |  4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml |  2 +-
 storm-buildtools/storm-maven-plugins/pom.xml |  2 +-
 storm-core/pom.xml   |  2 +-
 storm-dist/binary/pom.xml|  2 +-
 storm-dist/source/pom.xml|  2 +-
 storm-multilang/javascript/pom.xml   |  2 +-
 storm-multilang/python/pom.xml   |  2 +-
 storm-multilang/ruby/pom.xml |  2 +-
 storm-rename-hack/pom.xml|  2 +-
 38 files changed, 51 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/56096559/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 0b8d46e..c2580c6 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  1.0.3
+  1.0.3-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/56096559/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index eeb02d0..66a4a1c 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.3
+1.0.3-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/56096559/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index 55000c8..04dfdc3 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.3
+1.0.3-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/56096559/external/flux/flux-wrappers/pom.xml
--
diff --git 

[storm] Git Push Summary

2017-02-07 Thread ptgoetz
Repository: storm
Updated Tags:  refs/tags/v1.0.3 [created] 9acb185d6


storm git commit: [maven-release-plugin] prepare for next development iteration

2017-02-07 Thread ptgoetz
Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch eac433b0b -> d4468cb6f


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/1.0.x-branch
Commit: d4468cb6fe1b0cc42d526530d122b7970c8a5a46
Parents: eac433b
Author: P. Taylor Goetz 
Authored: Tue Feb 7 13:51:31 2017 -0500
Committer: P. Taylor Goetz 
Committed: Tue Feb 7 13:51:31 2017 -0500

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/pom.xml| 2 +-
 external/sql/pom.xml | 2 +-
 external/sql/storm-sql-core/pom.xml  | 2 +-
 external/sql/storm-sql-kafka/pom.xml | 2 +-
 external/sql/storm-sql-runtime/pom.xml   | 2 +-
 external/storm-cassandra/pom.xml | 2 +-
 external/storm-elasticsearch/pom.xml | 2 +-
 external/storm-eventhubs/pom.xml | 4 ++--
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-hive/pom.xml  | 2 +-
 external/storm-jdbc/pom.xml  | 2 +-
 external/storm-jms/core/pom.xml  | 2 +-
 external/storm-jms/examples/pom.xml  | 2 +-
 external/storm-jms/pom.xml   | 2 +-
 external/storm-kafka-client/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 external/storm-metrics/pom.xml   | 2 +-
 external/storm-mongodb/pom.xml   | 2 +-
 external/storm-mqtt/core/pom.xml | 2 +-
 external/storm-mqtt/examples/pom.xml | 2 +-
 external/storm-mqtt/pom.xml  | 2 +-
 external/storm-redis/pom.xml | 2 +-
 external/storm-solr/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 storm-multilang/javascript/pom.xml   | 2 +-
 storm-multilang/python/pom.xml   | 2 +-
 storm-multilang/ruby/pom.xml | 2 +-
 storm-rename-hack/pom.xml| 2 +-
 38 files changed, 40 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/d4468cb6/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 0b8d46e..32f8c70 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  1.0.3
+  1.0.4-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d4468cb6/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index eeb02d0..3ff86f8 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.3
+1.0.4-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d4468cb6/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index 55000c8..a3b657d 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.3
+1.0.4-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d4468cb6/external/flux/flux-wrappers/pom.xml
--
diff --git 

[3/3] storm git commit: [maven-release-plugin] prepare release v1.0.3

2017-02-07 Thread ptgoetz
[maven-release-plugin] prepare release v1.0.3


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

Branch: refs/heads/1.0.x-branch
Commit: eac433b0beb3798c4723deb39b3c4fad446378f4
Parents: 5609655
Author: P. Taylor Goetz 
Authored: Tue Feb 7 13:51:22 2017 -0500
Committer: P. Taylor Goetz 
Committed: Tue Feb 7 13:51:22 2017 -0500

--
 examples/storm-starter/pom.xml   |  2 +-
 external/flux/flux-core/pom.xml  |  2 +-
 external/flux/flux-examples/pom.xml  |  2 +-
 external/flux/flux-wrappers/pom.xml  |  2 +-
 external/flux/pom.xml|  2 +-
 external/sql/pom.xml |  2 +-
 external/sql/storm-sql-core/pom.xml  |  2 +-
 external/sql/storm-sql-kafka/pom.xml |  2 +-
 external/sql/storm-sql-runtime/pom.xml   |  2 +-
 external/storm-cassandra/pom.xml |  2 +-
 external/storm-elasticsearch/pom.xml |  2 +-
 external/storm-eventhubs/pom.xml | 10 --
 external/storm-hbase/pom.xml |  2 +-
 external/storm-hdfs/pom.xml  |  2 +-
 external/storm-hive/pom.xml  |  2 +-
 external/storm-jdbc/pom.xml  |  2 +-
 external/storm-jms/core/pom.xml  |  5 ++---
 external/storm-jms/examples/pom.xml  |  7 +++
 external/storm-jms/pom.xml   |  5 ++---
 external/storm-kafka-client/pom.xml  |  2 +-
 external/storm-kafka/pom.xml |  2 +-
 external/storm-metrics/pom.xml   |  2 +-
 external/storm-mongodb/pom.xml   |  2 +-
 external/storm-mqtt/core/pom.xml |  2 +-
 external/storm-mqtt/examples/pom.xml |  2 +-
 external/storm-mqtt/pom.xml  |  2 +-
 external/storm-redis/pom.xml |  2 +-
 external/storm-solr/pom.xml  |  2 +-
 pom.xml  |  4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml |  2 +-
 storm-buildtools/storm-maven-plugins/pom.xml |  2 +-
 storm-core/pom.xml   |  2 +-
 storm-dist/binary/pom.xml|  2 +-
 storm-dist/source/pom.xml|  2 +-
 storm-multilang/javascript/pom.xml   |  2 +-
 storm-multilang/python/pom.xml   |  2 +-
 storm-multilang/ruby/pom.xml |  2 +-
 storm-rename-hack/pom.xml|  2 +-
 38 files changed, 46 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/eac433b0/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index c2580c6..0b8d46e 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  1.0.3-SNAPSHOT
+  1.0.3
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/eac433b0/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index 66a4a1c..eeb02d0 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.3-SNAPSHOT
+1.0.3
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/eac433b0/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index 04dfdc3..55000c8 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.3-SNAPSHOT
+1.0.3
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/eac433b0/external/flux/flux-wrappers/pom.xml
--
diff --git a/external/flux/flux-wrappers/pom.xml 

[1/3] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"

2017-02-07 Thread ptgoetz
Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 452a37ff7 -> eac433b0b


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 8f6dd29583dc20baebe92f707f32666c036eef79.


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

Branch: refs/heads/1.0.x-branch
Commit: 31c68daeb82a59cafd7ef7243d6d206c22a89ffc
Parents: 452a37f
Author: P. Taylor Goetz 
Authored: Tue Feb 7 12:15:20 2017 -0500
Committer: P. Taylor Goetz 
Committed: Tue Feb 7 12:15:20 2017 -0500

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/pom.xml| 2 +-
 external/sql/pom.xml | 2 +-
 external/sql/storm-sql-core/pom.xml  | 2 +-
 external/sql/storm-sql-kafka/pom.xml | 2 +-
 external/sql/storm-sql-runtime/pom.xml   | 2 +-
 external/storm-cassandra/pom.xml | 2 +-
 external/storm-elasticsearch/pom.xml | 2 +-
 external/storm-eventhubs/pom.xml | 4 ++--
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-hive/pom.xml  | 2 +-
 external/storm-jdbc/pom.xml  | 2 +-
 external/storm-jms/core/pom.xml  | 2 +-
 external/storm-jms/examples/pom.xml  | 2 +-
 external/storm-jms/pom.xml   | 2 +-
 external/storm-kafka-client/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 external/storm-metrics/pom.xml   | 2 +-
 external/storm-mongodb/pom.xml   | 2 +-
 external/storm-mqtt/core/pom.xml | 2 +-
 external/storm-mqtt/examples/pom.xml | 2 +-
 external/storm-mqtt/pom.xml  | 2 +-
 external/storm-redis/pom.xml | 2 +-
 external/storm-solr/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 storm-multilang/javascript/pom.xml   | 2 +-
 storm-multilang/python/pom.xml   | 2 +-
 storm-multilang/ruby/pom.xml | 2 +-
 storm-rename-hack/pom.xml| 2 +-
 38 files changed, 40 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/31c68dae/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 32f8c70..0b8d46e 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  1.0.4-SNAPSHOT
+  1.0.3
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/31c68dae/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index 3ff86f8..eeb02d0 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.4-SNAPSHOT
+1.0.3
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/31c68dae/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index a3b657d..55000c8 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.4-SNAPSHOT
+1.0.3
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/31c68dae/external/flux/flux-wrappers/pom.xml

[storm] Git Push Summary

2017-02-07 Thread ptgoetz
Repository: storm
Updated Tags:  refs/tags/v1.0.3 [deleted] 4344654e5