You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/13 18:22:35 UTC
[09/11] storm git commit: resolve conflicts
resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d1d6dbea
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d1d6dbea
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d1d6dbea
Branch: refs/heads/1.x-branch
Commit: d1d6dbea95c263086f0e3820e7acd5aed74a07f8
Parents: 023cebd
Author: vesense <be...@163.com>
Authored: Wed Jan 13 14:11:53 2016 +0800
Committer: vesense <be...@163.com>
Committed: Wed Jan 13 14:37:04 2016 +0800
----------------------------------------------------------------------
.../apache/storm/solr/bolt/SolrUpdateBolt.java | 15 ++----
.../jvm/org/apache/storm/utils/TupleUtils.java | 56 +++++++++++++-------
2 files changed, 40 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d1d6dbea/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 ee9461a..c9b2b0c 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
@@ -18,23 +18,14 @@
package org.apache.storm.solr.bolt;
-<<<<<<< HEAD
-import backtype.storm.Config;
-import backtype.storm.task.OutputCollector;
-import backtype.storm.task.TopologyContext;
-import backtype.storm.topology.OutputFieldsDeclarer;
-import backtype.storm.topology.base.BaseRichBolt;
-import backtype.storm.tuple.Tuple;
-import backtype.storm.utils.TupleUtils;
-import backtype.storm.utils.Utils;
-
-=======
+import org.apache.storm.Config;
import org.apache.storm.task.OutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.topology.OutputFieldsDeclarer;
import org.apache.storm.topology.base.BaseRichBolt;
import org.apache.storm.tuple.Tuple;
->>>>>>> apache/master
+import org.apache.storm.utils.TupleUtils;
+import org.apache.storm.utils.Utils;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
http://git-wip-us.apache.org/repos/asf/storm/blob/d1d6dbea/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 0b4c4be..c2ec61e 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/TupleUtils.java
@@ -17,30 +17,48 @@
*/
package org.apache.storm.utils;
-import java.util.Arrays;
-import java.util.List;
-
+import org.apache.storm.Config;
import org.apache.storm.Constants;
import org.apache.storm.tuple.Tuple;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
public final class TupleUtils {
+ private static final Logger LOG = LoggerFactory.getLogger(TupleUtils.class);
+
+ private TupleUtils() {
+ // No instantiation
+ }
+
+ public static boolean isTick(Tuple tuple) {
+ return tuple != null
+ && Constants.SYSTEM_COMPONENT_ID.equals(tuple.getSourceComponent())
+ && Constants.SYSTEM_TICK_STREAM_ID.equals(tuple.getSourceStreamId());
+ }
+
+ public static <T> int listHashCode(List<T> alist) {
+ if (alist == null) {
+ return 1;
+ } else {
+ return Arrays.deepHashCode(alist.toArray());
+ }
+ }
+
+ public static Map<String, Object> putTickFreqencyIntoComponentConfig(Map<String, Object> conf, int tickFreqSecs) {
+ if (conf == null) {
+ conf = new Config();
+ }
+
+ if (tickFreqSecs > 0) {
+ LOG.info("Enabling tick tuple with interval [{}]", tickFreqSecs);
+ conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, tickFreqSecs);
+ }
- private TupleUtils() {
- // No instantiation
- }
-
- public static boolean isTick(Tuple tuple) {
- return tuple != null
- && Constants.SYSTEM_COMPONENT_ID .equals(tuple.getSourceComponent())
- && Constants.SYSTEM_TICK_STREAM_ID.equals(tuple.getSourceStreamId());
- }
-
- public static <T> int listHashCode(List<T> alist) {
- if (alist == null) {
- return 1;
- } else {
- return Arrays.deepHashCode(alist.toArray());
+ return conf;
}
- }
}