storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/3] storm git commit: STORM-799 Use IErrorReport interface more broadly
Date Thu, 16 Jul 2015 16:24:04 GMT
Repository: storm
Updated Branches:
  refs/heads/master e6c502b11 -> f079882b9


STORM-799 Use IErrorReport interface more broadly


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

Branch: refs/heads/master
Commit: 735fae7899eb8240b7a0d5514c6f68a9f6be3e4f
Parents: 9579c0b
Author: Aaron Dossett <aaron.dossett@target.com>
Authored: Tue Jun 30 09:29:32 2015 -0500
Committer: Aaron Dossett <aaron.dossett@target.com>
Committed: Tue Jun 30 09:29:32 2015 -0500

----------------------------------------------------------------------
 .../src/jvm/backtype/storm/metric/MetricsConsumerBolt.java      | 2 +-
 .../src/jvm/backtype/storm/spout/ISpoutOutputCollector.java     | 5 +++--
 .../src/jvm/backtype/storm/topology/IBasicOutputCollector.java  | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/735fae78/storm-core/src/jvm/backtype/storm/metric/MetricsConsumerBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/metric/MetricsConsumerBolt.java b/storm-core/src/jvm/backtype/storm/metric/MetricsConsumerBolt.java
index d8eb3bf..5a40c27 100644
--- a/storm-core/src/jvm/backtype/storm/metric/MetricsConsumerBolt.java
+++ b/storm-core/src/jvm/backtype/storm/metric/MetricsConsumerBolt.java
@@ -46,7 +46,7 @@ public class MetricsConsumerBolt implements IBolt {
             throw new RuntimeException("Could not instantiate a class listed in config under
section " +
                 Config.TOPOLOGY_METRICS_CONSUMER_REGISTER + " with fully qualified name "
+ _consumerClassName, e);
         }
-        _metricsConsumer.prepare(stormConf, _registrationArgument, context, (IErrorReporter)collector);
+        _metricsConsumer.prepare(stormConf, _registrationArgument, context, collector);
         _collector = collector;
     }
     

http://git-wip-us.apache.org/repos/asf/storm/blob/735fae78/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java b/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
index 3cebe43..a7965ee 100644
--- a/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
@@ -17,14 +17,15 @@
  */
 package backtype.storm.spout;
 
+import backtype.storm.task.IErrorReporter;
+
 import java.util.List;
 
-public interface ISpoutOutputCollector {
+public interface ISpoutOutputCollector extends IErrorReporter{
     /**
         Returns the task ids that received the tuples.
     */
     List<Integer> emit(String streamId, List<Object> tuple, Object messageId);
     void emitDirect(int taskId, String streamId, List<Object> tuple, Object messageId);
-    void reportError(Throwable error);
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/735fae78/storm-core/src/jvm/backtype/storm/topology/IBasicOutputCollector.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/topology/IBasicOutputCollector.java b/storm-core/src/jvm/backtype/storm/topology/IBasicOutputCollector.java
index 92d60d2..618dcb0 100644
--- a/storm-core/src/jvm/backtype/storm/topology/IBasicOutputCollector.java
+++ b/storm-core/src/jvm/backtype/storm/topology/IBasicOutputCollector.java
@@ -17,10 +17,11 @@
  */
 package backtype.storm.topology;
 
+import backtype.storm.task.IErrorReporter;
+
 import java.util.List;
 
-public interface IBasicOutputCollector {
+public interface IBasicOutputCollector extends IErrorReporter{
     List<Integer> emit(String streamId, List<Object> tuple);
     void emitDirect(int taskId, String streamId, List<Object> tuple);
-    void reportError(Throwable t);
 }


Mime
View raw message