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:38:35 UTC
[1/2] storm git commit: STORM-2365: Support for specifying output
stream in event hubs spout
Repository: storm
Updated Branches:
refs/heads/1.x-branch ff80b098b -> bdb557dd1
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/2f69242d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2f69242d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2f69242d
Branch: refs/heads/1.x-branch
Commit: 2f69242d0b3557feb5dc710b9dcb302abbd72aae
Parents: ff80b09
Author: Arun Mahadevan <ar...@apache.org>
Authored: Wed Feb 15 23:50:49 2017 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Fri Feb 17 16:06:18 2017 +0530
----------------------------------------------------------------------
.../apache/storm/eventhubs/spout/EventHubSpout.java | 7 ++++++-
.../storm/eventhubs/spout/EventHubSpoutConfig.java | 15 ++++++++++++---
2 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2f69242d/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 479ce17..aaf54c5 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/2f69242d/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 b8b8bbf..8c3471a 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
@@ -17,10 +17,11 @@
*******************************************************************************/
package org.apache.storm.eventhubs.spout;
+import com.microsoft.eventhubs.client.ConnectionStringBuilder;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import com.microsoft.eventhubs.client.ConnectionStringBuilder;
public class EventHubSpoutConfig implements Serializable {
private static final long serialVersionUID = 1L;
@@ -42,8 +43,8 @@ public class EventHubSpoutConfig implements Serializable {
private String connectionString;
private String topologyName;
private IEventDataScheme scheme = new StringEventDataScheme();
- private String consumerGroupName = null; // if null then use default
- // consumer group
+ 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 +240,12 @@ public class EventHubSpoutConfig implements Serializable {
setTargetAddress(targetFqnAddress);
return this;
}
+
+ public String getOutputStreamId() {
+ return outputStreamId;
+ }
+
+ public void setOutputStreamId(String outputStreamId) {
+ this.outputStreamId = outputStreamId;
+ }
}
\ No newline at end of file
[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/bdb557dd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bdb557dd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bdb557dd
Branch: refs/heads/1.x-branch
Commit: bdb557dd1c40d4a90d036ff5063df2c51ec90863
Parents: 2f69242
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Fri Feb 17 16:08:22 2017 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Fri Feb 17 16:08:22 2017 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bdb557dd/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3674a5c..aaffcef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 1.1.0
+ * STORM-2365: Support for specifying output stream in event hubs spout
* STORM-2250: Kafka spout refactoring to increase modularity and testability
* STORM-2340: fix AutoCommitMode issue in KafkaSpout
* STORM-2344: Flux YAML File Viewer for Nimbus UI