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 2016/01/25 00:24:53 UTC
[1/5] storm git commit: make getComponentConfiguration cleaner
Repository: storm
Updated Branches:
refs/heads/1.x-branch da71bccc3 -> b720e2390
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/1.x-branch
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() {
[5/5] storm git commit: Merge branch 'STORM-1478' of
https://github.com/vesense/storm into STORM-1478-1.x
Posted by ka...@apache.org.
Merge branch 'STORM-1478' of https://github.com/vesense/storm into STORM-1478-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b720e239
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b720e239
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b720e239
Branch: refs/heads/1.x-branch
Commit: b720e2390dc64e304c853be22db62cad70c6bf65
Parents: e12e723 a6e1bce
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jan 25 08:15:21 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jan 25 08:15:21 2016 +0900
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------
[4/5] storm git commit: Merge branch 'STORM-1484' of
https://github.com/vesense/storm into STORM-1484-1.x
Posted by ka...@apache.org.
Merge branch 'STORM-1484' of https://github.com/vesense/storm into STORM-1484-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e12e7239
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e12e7239
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e12e7239
Branch: refs/heads/1.x-branch
Commit: e12e7239a11b40a0bef8955ca661fd5922202bc2
Parents: da71bcc 527ad0e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jan 25 08:14:13 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jan 25 08:14:13 2016 +0900
----------------------------------------------------------------------
.gitignore | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] storm git commit: ignore subproject .classpath & .project file
Posted by ka...@apache.org.
ignore subproject .classpath & .project file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/527ad0e1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/527ad0e1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/527ad0e1
Branch: refs/heads/1.x-branch
Commit: 527ad0e16b08e8dfb465abc78da2c65cd79e5c76
Parents: 90e4f3e
Author: Xin Wang <be...@163.com>
Authored: Sun Jan 17 17:41:46 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Sun Jan 17 17:41:46 2016 +0800
----------------------------------------------------------------------
.gitignore | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/527ad0e1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4b4c52f..08b217a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,5 @@ dependency-reduced-pom.xml
derby.log
metastore_db
.settings/
-**/.project
-**/.classpath
+.project
+.classpath
[3/5] storm git commit: fix frequency typo
Posted by ka...@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/1.x-branch
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();
}