falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [2/2] git commit: Merge commit 'c82b663fcb74fe00b6ff7572e8c2735d9f878b7c' into 85
Date Mon, 23 Sep 2013 22:06:09 GMT
Merge commit 'c82b663fcb74fe00b6ff7572e8c2735d9f878b7c' into 85

Conflicts:
	CHANGES.txt
	common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java
	common/src/main/java/org/apache/falcon/catalog/HiveCatalogService.java
	common/src/main/java/org/apache/falcon/entity/CatalogStorage.java
	common/src/main/java/org/apache/falcon/entity/FeedHelper.java
	common/src/main/java/org/apache/falcon/entity/FileSystemStorage.java
	common/src/main/java/org/apache/falcon/entity/parser/FeedEntityParser.java
	common/src/main/java/org/apache/falcon/group/FeedGroup.java
	common/src/main/java/org/apache/falcon/group/FeedGroupMap.java
	common/src/test/java/org/apache/falcon/entity/CatalogStorageTest.java
	common/src/test/java/org/apache/falcon/entity/FileSystemStorageTest.java
	common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
	common/src/test/resources/config/feed/hive-table-feed.xml
	process/src/main/java/org/apache/falcon/workflow/OozieProcessWorkflowBuilder.java
	process/src/test/java/org/apache/falcon/converter/OozieProcessMapperTest.java


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

Branch: refs/heads/FALCON-85
Commit: f278ec82f4c21f9d2949f220261538e2fb15184c
Parents: 33b5f64 c82b663
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Mon Sep 23 14:48:26 2013 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Mon Sep 23 14:48:26 2013 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                  | 2 +-
 .../org/apache/falcon/catalog/AbstractCatalogService.java    | 1 -
 .../src/main/java/org/apache/falcon/group/FeedGroupMap.java  | 3 +--
 .../test/java/org/apache/falcon/resource/TestContext.java    | 8 +++-----
 4 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f278ec82/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 06effed,b2dc1d3..e286b4e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,18 -5,7 +5,18 @@@ Trunk (Unreleased
    INCOMPATIBLE CHANGES
  
    NEW FEATURES
 -    FALCON-86 Hive table integration with cluster entity. (Venaktesh 
 +    FALCON-102 Add integration tests for feed entity parser for table.
 +    (Venkatesh Seetharam)
 +
 +    FALCON-103 Upgrade oozie to 4.0.x. (Venkatesh Seetharam)
 +
 +    FALCON-96 Hive client to talk to the metastore. (Venkatesh
 +    Seetharam via Srikanth Sundarrajan)
 +
 +    FALCON-87 Hive table integration with feed entity. (Venkatesh
 +    Seetharam via Srikanth Sundarrajan)
 +
-     FALCON-86 Hive table integration with cluster entity. (Venaktesh 
++    FALCON-86 Hive table integration with cluster entity. (Venaktesh
      Seetharam via Srikanth Sundarrajan)
  
      FALCON-88 Add embedded hive and webhcat for integration tests. 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f278ec82/common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f278ec82/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java
----------------------------------------------------------------------
diff --cc common/src/main/java/org/apache/falcon/group/FeedGroupMap.java
index 0a35a71,ed44b48..2f65e09
--- a/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java
+++ b/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java
@@@ -114,9 -114,8 +114,8 @@@ public final class FeedGroupMap impleme
          return groupSet;
      }
  
-     public Set<FeedGroup> getGroups(org.apache.falcon.entity.v0.feed.Feed feed)
-         throws FalconException {
 -    public Set<FeedGroup> getGroups(org.apache.falcon.entity.v0.feed.Feed feed) {
++    public Set<FeedGroup> getGroups(org.apache.falcon.entity.v0.feed.Feed feed) throws
FalconException {
          return getGroups(feed.getGroups(), feed.getFrequency(),
 -                FeedHelper.getLocation(feed, LocationType.DATA).getPath());
 +                FeedHelper.createStorage(feed).getUriTemplate(LocationType.DATA));
      }
  }


Mime
View raw message