You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by hu...@apache.org on 2018/08/21 22:27:13 UTC
[incubator-heron] branch master updated: Nwang/make spout/bolt
compatible to storm 1.x (#2993)
This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 7a3249c Nwang/make spout/bolt compatible to storm 1.x (#2993)
7a3249c is described below
commit 7a3249cb5123c1dd886bc090597674584e0bd81c
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Tue Aug 21 15:27:11 2018 -0700
Nwang/make spout/bolt compatible to storm 1.x (#2993)
* Make storm-compatible api to be compatible with storm 1.x
* more files
* Fix in eco-storm-examples
---
.../src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java | 2 +-
.../src/java/org/apache/heron/examples/eco/TestNameSpout.java | 2 +-
.../src/java/org/apache/heron/examples/eco/TestWindowBolt.java | 2 +-
.../src/java/org/apache/storm/examples/SlidingWindowTopology.java | 2 +-
.../src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java | 2 +-
.../src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java | 2 +-
.../src/java/org/apache/storm/metric/api/IMetricsConsumer.java | 2 +-
storm-compatibility/src/java/org/apache/storm/spout/ISpout.java | 2 +-
.../src/java/org/apache/storm/topology/IRichSpoutDelegate.java | 2 +-
.../src/java/org/apache/storm/topology/IWindowedBolt.java | 2 +-
.../src/java/org/apache/storm/topology/base/BaseWindowedBolt.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
index 451246a..4c62e13 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestFibonacciSpout.java
@@ -42,7 +42,7 @@ public class TestFibonacciSpout extends BaseRichSpout {
}
@Override
- public void open(Map<String, Object> conf, TopologyContext context,
+ public void open(Map conf, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
}
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
index 23c3e34..d2ad52d 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestNameSpout.java
@@ -45,7 +45,7 @@ public class TestNameSpout extends BaseRichSpout {
isdistributed = isDistributed;
}
- public void open(Map<String, Object> conf, TopologyContext context,
+ public void open(Map conf, TopologyContext context,
SpoutOutputCollector collector) {
this.collector = collector;
}
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
index e6a9f2b..5c7c066 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/TestWindowBolt.java
@@ -35,7 +35,7 @@ public class TestWindowBolt extends BaseWindowedBolt {
@Override
- public void prepare(Map<String, Object> topoConf, TopologyContext context,
+ public void prepare(Map topoConf, TopologyContext context,
OutputCollector collector) {
this.collector = collector;
}
diff --git a/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java b/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java
index 292db29..5239fac 100644
--- a/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java
+++ b/storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java
@@ -57,7 +57,7 @@ public final class SlidingWindowTopology {
@Override
@SuppressWarnings("HiddenField")
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector
+ public void prepare(Map topoConf, TopologyContext context, OutputCollector
collector) {
this.collector = collector;
}
diff --git a/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java b/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java
index 092acb8..3f48c58 100644
--- a/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java
+++ b/storm-compatibility-examples/src/java/org/apache/storm/examples/bolt/SlidingWindowSumBolt.java
@@ -44,7 +44,7 @@ public class SlidingWindowSumBolt extends BaseWindowedBolt {
@Override
@SuppressWarnings("HiddenField")
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector
+ public void prepare(Map topoConf, TopologyContext context, OutputCollector
collector) {
this.collector = collector;
}
diff --git a/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java b/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java
index 691f965..747e695 100644
--- a/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java
+++ b/storm-compatibility-examples/src/java/org/apache/storm/examples/spout/RandomIntegerSpout.java
@@ -48,7 +48,7 @@ public class RandomIntegerSpout extends BaseRichSpout {
@Override
@SuppressWarnings("HiddenField")
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector
+ public void open(Map conf, TopologyContext context, SpoutOutputCollector
collector) {
this.collector = collector;
this.rand = new Random();
diff --git a/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java b/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java
index fd70ad4..c20e0b3 100644
--- a/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java
+++ b/storm-compatibility/src/java/org/apache/storm/metric/api/IMetricsConsumer.java
@@ -89,7 +89,7 @@ public interface IMetricsConsumer {
}
@SuppressWarnings("rawtypes")
- void prepare(Map<String, Object> stormConf, Object registrationArgument,
+ void prepare(Map stormConf, Object registrationArgument,
TopologyContext context, IErrorReporter errorReporter);
void handleDataPoints(TaskInfo taskInfo, Collection<DataPoint> dataPoints);
diff --git a/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java b/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java
index e2ee367..f0c2cb6 100644
--- a/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java
+++ b/storm-compatibility/src/java/org/apache/storm/spout/ISpout.java
@@ -57,7 +57,7 @@ public interface ISpout extends Serializable {
* @param collector The collector is used to emit tuples from this spout. Tuples can be emitted at any time, including the open and close methods. The collector is thread-safe and should be saved as an instance variable of this spout object.
*/
@SuppressWarnings("rawtypes")
- void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector);
+ void open(Map conf, TopologyContext context, SpoutOutputCollector collector);
/**
* Called when an ISpout is going to be shutdown. There is no guarentee that close
diff --git a/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java b/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java
index 542f2f8..f8a3e3c 100644
--- a/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java
+++ b/storm-compatibility/src/java/org/apache/storm/topology/IRichSpoutDelegate.java
@@ -45,7 +45,7 @@ public class IRichSpoutDelegate implements org.apache.heron.api.spout.IRichSpout
@Override
@SuppressWarnings("rawtypes")
- public void open(Map<String, Object> conf, org.apache.heron.api.topology.TopologyContext context,
+ public void open(Map conf, org.apache.heron.api.topology.TopologyContext context,
SpoutOutputCollector collector) {
topologyContextImpl = new TopologyContext(context);
spoutOutputCollectorImpl = new SpoutOutputCollectorImpl(collector);
diff --git a/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java b/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java
index d848c43..8f814bc 100644
--- a/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java
+++ b/storm-compatibility/src/java/org/apache/storm/topology/IWindowedBolt.java
@@ -33,7 +33,7 @@ public interface IWindowedBolt extends IComponent {
* {@link org.apache.storm.task.IBolt#prepare(Map, TopologyContext, OutputCollector)} except
* that while emitting, the tuples are automatically anchored to the tuples in the inputWindow.
*/
- void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector collector);
+ void prepare(Map topoConf, TopologyContext context, OutputCollector collector);
/**
* Process the tuple window and optionally emit new tuples based on the tuples in the input
diff --git a/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java b/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java
index fbbc693..4cd2c86 100644
--- a/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java
+++ b/storm-compatibility/src/java/org/apache/storm/topology/base/BaseWindowedBolt.java
@@ -524,7 +524,7 @@ public abstract class BaseWindowedBolt implements IWindowedBolt {
}
@Override
- public void prepare(Map<String, Object> topoConf, TopologyContext context, OutputCollector
+ public void prepare(Map topoConf, TopologyContext context, OutputCollector
collector) {
// NOOP
}