You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2014/03/06 02:29:55 UTC
git commit: FALCON-289 Fixed an inadvertent minor bug in CLI.
Contributed by Venkatesh Seetharam
Repository: incubator-falcon
Updated Branches:
refs/heads/master b8b2fe45d -> 7debf4513
FALCON-289 Fixed an inadvertent minor bug 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/7debf451
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/7debf451
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/7debf451
Branch: refs/heads/master
Commit: 7debf45137dc9f4edc2b4c7e2aef81f0075ddeba
Parents: b8b2fe4
Author: Venkatesh Seetharam <ve...@hortonworks.com>
Authored: Wed Mar 5 17:29:47 2014 -0800
Committer: Venkatesh Seetharam <ve...@hortonworks.com>
Committed: Wed Mar 5 17:29:47 2014 -0800
----------------------------------------------------------------------
client/src/main/java/org/apache/falcon/cli/FalconCLI.java | 9 ++-------
.../test/java/org/apache/falcon/cli/FalconCLISmokeIT.java | 6 ------
2 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/7debf451/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 1663073..c8ce780 100644
--- a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
+++ b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
@@ -636,20 +636,19 @@ public class FalconCLI {
String name = commandLine.getOptionValue(NAME_OPT);
String value = commandLine.getOptionValue(VALUE_OPT);
String direction = commandLine.getOptionValue(DIRECTION_OPT);
- String dump = commandLine.getOptionValue(DUMP_OPT);
if (optionsList.contains(VERTEX_CMD)) {
validateId(id);
result = client.getVertex(id);
} else if (optionsList.contains(VERTICES_CMD)) {
- if (isDump(dump)) {
+ if (optionsList.contains(DUMP_OPT)) {
result = client.getVertices();
} else {
validateVerticesCommand(name, value);
result = client.getVertices(name, value);
}
} else if (optionsList.contains(VERTEX_EDGES_CMD)) {
- if (isDump(dump)) {
+ if (optionsList.contains(DUMP_OPT)) {
result = client.getEdges();
} else {
validateVertexEdgesCommand(id, direction);
@@ -671,10 +670,6 @@ public class FalconCLI {
}
}
- private boolean isDump(String dump) {
- return dump != null;
- }
-
private void validateVerticesCommand(String name, String value) throws FalconCLIException {
if (name == null || name.length() == 0) {
throw new FalconCLIException("Missing argument: name");
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/7debf451/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 f4f72e2..671ff4f 100644
--- a/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
+++ b/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
@@ -18,7 +18,6 @@
package org.apache.falcon.cli;
-import org.apache.falcon.client.FalconClient;
import org.apache.falcon.resource.TestContext;
import org.apache.falcon.util.OozieTestUtils;
import org.apache.falcon.util.StartupProperties;
@@ -63,11 +62,6 @@ public class FalconCLISmokeIT {
Assert.assertEquals(0, executeWithURL("graph -edges -all"));
Assert.assertEquals(0, executeWithURL("graph -vertices -name name -value " + context.getClusterName()));
- // verify lineage
- FalconClient client = new FalconClient(TestContext.BASE_URL);
- String clusterVertex = client.getVertices("name", context.getClusterName());
- Assert.assertTrue(clusterVertex.contains(context.getClusterName()));
-
filePath = TestContext.overlayParametersOverTemplate(TestContext.FEED_TEMPLATE1, overlay);
Assert.assertEquals(0,
executeWithURL("entity -submitAndSchedule -type feed -file " + filePath));