diff options
author | Olli Virtanen <olli.virtanen@oath.com> | 2018-11-16 12:54:32 +0100 |
---|---|---|
committer | Olli Virtanen <olli.virtanen@oath.com> | 2018-11-16 12:54:32 +0100 |
commit | 6d4dc6565a26e96334de4f2a3d653c75486c22f2 (patch) | |
tree | e3cde9aa354d69f7d322c37a73e7fbe00a8b0f11 /container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java | |
parent | b9516d7332baee5744488c1db8e3a8f74c634059 (diff) |
Group affinity through searchPath; remove Query from LB assignment
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java index 698cee743e4..13b75cf9c5a 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.dispatch; -import com.yahoo.search.Query; import com.yahoo.search.dispatch.searchcluster.Group; import com.yahoo.search.dispatch.searchcluster.Node; import com.yahoo.search.dispatch.searchcluster.SearchCluster; @@ -26,7 +25,7 @@ public class LoadBalancerTest { SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1), null, 1, null); LoadBalancer lb = new LoadBalancer(cluster, true); - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.orElseGet(() -> { throw new AssertionFailedError("Expected a SearchCluster.Group"); }); @@ -40,7 +39,7 @@ public class LoadBalancerTest { SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1, n2), null, 1, null); LoadBalancer lb = new LoadBalancer(cluster, true); - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.orElseGet(() -> { throw new AssertionFailedError("Expected a SearchCluster.Group"); }); @@ -56,7 +55,7 @@ public class LoadBalancerTest { SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1, n2, n3, n4), null, 2, null); LoadBalancer lb = new LoadBalancer(cluster, true); - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); assertThat(grp.isPresent(), is(true)); } @@ -68,14 +67,14 @@ public class LoadBalancerTest { LoadBalancer lb = new LoadBalancer(cluster, true); // get first group - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.get(); int id1 = group.id(); // release allocation lb.releaseGroup(group); // get second group - grp = lb.takeGroupForQuery(new Query(), null); + grp = lb.takeGroupForQuery(null); group = grp.get(); assertThat(group.id(), not(equalTo(id1))); } @@ -88,12 +87,12 @@ public class LoadBalancerTest { LoadBalancer lb = new LoadBalancer(cluster, true); // get first group - Optional<Group> grp = lb.takeGroupForQuery(new Query(), null); + Optional<Group> grp = lb.takeGroupForQuery(null); Group group = grp.get(); int id1 = group.id(); // get second group - grp = lb.takeGroupForQuery(new Query(), null); + grp = lb.takeGroupForQuery(null); group = grp.get(); int id2 = group.id(); assertThat(id2, not(equalTo(id1))); @@ -101,7 +100,7 @@ public class LoadBalancerTest { lb.releaseGroup(group); // get third group - grp = lb.takeGroupForQuery(new Query(), null); + grp = lb.takeGroupForQuery(null); group = grp.get(); assertThat(group.id(), equalTo(id2)); } |