honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove superfluous method numPrimaries

This commit is contained in:
Yannick Welsch 2015-12-28 11:20:13 +01:00
parent e855282258
commit eea791de15
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
View File

@ -892,7 +892,6 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
static final class ModelIndex { static final class ModelIndex {
private final String id; private final String id;
private final Map<ShardRouting, Decision> shards = new HashMap<>(); private final Map<ShardRouting, Decision> shards = new HashMap<>();
private int numPrimaries = -1;
private int highestPrimary = -1; private int highestPrimary = -1;
public ModelIndex(String id) { public ModelIndex(String id) {
@ -924,26 +923,13 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
return shards.keySet(); return shards.keySet();
} }
public int numPrimaries() {
if (numPrimaries == -1) {
int num = 0;
for (ShardRouting shard : shards.keySet()) {
if (shard.primary()) {
num++;
}
}
return numPrimaries = num;
}
return numPrimaries;
}
public Decision removeShard(ShardRouting shard) { public Decision removeShard(ShardRouting shard) {
highestPrimary = numPrimaries = -1; highestPrimary = -1;
return shards.remove(shard); return shards.remove(shard);
} }
public void addShard(ShardRouting shard, Decision decision) { public void addShard(ShardRouting shard, Decision decision) {
highestPrimary = numPrimaries = -1; highestPrimary = -1;
assert decision != null; assert decision != null;
assert !shards.containsKey(shard) : "Shard already allocated on current node: " + shards.get(shard) + " " + shard; assert !shards.containsKey(shard) : "Shard already allocated on current node: " + shards.get(shard) + " " + shard;
shards.put(shard, decision); shards.put(shard, decision);