X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FConfigurationImpl.java;h=0541e3a48bb1aab6cef1843e429ff700949d7688;hb=4b207b5356775c4b4d231ae979f9f2134f617dd1;hp=56b2d094c7682543f14415191e9e184744b3102f;hpb=b17e0e95db4cd85de976b9aa077e8b1ab1bb1474;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java
index 56b2d094c7..0541e3a48b 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ConfigurationImpl.java
@@ -12,7 +12,10 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ListMultimap;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigObject;
@@ -20,7 +23,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -47,8 +49,10 @@ public class ConfigurationImpl implements Configuration {
     // key = shardName, value = list of replicaNames (replicaNames are the same as memberNames)
     private final Map<String, List<String>> shardReplicaNames = new HashMap<>();
 
-    private final Map<String, String> namespaceToModuleName;
+    private final ListMultimap<String, String> moduleNameToShardName;
     private final Map<String, ShardStrategy> moduleNameToStrategy;
+    private final Map<String, String> namespaceToModuleName;
+    private final Set<String> allShardNames;
 
     public ConfigurationImpl(final String moduleShardsConfigPath,
 
@@ -82,10 +86,22 @@ public class ConfigurationImpl implements Configuration {
         this.moduleShards = readModuleShards(moduleShardsConfig);
         this.modules = readModules(modulesConfig);
 
+        this.allShardNames = createAllShardNames(moduleShards);
+        this.moduleNameToShardName = createModuleNameToShardName(moduleShards);
         this.moduleNameToStrategy = createModuleNameToStrategy(modules);
         this.namespaceToModuleName = createNamespaceToModuleName(modules);
     }
 
+    private static Set<String> createAllShardNames(Iterable<ModuleShard> moduleShards) {
+        final com.google.common.collect.ImmutableSet.Builder<String> b = ImmutableSet.builder();
+        for(ModuleShard ms : moduleShards){
+            for(Shard s : ms.getShards()) {
+                b.add(s.getName());
+            }
+        }
+        return b.build();
+    }
+
     private static Map<String, ShardStrategy> createModuleNameToStrategy(Iterable<Module> modules) {
         final com.google.common.collect.ImmutableMap.Builder<String, ShardStrategy> b = ImmutableMap.builder();
         for (Module m : modules) {
@@ -102,6 +118,18 @@ public class ConfigurationImpl implements Configuration {
         return b.build();
     }
 
+    private static ListMultimap<String, String> createModuleNameToShardName(Iterable<ModuleShard> moduleShards) {
+        final com.google.common.collect.ImmutableListMultimap.Builder<String, String> b = ImmutableListMultimap.builder();
+
+        for (ModuleShard m : moduleShards) {
+            for (Shard s : m.getShards()) {
+                b.put(m.getModuleName(), s.getName());
+            }
+        }
+
+        return b.build();
+    }
+
     @Override public List<String> getMemberShardNames(final String memberName){
 
         Preconditions.checkNotNull(memberName, "memberName should not be null");
@@ -138,22 +166,10 @@ public class ConfigurationImpl implements Configuration {
         return moduleNameToStrategy;
     }
 
-    @Override public List<String> getShardNamesFromModuleName(final String moduleName) {
-
+    @Override
+    public List<String> getShardNamesFromModuleName(final String moduleName) {
         Preconditions.checkNotNull(moduleName, "moduleName should not be null");
-
-        // FIXME: can be constant view of moduleShards
-        for(ModuleShard m : moduleShards){
-            if(m.getModuleName().equals(moduleName)){
-                List<String> l = new ArrayList<>();
-                for(Shard s : m.getShards()){
-                    l.add(s.getName());
-                }
-                return l;
-            }
-        }
-
-        return Collections.emptyList();
+        return moduleNameToShardName.get(moduleName);
     }
 
     @Override public List<String> getMembersFromShardName(final String shardName) {
@@ -177,18 +193,11 @@ public class ConfigurationImpl implements Configuration {
         return Collections.emptyList();
     }
 
-    @Override public Set<String> getAllShardNames() {
-        Set<String> shardNames = new LinkedHashSet<>();
-        for(ModuleShard ms : moduleShards){
-            for(Shard s : ms.getShards()) {
-                shardNames.add(s.getName());
-            }
-        }
-        return shardNames;
+    @Override
+    public Set<String> getAllShardNames() {
+        return allShardNames;
     }
 
-
-
     private List<Module> readModules(final Config modulesConfig) {
         List<? extends ConfigObject> modulesConfigObjectList =
             modulesConfig.getObjectList("modules");
@@ -229,7 +238,6 @@ public class ConfigurationImpl implements Configuration {
         return b.build();
     }
 
-
     private static class ModuleShard {
         private final String moduleName;
         private final List<Shard> shards;
@@ -278,7 +286,7 @@ public class ConfigurationImpl implements Configuration {
             if(ModuleShardStrategy.NAME.equals(shardStrategy)){
                 this.shardStrategy = new ModuleShardStrategy(name, ConfigurationImpl.this);
             } else {
-                this.shardStrategy = new DefaultShardStrategy();
+                this.shardStrategy = DefaultShardStrategy.getInstance();
             }
         }