falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suh...@apache.org
Subject falcon git commit: FALCON-1143 Correcting order of entities on reload. Contributed by Ajay Yadava
Date Thu, 09 Apr 2015 09:56:14 GMT
Repository: falcon
Updated Branches:
  refs/heads/0.6.1 74856a911 -> 40ee0892c (forced update)


FALCON-1143 Correcting order of entities on reload. 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/40ee0892
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/40ee0892
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/40ee0892

Branch: refs/heads/0.6.1
Commit: 40ee0892c456c0ddee98431fa1b0cad9e8e6eb0a
Parents: 89c2749
Author: Suhas Vasu <suhas.v@inmobi.com>
Authored: Thu Apr 9 14:55:46 2015 +0530
Committer: Suhas Vasu <suhas.v@inmobi.com>
Committed: Thu Apr 9 15:24:54 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                           | 14 +++-----------
 .../falcon/entity/store/ConfigurationStore.java       |  5 ++++-
 2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/40ee0892/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7cbb573..eee5fb6 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,16 +1,5 @@
 Apache Falcon Change log
 
-Trunk (Unreleased)
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
 Branch: 0.6.1 (Proposed Release Version: 0.6.1)
   FALCON-1134 Create branch 0.6.1 and update version to 0.6.1
   (Shaik Idris Ali) 
@@ -148,6 +137,9 @@ Branch: 0.6.1 (Proposed Release Version: 0.6.1)
    (Suhas vasu)
 
   BUG FIXES
+   FALCON-1141 Reverse Lookup for feed in prism fails with BadRequest
+   (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/40ee0892/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java b/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
index 1c1c325..b84371f 100644
--- a/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
+++ b/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
@@ -55,6 +55,9 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public final class ConfigurationStore implements FalconService {
 
+    private static final EntityType[] ENTITY_LOAD_ORDER = new EntityType[] {
+        EntityType.CLUSTER, EntityType.FEED, EntityType.PROCESS, };
+
     private static final Logger LOG = LoggerFactory.getLogger(ConfigurationStore.class);
     private static final Logger AUDIT = LoggerFactory.getLogger("AUDIT");
     private static final String UTF_8 = CharEncoding.UTF_8;
@@ -135,7 +138,7 @@ public final class ConfigurationStore implements FalconService {
         }
 
         try {
-            for (EntityType type : EntityType.values()) {
+            for (EntityType type : ENTITY_LOAD_ORDER) {
                 ConcurrentHashMap<String, Entity> entityMap = dictionary.get(type);
                 FileStatus[] files = fs.globStatus(new Path(storePath, type.name() + Path.SEPARATOR
+ "*"));
                 if (files != null) {


Mime
View raw message