falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [1/4] git commit: FALCON-360 Lineage recording fails with NPE for processes with >1 inputs. Contributed by Venkatesh Seetharam
Date Wed, 19 Mar 2014 23:14:33 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master e2545b087 -> 652e4a157


FALCON-360 Lineage recording fails with NPE for processes with >1 inputs. Contributed by
Venkatesh Seetharam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/f769933b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/f769933b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/f769933b

Branch: refs/heads/master
Commit: f769933b63a0bd11a6fb766b324d312e69700add
Parents: e2545b0
Author: Venkatesh Seetharam <venkatesh@hortonworks.com>
Authored: Tue Mar 18 11:47:34 2014 -0700
Committer: Venkatesh Seetharam <venkatesh@hortonworks.com>
Committed: Tue Mar 18 11:47:34 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 3 +++
 .../falcon/metadata/InstanceRelationshipGraphBuilder.java      | 6 ++++--
 .../org/apache/falcon/metadata/MetadataMappingServiceTest.java | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f769933b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f3ddf96..68d900a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -152,6 +152,9 @@ Trunk (Unreleased)
     FALCON-354 Bug when MetadataMappingService is not configured as one of the
     application services. (Venkatesh Seetharam)
 
+    FALCON-360 Lineage recording fails with NPE for processes with >1 inputs.
+    (Venkatesh Seetharam)
+
 Release Version: 0.4-incubating
 
    NEW FEATURES

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f769933b/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
b/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
index 0b121f8..b02ba9a 100644
--- a/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
+++ b/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
@@ -139,9 +139,9 @@ public class InstanceRelationshipGraphBuilder extends RelationshipGraphBuilder
{
         }
 
         String[] inputFeedNames =
-                lineageMetadata.get(LineageArgs.INPUT_FEED_NAMES.getOptionName()).split(",");
+                lineageMetadata.get(LineageArgs.INPUT_FEED_NAMES.getOptionName()).split("#");
         String[] inputFeedInstancePaths =
-                lineageMetadata.get(LineageArgs.INPUT_FEED_PATHS.getOptionName()).split(",");
+                lineageMetadata.get(LineageArgs.INPUT_FEED_PATHS.getOptionName()).split("#");
 
         addFeedInstances(inputFeedNames, inputFeedInstancePaths,
                 processInstance, FEED_PROCESS_EDGE_LABEL, lineageMetadata);
@@ -156,6 +156,8 @@ public class InstanceRelationshipGraphBuilder extends RelationshipGraphBuilder
{
             String feedName = feedNames[index];
             String feedInstancePath = feedInstancePaths[index];
 
+            LOG.info("Computing feed instance for : name=" + feedName + ", path= "
+                    + feedInstancePath + ", in cluster: " + clusterName);
             String feedInstanceName = getFeedInstanceName(feedName, clusterName, feedInstancePath);
             LOG.info("Adding feed instance: " + feedInstanceName);
             Vertex feedInstance = addVertex(feedInstanceName, FEED_INSTANCE_TYPE,

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f769933b/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
b/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
index 3c5f69d..f573392 100644
--- a/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
+++ b/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
@@ -74,9 +74,9 @@ public class MetadataMappingServiceTest {
     public static final String WORKFLOW_NAME = "imp-click-join-workflow";
     public static final String WORKFLOW_VERSION = "1.0.9";
 
-    public static final String INPUT_FEED_NAMES = "impression-feed,clicks-feed";
+    public static final String INPUT_FEED_NAMES = "impression-feed#clicks-feed";
     public static final String INPUT_INSTANCE_PATHS =
-        "jail://global:00/falcon/impression-feed/20140101,jail://global:00/falcon/clicks-feed/20140101";
+        "jail://global:00/falcon/impression-feed/20140101#jail://global:00/falcon/clicks-feed/20140101";
 
     public static final String OUTPUT_FEED_NAMES = "imp-click-join1,imp-click-join2";
     public static final String OUTPUT_INSTANCE_PATHS =


Mime
View raw message