Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add Distributed DataStore as a dependency of the Simulator"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ConfigurationImpl.java
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 674c7d52984ad87ed41fb9ab9610475733e44363..0541e3a48bb1aab6cef1843e429ff700949d7688 100644
(file)
--- 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
@@
-14,6
+14,7
@@
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.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.google.common.collect.ListMultimap;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
@@
-22,7
+23,6
@@
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
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;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@
-52,6
+52,7
@@
public class ConfigurationImpl implements Configuration {
private final ListMultimap<String, String> moduleNameToShardName;
private final Map<String, ShardStrategy> moduleNameToStrategy;
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,
public ConfigurationImpl(final String moduleShardsConfigPath,
@@
-85,11
+86,22
@@
public class ConfigurationImpl implements Configuration {
this.moduleShards = readModuleShards(moduleShardsConfig);
this.modules = readModules(modulesConfig);
this.moduleShards = readModuleShards(moduleShardsConfig);
this.modules = readModules(modulesConfig);
+ this.allShardNames = createAllShardNames(moduleShards);
this.moduleNameToShardName = createModuleNameToShardName(moduleShards);
this.moduleNameToStrategy = createModuleNameToStrategy(modules);
this.namespaceToModuleName = createNamespaceToModuleName(modules);
}
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) {
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) {
@@
-181,18
+193,11
@@
public class ConfigurationImpl implements Configuration {
return Collections.emptyList();
}
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");
private List<Module> readModules(final Config modulesConfig) {
List<? extends ConfigObject> modulesConfigObjectList =
modulesConfig.getObjectList("modules");
@@
-233,7
+238,6
@@
public class ConfigurationImpl implements Configuration {
return b.build();
}
return b.build();
}
-
private static class ModuleShard {
private final String moduleName;
private final List<Shard> shards;
private static class ModuleShard {
private final String moduleName;
private final List<Shard> shards;
@@
-282,7
+286,7
@@
public class ConfigurationImpl implements Configuration {
if(ModuleShardStrategy.NAME.equals(shardStrategy)){
this.shardStrategy = new ModuleShardStrategy(name, ConfigurationImpl.this);
} else {
if(ModuleShardStrategy.NAME.equals(shardStrategy)){
this.shardStrategy = new ModuleShardStrategy(name, ConfigurationImpl.this);
} else {
- this.shardStrategy =
new DefaultShardStrategy
();
+ this.shardStrategy =
DefaultShardStrategy.getInstance
();
}
}
}
}