Infer group

4 files changed, 21 insertions, 35 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
index 943390cb10c..be761acf2c2 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
@@ -157,7 +157,6 @@ public class DispatcherTest {
         @Override
         public Optional<SearchInvoker> createSearchInvoker(VespaBackEndSearcher searcher,
                                                            Query query,
-                                                           OptionalInt groupId,
                                                            List<Node> nodes,
                                                            boolean acceptIncompleteCoverage,
                                                            int maxHitsPerNode) {
@@ -167,7 +166,7 @@ public class DispatcherTest {
             boolean nonEmpty = events[step].returnInvoker(nodes, acceptIncompleteCoverage);
             step++;
             if (nonEmpty) {
-                return Optional.of(new MockInvoker(nodes.get(0).key(), groupId));
+                return Optional.of(new MockInvoker(nodes.get(0).key()));
             } else {
                 return Optional.empty();
             }
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java b/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java
index 53d1a2457d0..d86fcdfc25d 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java
@@ -4,6 +4,7 @@ package com.yahoo.search.dispatch;
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
+import com.yahoo.search.dispatch.searchcluster.Group;
 import com.yahoo.search.dispatch.searchcluster.Node;
 import com.yahoo.search.result.Coverage;
 import com.yahoo.search.result.Hit;
@@ -17,27 +18,17 @@ import java.util.OptionalInt;
 class MockInvoker extends SearchInvoker {
 
     private final Coverage coverage;
-    private final OptionalInt groupId;
     private Query query;
     private List<Hit> hits;
     int hitsRequested;
 
-    protected MockInvoker(int key, Coverage coverage, OptionalInt groupId) {
+    protected MockInvoker(int key, Coverage coverage) {
         super(Optional.of(new Node(key, "?", 0)));
         this.coverage = coverage;
-        this.groupId = groupId;
-    }
-
-    protected MockInvoker(int key, OptionalInt groupId) {
-        this(key, null, groupId);
-    }
-
-    protected MockInvoker(int key, Coverage coverage) {
-        this(key, coverage, OptionalInt.empty());
     }
 
     protected MockInvoker(int key) {
-        this(key, null, OptionalInt.empty());
+        this(key, null);
     }
 
     MockInvoker setHits(List<Hit> hits) {
@@ -45,18 +36,15 @@ class MockInvoker extends SearchInvoker {
         return this;
     }
 
-    /** Returns the group to be invoked, if known */
-    public OptionalInt groupId() { return groupId; }
-
     @Override
-    protected Object sendSearchRequest(Query query, Object context) throws IOException {
+    protected Object sendSearchRequest(Query query, Object context) {
         this.query = query;
         hitsRequested = query.getHits();
         return context;
     }
 
     @Override
-    protected InvokerResult getSearchResult(Execution execution) throws IOException {
+    protected InvokerResult getSearchResult(Execution execution) {
         InvokerResult ret = new InvokerResult(query, 10);
         if (coverage != null) {
             ret.getResult().setCoverage(coverage);
@@ -80,8 +68,7 @@ class MockInvoker extends SearchInvoker {
 
     @Override
     public String toString() {
-        return "invoker with key " + distributionKey() +
-               (groupId().isPresent() ? " of group " + groupId().getAsInt() : "");
+        return "invoker with key " + distributionKey();
     }
 
 }
\ No newline at end of file
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterCoverageTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterCoverageTest.java
index c9f7469acbb..ee51b983d64 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterCoverageTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterCoverageTest.java
@@ -115,7 +115,7 @@ public class SearchClusterCoverageTest {
         node1.setActiveDocuments(0);
 
         tester.pingIterationCompleted();
-        assertTrue(tester.group(0).isContentWellBalanced());
+        assertTrue(tester.group(0).isBalanced());
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
index 48134094faf..f46717ce180 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
@@ -337,45 +337,45 @@ public class SearchClusterTest {
     @Test
     public void requireThatEmptyGroupIsInBalance() {
         Group group = new Group(0, new ArrayList<>());
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
         group.aggregateNodeValues();
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
     }
 
     @Test
     public void requireThatSingleNodeGroupIsInBalance() {
         Group group = new Group(0, Arrays.asList(new Node(1, "n", 1)));
         group.nodes().forEach(node -> node.setWorking(true));
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
         group.aggregateNodeValues();
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
         group.nodes().get(0).setActiveDocuments(1000);
         group.aggregateNodeValues();
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
     }
 
     @Test
     public void requireThatMultiNodeGroupDetectsBalance() {
         Group group = new Group(0, Arrays.asList(new Node(1, "n1", 1), new Node(2, "n2", 1)));
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
         group.nodes().forEach(node -> node.setWorking(true));
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
         group.aggregateNodeValues();
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
         group.nodes().get(0).setActiveDocuments(1000);
         group.aggregateNodeValues();
-        assertFalse(group.isContentWellBalanced());
+        assertFalse(group.isBalanced());
         group.nodes().get(1).setActiveDocuments(100);
         group.aggregateNodeValues();
-        assertFalse(group.isContentWellBalanced());
+        assertFalse(group.isBalanced());
         group.nodes().get(1).setActiveDocuments(800);
         group.aggregateNodeValues();
-        assertFalse(group.isContentWellBalanced());
+        assertFalse(group.isBalanced());
         group.nodes().get(1).setActiveDocuments(818);
         group.aggregateNodeValues();
-        assertFalse(group.isContentWellBalanced());
+        assertFalse(group.isBalanced());
         group.nodes().get(1).setActiveDocuments(819);
         group.aggregateNodeValues();
-        assertTrue(group.isContentWellBalanced());
+        assertTrue(group.isBalanced());
     }
 }