Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in DruidCluster.getAllServers() (#4500) 

* Fix a bug in getAllServers

* Change to old style
This commit is contained in:
Jihoon Son 2017-07-06 00:57:38 +09:00 committed by Gian Merlino
parent fc4fe24dd5
commit a6d648a728
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/io/druid/server/coordinator/DruidCluster.java
View File

@ -26,9 +26,11 @@ import io.druid.client.ImmutableDruidServer;
import io.druid.java.util.common.IAE;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -113,9 +115,13 @@ public class DruidCluster
public Collection<ServerHolder> getAllServers()
{
return historicals.values().stream()
.flatMap(Collection::stream)
.collect(() -> realtimes, Set::add, Set::addAll);
final int historicalSize = historicals.values().stream().mapToInt(Collection::size).sum();
final int realtimeSize = realtimes.size();
final List<ServerHolder> allServers = new ArrayList<>(historicalSize + realtimeSize);
historicals.values().forEach(allServers::addAll);
allServers.addAll(realtimes);
return allServers;
}
public Iterable<MinMaxPriorityQueue<ServerHolder>> getSortedHistoricalsByTier()

7
server/src/test/java/io/druid/server/coordinator/DruidClusterTest.java
View File

@ -38,6 +38,7 @@ import org.junit.Test;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
public class DruidClusterTest
@ -184,6 +185,9 @@ public class DruidClusterTest
{
cluster.add(newRealtime);
cluster.add(newHistorical);
final Set<ServerHolder> expectedRealtimes = cluster.getRealtimes();
final Map<String, MinMaxPriorityQueue<ServerHolder>> expectedHistoricals = cluster.getHistoricals();
final Collection<ServerHolder> allServers = cluster.getAllServers();
Assert.assertEquals(4, allServers.size());
Assert.assertTrue(allServers.containsAll(cluster.getRealtimes()));
@ -192,6 +196,9 @@ public class DruidClusterTest
cluster.getHistoricals().values().stream().flatMap(Collection::stream).collect(Collectors.toList())
)
);
Assert.assertEquals(expectedHistoricals, cluster.getHistoricals());
Assert.assertEquals(expectedRealtimes, cluster.getRealtimes());
}
@Test