Repository: falcon Updated Branches: refs/heads/0.6.1 40ee0892c -> 64431a98b
FALCON-1141 Reverse Lookup for feed in prism fails with BadRequest. Contributed by Ajay Yadava Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/64431a98 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/64431a98 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/64431a98 Branch: refs/heads/0.6.1 Commit: 64431a98b13695276848a6b4e0fe2d4d1dc11f72 Parents: 40ee089 Author: Suhas Vasu <[email protected]> Authored: Thu Apr 9 15:29:13 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Thu Apr 9 15:29:13 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../java/org/apache/falcon/resource/AbstractEntityManager.java | 2 +- .../java/org/apache/falcon/resource/SchedulableEntityManager.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/64431a98/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index eee5fb6..ecd6190 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -140,6 +140,9 @@ Branch: 0.6.1 (Proposed Release Version: 0.6.1) FALCON-1141 Reverse Lookup for feed in prism fails with BadRequest (Ajay Yadava via Suhas Vasu) + FALCON-1143 Correcting order of entities on reload + (Ajay Yadava via Suhas Vasu) + FALCON-1144 Dynamic partitions not getting registered in Hcat (Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/64431a98/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java index c56ecbb..1e2fc82 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java @@ -952,7 +952,7 @@ public abstract class AbstractEntityManager { * @param instancePath location of the data * @return Feed Name, type of the data and cluster name. */ - public APIResult reverseLookup(String type, String instancePath) { + public FeedLookupResult reverseLookup(String type, String instancePath) { try { EntityType entityType = EntityType.getEnum(type); if (entityType != EntityType.FEED) { http://git-wip-us.apache.org/repos/asf/falcon/blob/64431a98/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java b/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java index 261a9a9..4740c71 100644 --- a/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java +++ b/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java @@ -166,7 +166,7 @@ public class SchedulableEntityManager extends AbstractSchedulableEntityManager { @Path("lookup/{type}/") @Produces(MediaType.APPLICATION_JSON) @Monitored(event = "reverse-lookup") - public APIResult reverseLookup( + public FeedLookupResult reverseLookup( @Dimension("type") @PathParam("type") String type, @Dimension("path") @QueryParam("path") String instancePath) { return super.reverseLookup(type, instancePath);
