You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/06/09 11:55:40 UTC
[1/3] storm git commit: STORM-3097: deprecate storm-druid
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch d52854081 -> 2dc3d53a1
STORM-3097: deprecate storm-druid
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/da2f9891
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/da2f9891
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/da2f9891
Branch: refs/heads/1.1.x-branch
Commit: da2f9891c8bf246ae207fa904c5ab7676a941cff
Parents: d528540
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jun 6 15:22:54 2018 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Jun 9 20:52:18 2018 +0900
----------------------------------------------------------------------
external/storm-druid/README.md | 5 ++++-
.../main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java | 4 +++-
.../java/org/apache/storm/druid/bolt/DruidBeamFactory.java | 6 ++++++
.../src/main/java/org/apache/storm/druid/bolt/DruidConfig.java | 6 ++++++
.../org/apache/storm/druid/bolt/ITupleDruidEventMapper.java | 4 +++-
.../org/apache/storm/druid/bolt/TupleDruidEventMapper.java | 5 ++++-
.../java/org/apache/storm/druid/trident/DruidBeamState.java | 3 +++
.../org/apache/storm/druid/trident/DruidBeamStateFactory.java | 6 ++++++
.../org/apache/storm/druid/trident/DruidBeamStateUpdater.java | 6 ++++++
9 files changed, 41 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/README.md
----------------------------------------------------------------------
diff --git a/external/storm-druid/README.md b/external/storm-druid/README.md
index de7f44c..677707c 100644
--- a/external/storm-druid/README.md
+++ b/external/storm-druid/README.md
@@ -1,4 +1,4 @@
-# Storm Druid Bolt and TridentState
+# (DEPRECATED) Storm Druid Bolt and TridentState
This module provides core Storm and Trident bolt implementations for writing data to [Druid](http://druid.io/) data store.
This implementation uses Druid's [Tranquility library](https://github.com/druid-io/tranquility) to send messages to druid.
@@ -6,6 +6,9 @@ This implementation uses Druid's [Tranquility library](https://github.com/druid-
Some of the implementation details are borrowed from existing [Tranquility Storm Bolt](https://github.com/druid-io/tranquility/blob/master/docs/storm.md).
This new Bolt added to support latest storm release and maintain the bolt in the storm repo.
+## Deprecated
+The preferred way to ingest streaming events to Apache Druid is through Apache Kafka, as such storm-druid is deprecated and will be removed in 2.x releases.
+
### Core Bolt
Below example describes the usage of core bolt which is `org.apache.storm.druid.bolt.DruidBeamBolt`
By default this Bolt expects to receive tuples in which "event" field gives your event type.
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
index 86b724f..bef53f1 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java
@@ -47,8 +47,10 @@ import java.util.Map;
* By default this Bolt expects to receive tuples in which "event" field gives your event type.
* This logic can be changed by implementing ITupleDruidEventMapper interface.
* <p/>
- *
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
*/
+@Deprecated
public class DruidBeamBolt<E> extends BaseTickTupleAwareRichBolt {
private static final Logger LOG = LoggerFactory.getLogger(DruidBeamBolt.class);
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamFactory.java b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamFactory.java
index 7d1866f..d30c545 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamFactory.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidBeamFactory.java
@@ -24,6 +24,12 @@ import org.apache.storm.task.IMetricsContext;
import java.io.Serializable;
import java.util.Map;
+/**
+ * Factory to create Druid Beams.
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
+ */
+@Deprecated
public interface DruidBeamFactory<E> extends Serializable {
public Beam<E> makeBeam(Map<?,?> conf, IMetricsContext metrics);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidConfig.java b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidConfig.java
index 081d9ff..fe2cd1a 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidConfig.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/DruidConfig.java
@@ -22,6 +22,12 @@ import com.metamx.tranquility.tranquilizer.Tranquilizer;
import java.io.Serializable;
+/**
+ * Configuration for druid bolt.
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
+ */
+@Deprecated
public class DruidConfig implements Serializable {
public static final String DEFAULT_DISCARD_STREAM_ID = "druid-discard-stream";
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/ITupleDruidEventMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/ITupleDruidEventMapper.java b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/ITupleDruidEventMapper.java
index 0ae0233..75d8975 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/ITupleDruidEventMapper.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/ITupleDruidEventMapper.java
@@ -24,8 +24,10 @@ import java.io.Serializable;
/**
* This class gives a mapping of a {@link ITuple} to Druid Event
- *
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
*/
+@Deprecated
public interface ITupleDruidEventMapper<E> extends Serializable {
/**
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/TupleDruidEventMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/TupleDruidEventMapper.java b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/TupleDruidEventMapper.java
index 67b7cc0..38d0899 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/TupleDruidEventMapper.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/bolt/TupleDruidEventMapper.java
@@ -23,8 +23,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Converts {@link ITuple} to Event
+ * Converts {@link ITuple} to Event.
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
*/
+@Deprecated
public final class TupleDruidEventMapper<E> implements ITupleDruidEventMapper<E> {
public static final String DEFAULT_FIELD_NAME = "event";
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamState.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamState.java b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamState.java
index e59fea9..98ea8d4 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamState.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamState.java
@@ -36,7 +36,10 @@ import java.util.List;
/**
* Trident {@link State} implementation for Druid.
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
*/
+@Deprecated
public class DruidBeamState<E> implements State {
private static final Logger LOG = LoggerFactory.getLogger(DruidBeamState.class);
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
index b745cdd..21465c9 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateFactory.java
@@ -26,6 +26,12 @@ import org.apache.storm.trident.state.StateFactory;
import java.util.Map;
+/**
+ * Factory to create DruidBeamStates.
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
+ */
+@Deprecated
public class DruidBeamStateFactory<E> implements StateFactory {
DruidBeamFactory beamFactory = null;
ITupleDruidEventMapper druidEventMapper = null;
http://git-wip-us.apache.org/repos/asf/storm/blob/da2f9891/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateUpdater.java
----------------------------------------------------------------------
diff --git a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateUpdater.java b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateUpdater.java
index d8e2b78..1b19b22 100644
--- a/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateUpdater.java
+++ b/external/storm-druid/src/main/java/org/apache/storm/druid/trident/DruidBeamStateUpdater.java
@@ -28,6 +28,12 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
+/**
+ * Updates Druid Beam State.
+ * @deprecated the preferred way to ingest streaming events to druid is through Kafka, as such storm-druid
+ * is deprecated and will be removed in 2.x releases of storm.
+ */
+@Deprecated
public class DruidBeamStateUpdater<E> extends BaseStateUpdater<DruidBeamState<E>> {
private static final Logger LOG = LoggerFactory.getLogger(DruidBeamStateUpdater.class);
[3/3] storm git commit: Merge branch 'STORM-3097-1.1.x' into
1.1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-3097-1.1.x' into 1.1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2dc3d53a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2dc3d53a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2dc3d53a
Branch: refs/heads/1.1.x-branch
Commit: 2dc3d53a11aa3fea621666690d1e44fa8b621466
Parents: d528540 33f0860
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Jun 9 20:55:33 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Jun 9 20:55:33 2018 +0900
----------------------------------------------------------------------
docs/storm-druid.md | 5 ++++-
external/storm-druid/README.md | 5 ++++-
.../main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java | 4 +++-
.../java/org/apache/storm/druid/bolt/DruidBeamFactory.java | 6 ++++++
.../src/main/java/org/apache/storm/druid/bolt/DruidConfig.java | 6 ++++++
.../org/apache/storm/druid/bolt/ITupleDruidEventMapper.java | 4 +++-
.../org/apache/storm/druid/bolt/TupleDruidEventMapper.java | 5 ++++-
.../java/org/apache/storm/druid/trident/DruidBeamState.java | 3 +++
.../org/apache/storm/druid/trident/DruidBeamStateFactory.java | 6 ++++++
.../org/apache/storm/druid/trident/DruidBeamStateUpdater.java | 6 ++++++
10 files changed, 45 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] storm git commit: STORM-3097: addressed review comments
Posted by ka...@apache.org.
STORM-3097: addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/33f0860e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/33f0860e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/33f0860e
Branch: refs/heads/1.1.x-branch
Commit: 33f0860ec1a04ce30219c83ba696b5e8d2d19335
Parents: da2f989
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 7 11:01:20 2018 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Jun 9 20:52:22 2018 +0900
----------------------------------------------------------------------
docs/storm-druid.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/33f0860e/docs/storm-druid.md
----------------------------------------------------------------------
diff --git a/docs/storm-druid.md b/docs/storm-druid.md
index bed50dc..a9679da 100644
--- a/docs/storm-druid.md
+++ b/docs/storm-druid.md
@@ -1,4 +1,4 @@
-# Storm Druid Bolt and TridentState
+# (DEPRECATED) Storm Druid Bolt and TridentState
This module provides core Storm and Trident bolt implementations for writing data to [Druid](http://druid.io/) data store.
This implementation uses Druid's [Tranquility library](https://github.com/druid-io/tranquility) to send messages to druid.
@@ -6,6 +6,9 @@ This implementation uses Druid's [Tranquility library](https://github.com/druid-
Some of the implementation details are borrowed from existing [Tranquility Storm Bolt](https://github.com/druid-io/tranquility/blob/master/docs/storm.md).
This new Bolt added to support latest storm release and maintain the bolt in the storm repo.
+## Deprecated
+The preferred way to ingest streaming events to Apache Druid is through Apache Kafka, as such storm-druid is deprecated and will be removed in 2.x releases.
+
### Core Bolt
Below example describes the usage of core bolt which is `org.apache.storm.druid.bolt.DruidBeamBolt`
By default this Bolt expects to receive tuples in which "event" field gives your event type.