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/20 00:14:33 UTC
[1/4] git commit: FALCON-360 Lineage recording fails with NPE for
processes with >1 inputs. Contributed by Venkatesh Seetharam
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 <ve...@hortonworks.com>
Authored: Tue Mar 18 11:47:34 2014 -0700
Committer: Venkatesh Seetharam <ve...@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 =
[2/4] git commit: FALCON-363 Jetty is started with war when the war
is already expanded. Contributed by Venkatesh Seetharam
Posted by ve...@apache.org.
FALCON-363 Jetty is started with war when the war is already expanded. 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/6504e7a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/6504e7a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/6504e7a1
Branch: refs/heads/master
Commit: 6504e7a11dc029baaa414087ed6c4d2128b6b5f2
Parents: f769933
Author: Venkatesh Seetharam <ve...@hortonworks.com>
Authored: Tue Mar 18 11:49:12 2014 -0700
Committer: Venkatesh Seetharam <ve...@hortonworks.com>
Committed: Tue Mar 18 11:49:12 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/bin/service-start.sh | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6504e7a1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 68d900a..6aedbf0 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -257,6 +257,9 @@ Release Version: 0.4-incubating
FALCON-198 Update LICENSE.txt to contain license information for all third-party libraries
+ FALCON-363 Jetty is started with war when the war is already expanded
+ (Venkatesh Seetharam)
+
BUG FIXES
FALCON-223: hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring protobuf-2.5
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6504e7a1/src/bin/service-start.sh
----------------------------------------------------------------------
diff --git a/src/bin/service-start.sh b/src/bin/service-start.sh
index 6d06ede..4a030de 100755
--- a/src/bin/service-start.sh
+++ b/src/bin/service-start.sh
@@ -52,7 +52,7 @@ while [[ ${1} =~ ^\-D ]]; do
done
TIME=`date +%Y%m%d%H%M%s`
-nohup ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.Main -app ${BASEDIR}/server/webapp/${APP_TYPE}.war $* > "${FALCON_LOG_DIR}/$APP_TYPE.out.$TIME" 2>&1 < /dev/null &
+nohup ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.Main -app ${BASEDIR}/server/webapp/${APP_TYPE} $* > "${FALCON_LOG_DIR}/$APP_TYPE.out.$TIME" 2>&1 < /dev/null &
echo $! > $FALCON_PID_FILE
popd > /dev/null
[4/4] git commit: FALCON-359 Instance id's captured are of different
formats in process and feed. Contributed by Venkatesh Seetharam
Posted by ve...@apache.org.
FALCON-359 Instance id's captured are of different formats in process and feed. 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/652e4a15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/652e4a15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/652e4a15
Branch: refs/heads/master
Commit: 652e4a15702cb273485b2c480cc758ce9967f089
Parents: abc97fb
Author: Venkatesh Seetharam <ve...@hortonworks.com>
Authored: Wed Mar 19 11:07:17 2014 -0700
Committer: Venkatesh Seetharam <ve...@hortonworks.com>
Committed: Wed Mar 19 11:07:17 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../org/apache/falcon/entity/v0/SchemaHelper.java | 15 ++++++++++++++-
.../metadata/InstanceRelationshipGraphBuilder.java | 13 ++++++++++---
.../falcon/metadata/MetadataMappingServiceTest.java | 12 +++++++-----
4 files changed, 34 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/652e4a15/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c75f04c..adf5c7b 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -262,6 +262,9 @@ Release Version: 0.4-incubating
FALCON-358 REST API does not conform to Rexster (Venkatesh Seetharam)
+ FALCON-359 Instance id's captured are of different formats in process and feed
+ (Venkatesh Seetharam)
+
BUG FIXES
FALCON-223: hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring protobuf-2.5
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/652e4a15/client/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java b/client/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
index c6de668..9061a9e 100644
--- a/client/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
+++ b/client/src/main/java/org/apache/falcon/entity/v0/SchemaHelper.java
@@ -29,6 +29,8 @@ import java.util.TimeZone;
*/
public final class SchemaHelper {
+ public static final String ISO8601_FORMAT = "yyyy-MM-dd'T'HH:mm'Z'";
+
private SchemaHelper() {}
public static String getTimeZoneId(TimeZone tz) {
@@ -36,7 +38,7 @@ public final class SchemaHelper {
}
private static DateFormat getDateFormat() {
- DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
+ DateFormat dateFormat = new SimpleDateFormat(ISO8601_FORMAT);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
return dateFormat;
}
@@ -55,4 +57,15 @@ public final class SchemaHelper {
throw new RuntimeException(e);
}
}
+
+ public static String formatDateUTCToISO8601(final String dateString, final String dateStringFormat) {
+
+ try {
+ DateFormat dateFormat = new SimpleDateFormat(dateStringFormat.substring(0, dateString.length()));
+ dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ return SchemaHelper.formatDateUTC(dateFormat.parse(dateString));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/652e4a15/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 b02ba9a..7efa74a 100644
--- a/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
+++ b/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java
@@ -27,6 +27,7 @@ import org.apache.falcon.entity.Storage;
import org.apache.falcon.entity.common.FeedDataPath;
import org.apache.falcon.entity.store.ConfigurationStore;
import org.apache.falcon.entity.v0.EntityType;
+import org.apache.falcon.entity.v0.SchemaHelper;
import org.apache.falcon.entity.v0.cluster.Cluster;
import org.apache.falcon.entity.v0.feed.Feed;
import org.apache.falcon.entity.v0.feed.LocationType;
@@ -43,6 +44,9 @@ public class InstanceRelationshipGraphBuilder extends RelationshipGraphBuilder {
private static final Logger LOG = Logger.getLogger(InstanceRelationshipGraphBuilder.class);
+ private static final String PROCESS_INSTANCE_FORMAT = "yyyy-MM-dd-HH-mm"; // nominal time
+ private static final String FEED_INSTANCE_FORMAT = "yyyyMMddHHmm"; // computed
+
// instance vertex types
public static final String FEED_INSTANCE_TYPE = "feed-instance";
public static final String PROCESS_INSTANCE_TYPE = "process-instance";
@@ -99,8 +103,10 @@ public class InstanceRelationshipGraphBuilder extends RelationshipGraphBuilder {
lineageMetadata.get(LineageArgs.USER_WORKFLOW_VERSION.getOptionName()));
}
- public String getProcessInstanceName(String entityName, String nominalTime) {
- return entityName + "/" + nominalTime;
+ public String getProcessInstanceName(String entityName,
+ String nominalTime) {
+ return entityName + "/"
+ + SchemaHelper.formatDateUTCToISO8601(nominalTime, PROCESS_INSTANCE_FORMAT);
}
public void addInstanceToEntity(Vertex instanceVertex, String entityName,
@@ -214,6 +220,7 @@ public class InstanceRelationshipGraphBuilder extends RelationshipGraphBuilder {
instance = instance.replaceFirst(element, "");
}
- return feed.getName() + "/" + instance;
+ return feed.getName() + "/"
+ + SchemaHelper.formatDateUTCToISO8601(instance, FEED_INSTANCE_FORMAT);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/652e4a15/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 f573392..dab308d 100644
--- a/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
+++ b/common/src/test/java/org/apache/falcon/metadata/MetadataMappingServiceTest.java
@@ -652,13 +652,13 @@ public class MetadataMappingServiceTest {
private void verifyLineageGraph(String feedType) {
// feeds owned by a user
List<String> feedNamesOwnedByUser = getFeedsOwnedByAUser(feedType);
- List<String> expected = Arrays.asList("impression-feed/20140101", "clicks-feed/20140101",
- "imp-click-join1/20140101", "imp-click-join2/20140101");
+ List<String> expected = Arrays.asList("impression-feed/2014-01-01T00:00Z", "clicks-feed/2014-01-01T00:00Z",
+ "imp-click-join1/2014-01-01T00:00Z", "imp-click-join2/2014-01-01T00:00Z");
Assert.assertTrue(feedNamesOwnedByUser.containsAll(expected));
Graph graph = service.getGraph();
- Iterator<Vertex> vertices = graph.getVertices("name", "impression-feed/20140101").iterator();
+ Iterator<Vertex> vertices = graph.getVertices("name", "impression-feed/2014-01-01T00:00Z").iterator();
Assert.assertTrue(vertices.hasNext());
Vertex feedInstanceVertex = vertices.next();
Assert.assertEquals(
@@ -671,11 +671,13 @@ public class MetadataMappingServiceTest {
// feeds classified as secure
verifyFeedsClassifiedAsSecure(feedType,
- Arrays.asList("impression-feed/20140101", "clicks-feed/20140101", "imp-click-join2/20140101"));
+ Arrays.asList("impression-feed/2014-01-01T00:00Z",
+ "clicks-feed/2014-01-01T00:00Z", "imp-click-join2/2014-01-01T00:00Z"));
// feeds owned by a user and classified as secure
verifyFeedsOwnedByUserAndClassification(feedType, "Financial",
- Arrays.asList("clicks-feed/20140101", "imp-click-join1/20140101", "imp-click-join2/20140101"));
+ Arrays.asList("clicks-feed/2014-01-01T00:00Z",
+ "imp-click-join1/2014-01-01T00:00Z", "imp-click-join2/2014-01-01T00:00Z"));
}
private static String[] getTestMessageArgs() {
[3/4] git commit: FALCON-358 REST API does not conform to Rexster.
Contributed by Venkatesh Seetharam
Posted by ve...@apache.org.
FALCON-358 REST API does not conform to Rexster. 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/abc97fbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/abc97fbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/abc97fbd
Branch: refs/heads/master
Commit: abc97fbd47e44792698b261fe5e987a81735a19f
Parents: 6504e7a
Author: Venkatesh Seetharam <ve...@hortonworks.com>
Authored: Wed Mar 19 11:06:05 2014 -0700
Committer: Venkatesh Seetharam <ve...@hortonworks.com>
Committed: Wed Mar 19 11:06:05 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../java/org/apache/falcon/cli/FalconCLI.java | 18 +++++++++---------
.../org/apache/falcon/client/FalconClient.java | 4 ++--
.../metadata/LineageMetadataResource.java | 14 ++++++++------
.../org/apache/falcon/cli/FalconCLISmokeIT.java | 2 +-
5 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/abc97fbd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6aedbf0..c75f04c 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -260,6 +260,8 @@ Release Version: 0.4-incubating
FALCON-363 Jetty is started with war when the war is already expanded
(Venkatesh Seetharam)
+ FALCON-358 REST API does not conform to Rexster (Venkatesh Seetharam)
+
BUG FIXES
FALCON-223: hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring protobuf-2.5
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/abc97fbd/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 c8ce780..d467662 100644
--- a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
+++ b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
@@ -98,7 +98,7 @@ public class FalconCLI {
// Graph Command Options
public static final String EDGE_CMD = "edge";
public static final String ID_OPT = "id";
- public static final String NAME_OPT = "name";
+ 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";
@@ -609,8 +609,8 @@ public class FalconCLI {
Option id = new Option(ID_OPT, true, "vertex or edge id");
graphOptions.addOption(id);
- Option name = new Option(NAME_OPT, true, "name property");
- graphOptions.addOption(name);
+ Option key = new Option(KEY_OPT, true, "key property");
+ graphOptions.addOption(key);
Option value = new Option(VALUE_OPT, true, "value property");
graphOptions.addOption(value);
@@ -633,7 +633,7 @@ public class FalconCLI {
String result;
String id = commandLine.getOptionValue(ID_OPT);
- String name = commandLine.getOptionValue(NAME_OPT);
+ String key = commandLine.getOptionValue(KEY_OPT);
String value = commandLine.getOptionValue(VALUE_OPT);
String direction = commandLine.getOptionValue(DIRECTION_OPT);
@@ -644,8 +644,8 @@ public class FalconCLI {
if (optionsList.contains(DUMP_OPT)) {
result = client.getVertices();
} else {
- validateVerticesCommand(name, value);
- result = client.getVertices(name, value);
+ validateVerticesCommand(key, value);
+ result = client.getVertices(key, value);
}
} else if (optionsList.contains(VERTEX_EDGES_CMD)) {
if (optionsList.contains(DUMP_OPT)) {
@@ -670,9 +670,9 @@ public class FalconCLI {
}
}
- private void validateVerticesCommand(String name, String value) throws FalconCLIException {
- if (name == null || name.length() == 0) {
- throw new FalconCLIException("Missing argument: name");
+ private void validateVerticesCommand(String key, String value) throws FalconCLIException {
+ if (key == null || key.length() == 0) {
+ throw new FalconCLIException("Missing argument: key");
}
if (value == null || value.length() == 0) {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/abc97fbd/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 f008953..1c6f2c5 100644
--- a/client/src/main/java/org/apache/falcon/client/FalconClient.java
+++ b/client/src/main/java/org/apache/falcon/client/FalconClient.java
@@ -786,10 +786,10 @@ public class FalconClient {
return parseStringResult(clientResponse);
}
- private String sendGraphRequest(GraphOperations job, String name,
+ private String sendGraphRequest(GraphOperations job, String key,
String value) throws FalconCLIException {
ClientResponse clientResponse = service.path(job.path)
- .queryParam("name", name)
+ .queryParam("key", key)
.queryParam("value", value)
.header("Cookie", AUTH_COOKIE_EQ + authenticationToken)
.accept(job.mimeType)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/abc97fbd/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java b/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java
index 7c307e3..64a1d77 100644
--- a/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java
+++ b/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java
@@ -47,6 +47,8 @@ import java.util.Set;
/**
* Jersey Resource for lineage metadata operations.
+ * Implements most of the GET operations of Rexster API with out the indexes.
+ * https://github.com/tinkerpop/rexster/wiki/Basic-REST-API
*/
@Path("graphs/lineage")
public class LineageMetadataResource {
@@ -154,20 +156,20 @@ public class LineageMetadataResource {
}
/**
- * Get a list of vertices matching a property name and a value.
+ * Get a list of vertices matching a property key and a value.
* <p/>
- * GET http://host/graphs/lineage/vertices?name=<name>&value=<value>
- * graph.getVertices(name, value);
+ * GET http://host/graphs/lineage/vertices?key=<key>&value=<value>
+ * graph.getVertices(key, value);
*/
@GET
@Path("/vertices")
@Produces({MediaType.APPLICATION_JSON})
- public Response getVertices(@QueryParam("name") final String name,
+ public Response getVertices(@QueryParam("key") final String key,
@QueryParam("value") final String value) {
checkIfMetadataMappingServiceIsEnabled();
- LOG.info("Get vertices for property name= " + name + ", value= " + value);
+ LOG.info("Get vertices for property key= " + key + ", value= " + value);
try {
- JSONObject response = buildJSONResponse(getGraph().getVertices(name, value));
+ JSONObject response = buildJSONResponse(getGraph().getVertices(key, value));
return Response.ok(response).build();
} catch (JSONException e) {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/abc97fbd/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 671ff4f..41b270e 100644
--- a/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
+++ b/webapp/src/test/java/org/apache/falcon/cli/FalconCLISmokeIT.java
@@ -60,7 +60,7 @@ public class FalconCLISmokeIT {
// verify
Assert.assertEquals(0, executeWithURL("graph -vertices -all"));
Assert.assertEquals(0, executeWithURL("graph -edges -all"));
- Assert.assertEquals(0, executeWithURL("graph -vertices -name name -value " + context.getClusterName()));
+ Assert.assertEquals(0, executeWithURL("graph -vertices -key name -value " + context.getClusterName()));
filePath = TestContext.overlayParametersOverTemplate(TestContext.FEED_TEMPLATE1, overlay);
Assert.assertEquals(0,