You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2016/01/19 12:11:39 UTC
[1/4] storm git commit: make getComponentConfiguration cleaner
Repository: storm
Updated Branches:
refs/heads/master 3a7cfc8e7 -> c9d687e7f
make getComponentConfiguration cleaner
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/40df0954
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/40df0954
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/40df0954
Branch: refs/heads/master
Commit: 40df09547e4e8bf6c80cea4f1250fa27243646b8
Parents: 90e4f3e
Author: Xin Wang <be...@163.com>
Authored: Sat Jan 16 13:44:32 2016 +0800
Committer: vesense <be...@163.com>
Committed: Sat Jan 16 13:50:56 2016 +0800
----------------------------------------------------------------------
.../org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 11 +----------
.../main/java/org/apache/storm/hive/bolt/HiveBolt.java | 10 ++--------
2 files changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/40df0954/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
index dbe986e..c33de81 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
@@ -216,16 +216,7 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
- Map<String, Object> conf = super.getComponentConfiguration();
- if (conf == null)
- conf = new Config();
-
- if (tickTupleInterval > 0) {
- LOG.info("Enabling tick tuple with interval [{}]", tickTupleInterval);
- conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, tickTupleInterval);
- }
-
- return conf;
+ return TupleUtils.putTickFreqencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/40df0954/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index 8b3362b..1e7ce1e 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@ -188,14 +188,8 @@ public class HiveBolt extends BaseRichBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
- Map<String, Object> conf = super.getComponentConfiguration();
- if (conf == null)
- conf = new Config();
-
- if (options.getTickTupleInterval() > 0)
- conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, options.getTickTupleInterval());
-
- return conf;
+ return TupleUtils.putTickFreqencyIntoComponentConfig(super.getComponentConfiguration(),
+ options.getTickTupleInterval());
}
private void setupHeartBeatTimer() {
[4/4] storm git commit: Adding STORM-1478 to Changelog
Posted by ar...@apache.org.
Adding STORM-1478 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c9d687e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c9d687e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c9d687e7
Branch: refs/heads/master
Commit: c9d687e7f52715d32d51e959293c2480c9a3ab1a
Parents: a263787
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Tue Jan 19 16:28:20 2016 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Tue Jan 19 16:28:20 2016 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c9d687e7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dc2679..29ca61c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 2.0.0
## 1.0.0
+ * STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
* STORM-1482: add missing 'break' for RedisStoreBolt
* STORM-1466: Move the org.apache.thrift7 namespace to something correct/sensible
* STORM-1470: Applies shading to hadoop-auth, cleaner exclusions
[2/4] storm git commit: fix frequency typo
Posted by ar...@apache.org.
fix frequency typo
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a6e1bced
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a6e1bced
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a6e1bced
Branch: refs/heads/master
Commit: a6e1bced27b5c02e0b90cd6a91bac9e4e77c4e4f
Parents: 40df095
Author: vesense <be...@163.com>
Authored: Tue Jan 19 10:40:34 2016 +0800
Committer: vesense <be...@163.com>
Committed: Tue Jan 19 10:40:34 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 2 +-
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 2 +-
.../src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java | 2 +-
storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a6e1bced/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
index c33de81..ae5d5d7 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
@@ -216,7 +216,7 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
- return TupleUtils.putTickFreqencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
+ return TupleUtils.putTickFrequencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/a6e1bced/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index 1e7ce1e..0646dcb 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@ -188,7 +188,7 @@ public class HiveBolt extends BaseRichBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
- return TupleUtils.putTickFreqencyIntoComponentConfig(super.getComponentConfiguration(),
+ return TupleUtils.putTickFrequencyIntoComponentConfig(super.getComponentConfiguration(),
options.getTickTupleInterval());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/a6e1bced/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index c9b2b0c..cab9899 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -153,7 +153,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
- return TupleUtils.putTickFreqencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
+ return TupleUtils.putTickFrequencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/a6e1bced/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
index c2ec61e..fff88d4 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
@@ -48,7 +48,7 @@ public final class TupleUtils {
}
}
- public static Map<String, Object> putTickFreqencyIntoComponentConfig(Map<String, Object> conf, int tickFreqSecs) {
+ public static Map<String, Object> putTickFrequencyIntoComponentConfig(Map<String, Object> conf, int tickFreqSecs) {
if (conf == null) {
conf = new Config();
}
[3/4] storm git commit: Merge branch 'STORM-1478' of
https://github.com/vesense/storm into STORM-1478
Posted by ar...@apache.org.
Merge branch 'STORM-1478' of https://github.com/vesense/storm into STORM-1478
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a263787d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a263787d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a263787d
Branch: refs/heads/master
Commit: a263787d08056afafa0ae777cdab9644bb1e29a4
Parents: 3a7cfc8 a6e1bce
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Tue Jan 19 16:26:14 2016 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Tue Jan 19 16:26:14 2016 +0530
----------------------------------------------------------------------
.../org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 11 +----------
.../main/java/org/apache/storm/hive/bolt/HiveBolt.java | 10 ++--------
.../java/org/apache/storm/solr/bolt/SolrUpdateBolt.java | 2 +-
.../src/jvm/org/apache/storm/utils/TupleUtils.java | 2 +-
4 files changed, 5 insertions(+), 20 deletions(-)
----------------------------------------------------------------------