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

2018-05-07 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/1.x-branch 9975ff629 -> e74793cad


[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/e74793ca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e74793ca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e74793ca

Branch: refs/heads/1.x-branch
Commit: e74793cad39eda61e128c0a9d5939554605655d2
Parents: 9975ff6
Author: P. Taylor Goetz 
Authored: Mon May 7 15:22:54 2018 -0400
Committer: P. Taylor Goetz 
Committed: Mon May 7 15:22:54 2018 -0400

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/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-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 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/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-migration/pom.xml| 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/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 +-
 59 files changed, 60 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e74793ca/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-

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

2018-05-07 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/1.x-branch a4447e64d -> 9975ff629


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

This reverts commit ec259b869ef027d81bd3d5e864082f44d94e.


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

Branch: refs/heads/1.x-branch
Commit: e735749932d420ec997d7bd894b547a4f095970b
Parents: a4447e6
Author: P. Taylor Goetz 
Authored: Mon May 7 15:06:47 2018 -0400
Committer: P. Taylor Goetz 
Committed: Mon May 7 15:06:47 2018 -0400

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/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-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 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/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-migration/pom.xml| 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/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 +-
 59 files changed, 60 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e7357499/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/exampl

[storm] Git Push Summary

2018-05-07 Thread ptgoetz 
Repository: storm
Updated Tags:  refs/tags/v1.2.2 [created] 1c6480672

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

2018-05-07 Thread ptgoetz 
Revert "[maven-release-plugin] prepare release v1.2.2"

This reverts commit e001672cf0ea59fe6989b563fb6bbb450fe8e7e5.


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

Branch: refs/heads/1.x-branch
Commit: fbed28454223bcd45158614ec89ec5d560b392e5
Parents: e735749
Author: P. Taylor Goetz 
Authored: Mon May 7 15:06:50 2018 -0400
Committer: P. Taylor Goetz 
Committed: Mon May 7 15:06:50 2018 -0400

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/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-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 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/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-migration/pom.xml| 5 +++--
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/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 +-
 59 files changed, 62 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/fbed2845/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-examples/pom.xml
index f77

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

2018-05-07 Thread ptgoetz 
[maven-release-plugin] prepare release v1.2.2


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

Branch: refs/heads/1.x-branch
Commit: 9975ff629f43623fe1dbde2756b18f5cb7ce266b
Parents: fbed284
Author: P. Taylor Goetz 
Authored: Mon May 7 15:22:46 2018 -0400
Committer: P. Taylor Goetz 
Committed: Mon May 7 15:22:46 2018 -0400

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/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-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 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/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-migration/pom.xml| 5 ++---
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/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 +-
 59 files changed, 61 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/9975ff62/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-examples/pom.xml
index c63936a..f77289f 100644
--- a/examples/storm-elasticsearch-examples/pom.xml

[storm] Git Push Summary

2018-05-07 Thread ptgoetz 
Repository: storm
Updated Tags:  refs/tags/v1.2.2 [deleted] 3d2f9fb76

[1/2] storm git commit: STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the spout filters out a null tuple

2018-05-07 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch b1d25a52b -> c63604d76


STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the 
spout filters out a null tuple


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

Branch: refs/heads/1.0.x-branch
Commit: e311b956957ca33b8e0eca52bf8a28e07b5564f9
Parents: b1d25a5
Author: Stig Rohde Døssing 
Authored: Sun May 6 10:16:25 2018 +0200
Committer: Jungtaek Lim 
Committed: Mon May 7 22:04:28 2018 +0900

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 42 ++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 59 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 36 +---
 4 files changed, 95 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e311b956/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
--
diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index e7f5156..e8ecb3e 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -503,9 +503,11 @@ public class KafkaSpout extends BaseRichSpout {
 /*if a null tuple is not configured to be emitted, it should 
be marked as emitted and acked immediately
 * to allow its offset to be commited to Kafka*/
 LOG.debug("Not emitting null tuple for record [{}] as defined 
in configuration.", record);
-msgId.setNullTuple(true);
-offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
-ack(msgId);
+if (isAtLeastOnceProcessing()) {
+msgId.setNullTuple(true);
+offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
+ack(msgId);
+}
 }
 }
 return false;

http://git-wip-us.apache.org/repos/asf/storm/blob/e311b956/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
new file mode 100644
index 000..f2b2f98
--- /dev/null
+++ 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018 The Apache Software Foundation.
+ *
+ * Licensed 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;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.storm.kafka.spout.RecordTranslator;
+import org.apache.storm.tuple.Fields;
+
+public class NullRecordTranslator implements RecordTranslator {
+
+@Override
+public List apply(ConsumerRecord record) {
+return null;
+
+}
+
+@Override
+public Fields getFieldsFor(String stream) {
+return new Fields("topic", "key", "value");
+}
+
+@Override
+public List streams() {
+return Collections.singletonList("default");
+}
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/e311b956/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
index 082cc58..ca16237 100644
--- 
a/external/storm-kafka-client/src/test/java/org/apach

[2/2] storm git commit: Merge branch 'STORM-2903-1.0.x-merge' into 1.0.x-branch

2018-05-07 Thread kabhwan 
Merge branch 'STORM-2903-1.0.x-merge' into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: c63604d76eae01f1a399791d866c5e111cd99ec9
Parents: b1d25a5 e311b95
Author: Jungtaek Lim 
Authored: Mon May 7 22:04:32 2018 +0900
Committer: Jungtaek Lim 
Committed: Mon May 7 22:04:32 2018 +0900

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 42 ++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 59 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 36 +---
 4 files changed, 95 insertions(+), 50 deletions(-)
--

[1/2] storm git commit: STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the spout filters out a null tuple

2018-05-07 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch 5db1457c8 -> 88cf69f9c


STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the 
spout filters out a null tuple


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

Branch: refs/heads/1.1.x-branch
Commit: 8f584f6b4b93999c7b98d79e7071e000c531b66c
Parents: 5db1457
Author: Stig Rohde Døssing 
Authored: Sun May 6 10:16:25 2018 +0200
Committer: Jungtaek Lim 
Committed: Mon May 7 21:55:52 2018 +0900

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 42 ++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 59 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 36 +---
 4 files changed, 95 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/8f584f6b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
--
diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index e7f5156..e8ecb3e 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -503,9 +503,11 @@ public class KafkaSpout extends BaseRichSpout {
 /*if a null tuple is not configured to be emitted, it should 
be marked as emitted and acked immediately
 * to allow its offset to be commited to Kafka*/
 LOG.debug("Not emitting null tuple for record [{}] as defined 
in configuration.", record);
-msgId.setNullTuple(true);
-offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
-ack(msgId);
+if (isAtLeastOnceProcessing()) {
+msgId.setNullTuple(true);
+offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
+ack(msgId);
+}
 }
 }
 return false;

http://git-wip-us.apache.org/repos/asf/storm/blob/8f584f6b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
new file mode 100644
index 000..f2b2f98
--- /dev/null
+++ 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018 The Apache Software Foundation.
+ *
+ * Licensed 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;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.storm.kafka.spout.RecordTranslator;
+import org.apache.storm.tuple.Fields;
+
+public class NullRecordTranslator implements RecordTranslator {
+
+@Override
+public List apply(ConsumerRecord record) {
+return null;
+
+}
+
+@Override
+public Fields getFieldsFor(String stream) {
+return new Fields("topic", "key", "value");
+}
+
+@Override
+public List streams() {
+return Collections.singletonList("default");
+}
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/8f584f6b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
index 082cc58..ca16237 100644
--- 
a/external/storm-kafka-client/src/test/java/org/apach

[2/2] storm git commit: Merge branch 'STORM-3059-1.1.x-merge' into 1.1.x-branch

2018-05-07 Thread kabhwan 
Merge branch 'STORM-3059-1.1.x-merge' into 1.1.x-branch


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

Branch: refs/heads/1.1.x-branch
Commit: 88cf69f9c322bc8e2e2cfa90da19800e0ceba884
Parents: 5db1457 8f584f6
Author: Jungtaek Lim 
Authored: Mon May 7 22:03:02 2018 +0900
Committer: Jungtaek Lim 
Committed: Mon May 7 22:03:02 2018 +0900

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 42 ++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 59 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 36 +---
 4 files changed, 95 insertions(+), 50 deletions(-)
--

[2/2] storm git commit: Merge branch 'STORM-3059' of https://github.com/srdo/storm into STORM-3059-merge

2018-05-07 Thread kabhwan 
Merge branch 'STORM-3059' of https://github.com/srdo/storm into STORM-3059-merge


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

Branch: refs/heads/master
Commit: 15a6fa5753d14ce5c12f054bf9255607e4943081
Parents: 02639f4 3370b2d
Author: Jungtaek Lim 
Authored: Mon May 7 21:53:05 2018 +0900
Committer: Jungtaek Lim 
Committed: Mon May 7 21:53:05 2018 +0900

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 37 +
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 58 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 28 +-
 4 files changed, 89 insertions(+), 42 deletions(-)
--

[1/2] storm git commit: STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the spout filters out a null tuple

2018-05-07 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/master 02639f4f0 -> 15a6fa575


STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the 
spout filters out a null tuple


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

Branch: refs/heads/master
Commit: 3370b2d6495be770989c048a35cd3998e899bd60
Parents: 02639f4
Author: Stig Rohde Døssing 
Authored: Sun May 6 10:16:25 2018 +0200
Committer: Stig Rohde Døssing 
Committed: Mon May 7 08:33:48 2018 +0200

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 37 +
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 58 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 28 +-
 4 files changed, 89 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/3370b2d6/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
--
diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index 901e97f..4c2a6ff 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -486,9 +486,11 @@ public class KafkaSpout extends BaseRichSpout {
 /*if a null tuple is not configured to be emitted, it should 
be marked as emitted and acked immediately
 * to allow its offset to be commited to Kafka*/
 LOG.debug("Not emitting null tuple for record [{}] as defined 
in configuration.", record);
-msgId.setNullTuple(true);
-offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
-ack(msgId);
+if (isAtLeastOnceProcessing()) {
+msgId.setNullTuple(true);
+offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
+ack(msgId);
+}
 }
 }
 return false;

http://git-wip-us.apache.org/repos/asf/storm/blob/3370b2d6/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
new file mode 100644
index 000..065244e
--- /dev/null
+++ 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018 The Apache Software Foundation.
+ *
+ * Licensed 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;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.storm.kafka.spout.RecordTranslator;
+import org.apache.storm.tuple.Fields;
+
+public class NullRecordTranslator implements RecordTranslator {
+
+@Override
+public List apply(ConsumerRecord record) {
+return null;
+
+}
+
+@Override
+public Fields getFieldsFor(String stream) {
+return new Fields("topic", "key", "value");
+}
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/3370b2d6/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
index 920dedc..1d2c171 100644
--- 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
+++ 
b/external/storm-kafka-client/src/test/java/org/apac

[1/2] storm git commit: STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the spout filters out a null tuple

2018-05-07 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/1.x-branch ec259 -> a4447e64d


STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCE and the 
spout filters out a null tuple


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

Branch: refs/heads/1.x-branch
Commit: d70b475456e2d7cb83e80b45560f48b58dffd4d2
Parents: ec25999
Author: Stig Rohde Døssing 
Authored: Sun May 6 10:16:25 2018 +0200
Committer: Stig Rohde Døssing 
Committed: Mon May 7 08:36:38 2018 +0200

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 42 ++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 59 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 36 +---
 4 files changed, 95 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/d70b4754/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
--
diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index e7f5156..e8ecb3e 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -503,9 +503,11 @@ public class KafkaSpout extends BaseRichSpout {
 /*if a null tuple is not configured to be emitted, it should 
be marked as emitted and acked immediately
 * to allow its offset to be commited to Kafka*/
 LOG.debug("Not emitting null tuple for record [{}] as defined 
in configuration.", record);
-msgId.setNullTuple(true);
-offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
-ack(msgId);
+if (isAtLeastOnceProcessing()) {
+msgId.setNullTuple(true);
+offsetManagers.get(tp).addToEmitMsgs(msgId.offset());
+ack(msgId);
+}
 }
 }
 return false;

http://git-wip-us.apache.org/repos/asf/storm/blob/d70b4754/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
new file mode 100644
index 000..f2b2f98
--- /dev/null
+++ 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018 The Apache Software Foundation.
+ *
+ * Licensed 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;
+
+import java.util.Collections;
+import java.util.List;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.storm.kafka.spout.RecordTranslator;
+import org.apache.storm.tuple.Fields;
+
+public class NullRecordTranslator implements RecordTranslator {
+
+@Override
+public List apply(ConsumerRecord record) {
+return null;
+
+}
+
+@Override
+public Fields getFieldsFor(String stream) {
+return new Fields("topic", "key", "value");
+}
+
+@Override
+public List streams() {
+return Collections.singletonList("default");
+}
+}

http://git-wip-us.apache.org/repos/asf/storm/blob/d70b4754/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
--
diff --git 
a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
 
b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
index 082cc58..ca16237 100644
--- 
a/external/storm-kafka-client/src/test/java/org/ap

[2/2] storm git commit: Merge branch 'STORM-3059-1.x' of https://github.com/srdo/storm into STORM-3059-1.x-merge

2018-05-07 Thread kabhwan 
Merge branch 'STORM-3059-1.x' of https://github.com/srdo/storm into 
STORM-3059-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/a4447e64
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a4447e64
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a4447e64

Branch: refs/heads/1.x-branch
Commit: a4447e64dd3db04d51fc01f4e2d9e022a200e19e
Parents: ec25999 d70b475
Author: Jungtaek Lim 
Authored: Mon May 7 21:53:53 2018 +0900
Committer: Jungtaek Lim 
Committed: Mon May 7 21:53:53 2018 +0900

--
 .../apache/storm/kafka/spout/KafkaSpout.java|  8 ++-
 .../storm/kafka/NullRecordTranslator.java   | 42 ++
 .../spout/KafkaSpoutMessagingGuaranteeTest.java | 59 +++-
 .../kafka/spout/KafkaSpoutNullTupleTest.java| 36 +---
 4 files changed, 95 insertions(+), 50 deletions(-)
--