incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject [2/2] git commit: make parameter order match the call
Date Wed, 23 Jul 2014 19:53:01 GMT
make parameter order match the call


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

Branch: refs/heads/master
Commit: 355d14ff086fbaf76be694b78a4fd8fa55b78f99
Parents: b899375
Author: Tim <twilliams@apache.org>
Authored: Wed Jul 23 15:52:28 2014 -0400
Committer: Tim <twilliams@apache.org>
Committed: Wed Jul 23 15:52:28 2014 -0400

----------------------------------------------------------------------
 .../MasterBasedDistributedLayoutFactory.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/355d14ff/blur-core/src/main/java/org/apache/blur/manager/indexserver/MasterBasedDistributedLayoutFactory.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/indexserver/MasterBasedDistributedLayoutFactory.java
b/blur-core/src/main/java/org/apache/blur/manager/indexserver/MasterBasedDistributedLayoutFactory.java
index 47a8fde..319ccf2 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/indexserver/MasterBasedDistributedLayoutFactory.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/indexserver/MasterBasedDistributedLayoutFactory.java
@@ -127,8 +127,8 @@ public class MasterBasedDistributedLayoutFactory implements DistributedLayoutFac
     return list;
   }
 
-  private MasterBasedDistributedLayout newLayout(String table, List<String> onlineShardServerList,
-      List<String> shardServerList) {
+  private MasterBasedDistributedLayout newLayout(String table, List<String> shardList,
+      List<String> onlineShardServerList) {
     try {
       _zooKeeperLockManager.lock(table);
       LOG.info("Checking for existing layout for table [{0}]", table);
@@ -146,7 +146,7 @@ public class MasterBasedDistributedLayoutFactory implements DistributedLayoutFac
         if (data != null) {
           MasterBasedDistributedLayout storedLayout = fromBytes(data);
           LOG.info("Checking if layout is out of date for table [{0}]", table);
-          if (!storedLayout.isOutOfDate(onlineShardServerList, shardServerList)) {
+          if (!storedLayout.isOutOfDate(shardList, onlineShardServerList)) {
             LOG.info("Layout is up-to-date for table [{0}]", table);
             return storedLayout;
           }
@@ -157,10 +157,10 @@ public class MasterBasedDistributedLayoutFactory implements DistributedLayoutFac
       }
       LOG.info("Calculating new layout for table [{0}]", table);
       // recreate
-      Map<String, String> newCalculatedLayout = calculateNewLayout(table, existingLayout,
onlineShardServerList,
-          shardServerList);
-      MasterBasedDistributedLayout layout = new MasterBasedDistributedLayout(newCalculatedLayout,
-          onlineShardServerList, shardServerList);
+      Map<String, String> newCalculatedLayout = calculateNewLayout(table, existingLayout,
shardList,
+          onlineShardServerList);
+      MasterBasedDistributedLayout layout = new MasterBasedDistributedLayout(newCalculatedLayout,
shardList,
+          onlineShardServerList);
       LOG.info("New layout created for table [{0}]", table);
       String newPath = _zooKeeper.create(getStoragePath(table) + SEP, toBytes(layout), Ids.OPEN_ACL_UNSAFE,
           CreateMode.PERSISTENT_SEQUENTIAL);
@@ -358,9 +358,9 @@ public class MasterBasedDistributedLayoutFactory implements DistributedLayoutFac
       return false;
     }
   }
-  
+
   @Override
-  public Map<String,?> getLayoutCache() {
+  public Map<String, ?> getLayoutCache() {
     return _cachedLayoutMap;
   }
 


Mime
View raw message