falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject git commit: FALCON-832 more edge labels and node type for lineage. Contributed by Raghav Kumar Gautam
Date Thu, 23 Oct 2014 13:45:46 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master e4eacd221 -> 8013cbb2c


FALCON-832 more edge labels and node type for lineage. Contributed by Raghav Kumar Gautam


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

Branch: refs/heads/master
Commit: 8013cbb2cd334be87847650c72f4cb599ba5757d
Parents: e4eacd2
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Thu Oct 23 16:44:46 2014 +0300
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Thu Oct 23 16:44:46 2014 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                               | 3 +++
 .../falcon/regression/core/response/lineage/Edge.java       | 9 +++++++++
 .../falcon/regression/core/response/lineage/Vertex.java     | 3 ++-
 .../org/apache/falcon/regression/core/util/GraphAssert.java | 4 ++--
 4 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/8013cbb2/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 7b48b74..a080aaa 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -112,6 +112,9 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-832 more edge labels and node type for lineage (Raghav Kumar Gautam via Ruslan
+   Ostafiychuk)
+
    FALCON-797 ProcessInstanceStatusTest#testProcessInstanceStatusEndOutOfRange fixed (Paul
    Isaychuk via Ruslan Ostafiychuk)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/8013cbb2/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
index 4b5616c..5520cfa 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
@@ -35,6 +35,15 @@ public class Edge extends GraphEntity {
         @SerializedName("collocated")CLUSTER_COLO,
         @SerializedName("owned-by")OWNED_BY,
         @SerializedName("grouped-as")GROUPS,
+
+        @SerializedName("pipeline")PIPELINES,
+
+        // replication labels
+        @SerializedName("replicated-to")FEED_CLUSTER_REPLICATED_EDGE,
+
+        // eviction labels
+        @SerializedName("evicted-from")FEED_CLUSTER_EVICTED_EDGE,
+
         //custom labels for test tags
         @SerializedName("test")TEST,
         @SerializedName("testname")TESTNAME,

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/8013cbb2/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
index 1eaf6c6..acd7be8 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
@@ -42,7 +42,8 @@ public class Vertex extends GraphEntity {
         @SerializedName("user")USER("user"),
         @SerializedName("data-center")COLO("data-center"),
         @SerializedName("classification")TAGS("classification"),
-        @SerializedName("group")GROUPS("group");
+        @SerializedName("group")GROUPS("group"),
+        @SerializedName("pipelines")PIPELINES("pipelines");
 
         private final String value;
         VERTEX_TYPE(String value) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/8013cbb2/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
index ed0ea48..9d75591 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
@@ -63,9 +63,9 @@ public final class GraphAssert {
             Assert.assertNotNull(vertex.getName(),
                 "name of the vertex should be non-null: " + vertex);
             Assert.assertNotNull(vertex.getType(),
-                "id of the vertex should be non-null: " + vertex);
+                "type of the vertex should be non-null: " + vertex);
             Assert.assertNotNull(vertex.getTimestamp(),
-                "id of the vertex should be non-null: " + vertex);
+                "timestamp of the vertex should be non-null: " + vertex);
         }
     }
 


Mime
View raw message