falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [3/3] git commit: FALCON-370 Remove Graph dump option in CLI. Contributed by Venkatesh Seetharam
Date Fri, 21 Mar 2014 22:24:05 GMT
FALCON-370 Remove Graph dump option in CLI. 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/ab327ea9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/ab327ea9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/ab327ea9

Branch: refs/heads/master
Commit: ab327ea9e93508e0366a03c1f5bac08aaa6db7e0
Parents: 4e8065c
Author: Venkatesh Seetharam <venkatesh@hortonworks.com>
Authored: Fri Mar 21 15:22:56 2014 -0700
Committer: Venkatesh Seetharam <venkatesh@hortonworks.com>
Committed: Fri Mar 21 15:22:56 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../java/org/apache/falcon/cli/FalconCLI.java   | 20 ++++----------------
 .../org/apache/falcon/client/FalconClient.java  |  8 --------
 .../org/apache/falcon/cli/FalconCLISmokeIT.java |  2 --
 4 files changed, 6 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ab327ea9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 622d767..49a07ec 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -80,6 +80,8 @@ Trunk (Unreleased)
 
     FALCON-366 Add a REST API to get properties for a given vertex (Venkatesh Seetharam)
 
+    FALCON-370 Remove Graph dump option in CLI (Venkatesh Seetharam)
+
   OPTIMIZATIONS
     FALCON-123 Improve build speeds in falcon. (Srikanth Sundarrajan via Shwetha GS)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ab327ea9/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
index d467662..09550a8 100644
--- a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
+++ b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
@@ -101,7 +101,6 @@ public class FalconCLI {
     public static final String KEY_OPT = "key";
     public static final String VALUE_OPT = "value";
     public static final String DIRECTION_OPT = "direction";
-    public static final String DUMP_OPT = "all";
 
     /**
      * Entry point for the Falcon CLI when invoked from the command line. Upon
@@ -618,9 +617,6 @@ public class FalconCLI {
         Option direction = new Option(DIRECTION_OPT, true, "edge direction property");
         graphOptions.addOption(direction);
 
-        Option dump = new Option(DUMP_OPT, false, "dump all elements");
-        graphOptions.addOption(dump);
-
         return graphOptions;
     }
 
@@ -641,19 +637,11 @@ public class FalconCLI {
             validateId(id);
             result = client.getVertex(id);
         } else if (optionsList.contains(VERTICES_CMD)) {
-            if (optionsList.contains(DUMP_OPT)) {
-                result = client.getVertices();
-            } else {
-                validateVerticesCommand(key, value);
-                result = client.getVertices(key, value);
-            }
+            validateVerticesCommand(key, value);
+            result = client.getVertices(key, value);
         } else if (optionsList.contains(VERTEX_EDGES_CMD)) {
-            if (optionsList.contains(DUMP_OPT)) {
-                result = client.getEdges();
-            } else {
-                validateVertexEdgesCommand(id, direction);
-                result = client.getVertexEdges(id, direction);
-            }
+            validateVertexEdgesCommand(id, direction);
+            result = client.getVertexEdges(id, direction);
         } else if (optionsList.contains(EDGE_CMD)) {
             validateId(id);
             result = client.getEdge(id);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ab327ea9/client/src/main/java/org/apache/falcon/client/FalconClient.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/client/FalconClient.java b/client/src/main/java/org/apache/falcon/client/FalconClient.java
index 1c6f2c5..ff51fd3 100644
--- a/client/src/main/java/org/apache/falcon/client/FalconClient.java
+++ b/client/src/main/java/org/apache/falcon/client/FalconClient.java
@@ -768,14 +768,6 @@ public class FalconClient {
         return sendGraphRequest(GraphOperations.EDGES, id);
     }
 
-    public String getVertices() throws FalconCLIException {
-        return sendGraphRequest(GraphOperations.VERTICES, "all");
-    }
-
-    public String getEdges() throws FalconCLIException {
-        return sendGraphRequest(GraphOperations.EDGES, "all");
-    }
-
     private String sendGraphRequest(GraphOperations job, String id) throws FalconCLIException
{
         ClientResponse clientResponse = service.path(job.path)
                 .path(id)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ab327ea9/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java b/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
index 41b270e..dd9c34a 100644
--- a/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
+++ b/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
@@ -58,8 +58,6 @@ public class FalconCLISmokeIT {
         // this is necessary for lineage
         Assert.assertEquals(0, executeWithURL("entity -submit -type cluster -file " + filePath));
         // verify
-        Assert.assertEquals(0, executeWithURL("graph -vertices -all"));
-        Assert.assertEquals(0, executeWithURL("graph -edges -all"));
         Assert.assertEquals(0, executeWithURL("graph -vertices -key name -value " + context.getClusterName()));
 
         filePath = TestContext.overlayParametersOverTemplate(TestContext.FEED_TEMPLATE1,
overlay);


Mime
View raw message