You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by yh...@apache.org on 2016/05/11 09:17:03 UTC
incubator-atlas git commit: ATLAS-689 Migrate Atlas-Storm integration
to use Storm 1.0 dependencies. (svimal2106 via yhemanth)
Repository: incubator-atlas
Updated Branches:
refs/heads/master 4f9cba4b0 -> 5e724675b
ATLAS-689 Migrate Atlas-Storm integration to use Storm 1.0 dependencies. (svimal2106 via yhemanth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/5e724675
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/5e724675
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/5e724675
Branch: refs/heads/master
Commit: 5e724675bf0560a77b6b84bc19cb3015445ee297
Parents: 4f9cba4
Author: Hemanth Yamijala <hy...@hortonworks.com>
Authored: Wed May 11 14:46:43 2016 +0530
Committer: Hemanth Yamijala <hy...@hortonworks.com>
Committed: Wed May 11 14:46:43 2016 +0530
----------------------------------------------------------------------
addons/storm-bridge/pom.xml | 2 +-
.../apache/atlas/storm/hook/StormAtlasHook.java | 12 ++++++------
.../atlas/storm/hook/StormTopologyUtil.java | 8 ++++----
.../atlas/storm/hook/StormAtlasHookIT.java | 4 ++--
.../apache/atlas/storm/hook/StormTestUtil.java | 19 ++++++++++---------
release-log.txt | 1 +
6 files changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5e724675/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index 45ec846..b1a7a9b 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -30,7 +30,7 @@
<packaging>jar</packaging>
<properties>
- <storm.version>0.10.0.2.3.99.0-195</storm.version>
+ <storm.version>1.0.0</storm.version>
<hive.version>1.2.1</hive.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5e724675/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java b/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
index 70a72ef..267e228 100644
--- a/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
+++ b/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java
@@ -18,12 +18,12 @@
package org.apache.atlas.storm.hook;
-import backtype.storm.ISubmitterHook;
-import backtype.storm.generated.Bolt;
-import backtype.storm.generated.SpoutSpec;
-import backtype.storm.generated.StormTopology;
-import backtype.storm.generated.TopologyInfo;
-import backtype.storm.utils.Utils;
+import org.apache.storm.ISubmitterHook;
+import org.apache.storm.generated.Bolt;
+import org.apache.storm.generated.SpoutSpec;
+import org.apache.storm.generated.StormTopology;
+import org.apache.storm.generated.TopologyInfo;
+import org.apache.storm.utils.Utils;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.AtlasConstants;
import org.apache.atlas.fs.model.FSDataTypes;
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5e724675/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormTopologyUtil.java
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormTopologyUtil.java b/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormTopologyUtil.java
index b352a49..ce6a175 100644
--- a/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormTopologyUtil.java
+++ b/addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormTopologyUtil.java
@@ -18,10 +18,10 @@
package org.apache.atlas.storm.hook;
-import backtype.storm.generated.Bolt;
-import backtype.storm.generated.GlobalStreamId;
-import backtype.storm.generated.Grouping;
-import backtype.storm.generated.StormTopology;
+import org.apache.storm.generated.Bolt;
+import org.apache.storm.generated.GlobalStreamId;
+import org.apache.storm.generated.Grouping;
+import org.apache.storm.generated.StormTopology;
import com.google.common.base.Joiner;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5e724675/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
index 4648d24..b33bb5f 100644
--- a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
+++ b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java
@@ -18,8 +18,6 @@
package org.apache.atlas.storm.hook;
-import backtype.storm.ILocalCluster;
-import backtype.storm.generated.StormTopology;
import com.sun.jersey.api.client.ClientResponse;
import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasClient;
@@ -33,6 +31,8 @@ import org.apache.atlas.typesystem.Referenceable;
import org.apache.atlas.typesystem.TypesDef;
import org.apache.atlas.typesystem.json.TypesSerialization;
import org.apache.commons.configuration.Configuration;
+import org.apache.storm.ILocalCluster;
+import org.apache.storm.generated.StormTopology;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONObject;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5e724675/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormTestUtil.java
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormTestUtil.java b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormTestUtil.java
index 1e13f56..d869f18 100644
--- a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormTestUtil.java
+++ b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormTestUtil.java
@@ -18,15 +18,15 @@
package org.apache.atlas.storm.hook;
-import backtype.storm.Config;
-import backtype.storm.ILocalCluster;
-import backtype.storm.Testing;
-import backtype.storm.generated.StormTopology;
-import backtype.storm.testing.TestGlobalCount;
-import backtype.storm.testing.TestWordCounter;
-import backtype.storm.testing.TestWordSpout;
-import backtype.storm.topology.TopologyBuilder;
-import backtype.storm.utils.Utils;
+import org.apache.storm.Config;
+import org.apache.storm.ILocalCluster;
+import org.apache.storm.Testing;
+import org.apache.storm.generated.StormTopology;
+import org.apache.storm.testing.TestGlobalCount;
+import org.apache.storm.testing.TestWordCounter;
+import org.apache.storm.testing.TestWordSpout;
+import org.apache.storm.topology.TopologyBuilder;
+import org.apache.storm.utils.Utils;
import java.util.HashMap;
@@ -58,6 +58,7 @@ final class StormTestUtil {
StormTopology stormTopology) throws Exception {
Config stormConf = new Config();
stormConf.putAll(Utils.readDefaultConfig());
+ stormConf.put("storm.cluster.mode", "local");
stormConf.setDebug(true);
stormConf.setMaxTaskParallelism(3);
stormConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN,
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/5e724675/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 1dcabed..6c04359 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -20,6 +20,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES:
+ATLAS-689 Migrate Atlas-Storm integration to use Storm 1.0 dependencies. (svimal2106 via yhemanth)
ATLAS-754 InstanceSerialization does not serialize Reference in the values array of Reference.(harishjp via sumasai)
ATLAS-626 Hive temporary table metadata is captured in atlas (sumasai)
ATLAS-747 Hive CTAS entity registration fails because userName is null (shwethags)