You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sa...@apache.org on 2017/02/17 10:15:45 UTC
[1/2] storm git commit: [STORM-2365] Support for specifying output
stream in event hubs spout
Repository: storm
Updated Branches:
refs/heads/master d235a0c1b -> 622b9507e
[STORM-2365] Support for specifying output stream in event hubs spout
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/83fe7805
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/83fe7805
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/83fe7805
Branch: refs/heads/master
Commit: 83fe7805f36f2dd9c85619f7e7d5af9e90b6dd6e
Parents: d235a0c
Author: Arun Mahadevan <ar...@apache.org>
Authored: Wed Feb 15 23:50:49 2017 +0530
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Thu Feb 16 14:26:04 2017 +0530
----------------------------------------------------------------------
.../org/apache/storm/eventhubs/spout/EventHubSpout.java | 7 ++++++-
.../apache/storm/eventhubs/spout/EventHubSpoutConfig.java | 10 ++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/83fe7805/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java
index 662697d..6adef42 100755
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java
@@ -17,6 +17,7 @@
*******************************************************************************/
package org.apache.storm.eventhubs.spout;
+import com.google.common.base.Strings;
import org.apache.storm.Config;
import org.apache.storm.metric.api.IMetric;
import org.apache.storm.spout.SpoutOutputCollector;
@@ -242,7 +243,11 @@ public class EventHubSpout extends BaseRichSpout {
@Override
public void declareOutputFields(OutputFieldsDeclarer declarer) {
- declarer.declare(scheme.getOutputFields());
+ if (Strings.isNullOrEmpty(eventHubConfig.getOutputStreamId())) {
+ declarer.declare(scheme.getOutputFields());
+ } else {
+ declarer.declareStream(eventHubConfig.getOutputStreamId(), scheme.getOutputFields());
+ }
}
private void checkpointIfNeeded() {
http://git-wip-us.apache.org/repos/asf/storm/blob/83fe7805/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpoutConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpoutConfig.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpoutConfig.java
index 168b134..e06953a 100755
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpoutConfig.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpoutConfig.java
@@ -44,6 +44,8 @@ public class EventHubSpoutConfig implements Serializable {
private IEventDataScheme scheme = new StringEventDataScheme();
private String consumerGroupName = null; // if null then use default
// consumer group
+ private String outputStreamId;
+
// These are mandatory parameters
public EventHubSpoutConfig(String username, String password,
@@ -239,4 +241,12 @@ public class EventHubSpoutConfig implements Serializable {
setTargetAddress(targetFqnAddress);
return this;
}
+
+ public String getOutputStreamId() {
+ return outputStreamId;
+ }
+
+ public void setOutputStreamId(String outputStreamId) {
+ this.outputStreamId = outputStreamId;
+ }
}
[2/2] storm git commit: Added STORM-2365 to CHANGELOG.md
Posted by sa...@apache.org.
Added STORM-2365 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/622b9507
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/622b9507
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/622b9507
Branch: refs/heads/master
Commit: 622b9507e2ac6740852d5c57c918a5b79fb6549b
Parents: 83fe780
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Fri Feb 17 15:45:33 2017 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Fri Feb 17 15:45:33 2017 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/622b9507/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efc3490..a6ca131 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 2.0.0
+ * STORM-2365: Support for specifying output stream in event hubs spout
* STORM-2250: Kafka Spout Refactoring to Increase Modularity and Testability
* STORM-2346: Files with unapproved licenses: download-rc-directory.sh verify-release-file.sh
* STORM-2350: Storm-HDFS's listFilesByModificationTime is broken