diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java')
| -rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java | 124 |
1 files changed, 57 insertions, 67 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java index 2b560713c57..bd60e695a9a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java @@ -14,7 +14,6 @@ import com.yahoo.prelude.SearchDefinition; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; import com.yahoo.prelude.fastsearch.FastHit; import com.yahoo.prelude.fastsearch.VespaBackEndSearcher; -import com.yahoo.prelude.fastsearch.test.MockMetric; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.config.ClusterConfig; @@ -28,15 +27,7 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.vespa.config.search.DispatchConfig; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.junit.jupiter.api.Assertions.*; @@ -51,13 +42,13 @@ public class ClusterSearcherTestCase { @Test void testNoBackends() { - ClusterSearcher cluster = new ClusterSearcher(new LinkedHashSet<>(Arrays.asList("dummy"))); + ClusterSearcher cluster = new ClusterSearcher(new LinkedHashSet<>(List.of("dummy"))); try { Execution execution = new Execution(cluster, Execution.Context.createContextStub()); Query query = new Query("query=hello"); query.setHits(10); com.yahoo.search.Result result = execution.search(query); - assertTrue(result.hits().getError() != null); + assertNotNull(result.hits().getError()); assertEquals("No backends in service. Try later", result.hits().getError().getMessage()); } finally { cluster.deconstruct(); @@ -66,9 +57,9 @@ public class ClusterSearcherTestCase { private IndexFacts createIndexFacts() { Map<String, List<String>> clusters = new LinkedHashMap<>(); - clusters.put("cluster1", Arrays.asList("type1", "type2", "type3")); - clusters.put("cluster2", Arrays.asList("type4", "type5")); - clusters.put("type1", Arrays.asList("type6")); + clusters.put("cluster1", List.of("type1", "type2", "type3")); + clusters.put("cluster2", List.of("type4", "type5")); + clusters.put("type1", List.of("type6")); Collection<SearchDefinition> searchDefs = ImmutableList.of( new SearchDefinition("type1"), new SearchDefinition("type2"), @@ -85,34 +76,34 @@ public class ClusterSearcherTestCase { @Test void testThatDocumentTypesAreResolved() { - ClusterSearcher cluster1 = new ClusterSearcher(new LinkedHashSet<>(Arrays.asList("type1", "type2", "type3"))); + ClusterSearcher cluster1 = new ClusterSearcher(new LinkedHashSet<>(List.of("type1", "type2", "type3"))); try { - ClusterSearcher type1 = new ClusterSearcher(new LinkedHashSet<>(Arrays.asList("type6"))); + ClusterSearcher type1 = new ClusterSearcher(new LinkedHashSet<>(List.of("type6"))); try { - assertEquals(new LinkedHashSet<>(Arrays.asList("type1", "type2", "type3")), resolve(cluster1, "")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type6")), resolve(type1, "")); + assertEquals(new LinkedHashSet<>(List.of("type1", "type2", "type3")), resolve(cluster1, "")); + assertEquals(new LinkedHashSet<>(List.of("type6")), resolve(type1, "")); { // specify restrict - assertEquals(new LinkedHashSet<>(Arrays.asList("type1")), resolve(cluster1, "&restrict=type1")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2")), resolve(cluster1, "&restrict=type2")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2", "type3")), resolve(cluster1, "&restrict=type2,type3")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2")), resolve(cluster1, "&restrict=type2,type4")); - assertEquals(new LinkedHashSet<>(Arrays.asList()), resolve(cluster1, "&restrict=type4")); + assertEquals(new LinkedHashSet<>(List.of("type1")), resolve(cluster1, "&restrict=type1")); + assertEquals(new LinkedHashSet<>(List.of("type2")), resolve(cluster1, "&restrict=type2")); + assertEquals(new LinkedHashSet<>(List.of("type2", "type3")), resolve(cluster1, "&restrict=type2,type3")); + assertEquals(new LinkedHashSet<>(List.of("type2")), resolve(cluster1, "&restrict=type2,type4")); + assertEquals(new LinkedHashSet<>(List.of()), resolve(cluster1, "&restrict=type4")); } { // specify sources - assertEquals(new LinkedHashSet<>(Arrays.asList("type1", "type2", "type3")), resolve(cluster1, "&sources=cluster1")); - assertEquals(new LinkedHashSet<>(Arrays.asList()), resolve(cluster1, "&sources=cluster2")); - assertEquals(new LinkedHashSet<>(Arrays.asList()), resolve(cluster1, "&sources=type1")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type6")), resolve(type1, "&sources=type1")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2")), resolve(cluster1, "&sources=type2")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2", "type3")), resolve(cluster1, "&sources=type2,type3")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2")), resolve(cluster1, "&sources=type2,type4")); - assertEquals(new LinkedHashSet<>(Arrays.asList()), resolve(cluster1, "&sources=type4")); + assertEquals(new LinkedHashSet<>(List.of("type1", "type2", "type3")), resolve(cluster1, "&sources=cluster1")); + assertEquals(new LinkedHashSet<>(List.of()), resolve(cluster1, "&sources=cluster2")); + assertEquals(new LinkedHashSet<>(List.of()), resolve(cluster1, "&sources=type1")); + assertEquals(new LinkedHashSet<>(List.of("type6")), resolve(type1, "&sources=type1")); + assertEquals(new LinkedHashSet<>(List.of("type2")), resolve(cluster1, "&sources=type2")); + assertEquals(new LinkedHashSet<>(List.of("type2", "type3")), resolve(cluster1, "&sources=type2,type3")); + assertEquals(new LinkedHashSet<>(List.of("type2")), resolve(cluster1, "&sources=type2,type4")); + assertEquals(new LinkedHashSet<>(List.of()), resolve(cluster1, "&sources=type4")); } { // specify both - assertEquals(new LinkedHashSet<>(Arrays.asList("type1")), resolve(cluster1, "&sources=cluster1&restrict=type1")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2")), resolve(cluster1, "&sources=cluster1&restrict=type2")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2", "type3")), resolve(cluster1, "&sources=cluster1&restrict=type2,type3")); - assertEquals(new LinkedHashSet<>(Arrays.asList("type2")), resolve(cluster1, "&sources=cluster2&restrict=type2")); + assertEquals(new LinkedHashSet<>(List.of("type1")), resolve(cluster1, "&sources=cluster1&restrict=type1")); + assertEquals(new LinkedHashSet<>(List.of("type2")), resolve(cluster1, "&sources=cluster1&restrict=type2")); + assertEquals(new LinkedHashSet<>(List.of("type2", "type3")), resolve(cluster1, "&sources=cluster1&restrict=type2,type3")); + assertEquals(new LinkedHashSet<>(List.of("type2")), resolve(cluster1, "&sources=cluster2&restrict=type2")); } } finally { type1.deconstruct(); @@ -181,15 +172,15 @@ public class ClusterSearcherTestCase { } private void init() { - results.put(type1, Arrays.asList(createHit(getId(type1, 0), 9), + results.put(type1, List.of(createHit(getId(type1, 0), 9), createHit(getId(type1, 1), 6), createHit(getId(type1, 2), 3))); - results.put(type2, Arrays.asList(createHit(getId(type2, 0), 10), + results.put(type2, List.of(createHit(getId(type2, 0), 10), createHit(getId(type2, 1), 7), createHit(getId(type2, 2), 4))); - results.put(type3, Arrays.asList(createHit(getId(type3, 0), 11), + results.put(type3, List.of(createHit(getId(type3, 0), 11), createHit(getId(type3, 1), 8), createHit(getId(type3, 2), 5))); } @@ -253,11 +244,11 @@ public class ClusterSearcherTestCase { } private Execution createExecution() { - return createExecution(Arrays.asList("type1", "type2", "type3"), false); + return createExecution(List.of("type1", "type2", "type3"), false); } private Execution createExecution(boolean expectAttributePrefetch) { - return createExecution(Arrays.asList("type1", "type2", "type3"), expectAttributePrefetch); + return createExecution(List.of("type1", "type2", "type3"), expectAttributePrefetch); } private Execution createExecution(List<String> docTypesList, boolean expectAttributePrefetch) { @@ -297,7 +288,7 @@ public class ClusterSearcherTestCase { // NB ! Empty restrict sets does not exist below the cluster searcher. // restrict set is set by cluster searcher to tell which documentdb is used. // Modify test to mirror that change. - Execution execution = createExecution(Arrays.asList("type1"), false); + Execution execution = createExecution(List.of("type1"), false); Query query = new Query("?query=hello"); com.yahoo.search.Result result = execution.search(query); assertEquals(3, result.getTotalHitCount()); @@ -387,24 +378,24 @@ public class ClusterSearcherTestCase { Execution ex = createExecution(); // all types - assertResult(9, Arrays.asList(11.0, 10.0), getResult(0, 2, ex)); - assertResult(9, Arrays.asList(10.0, 9.0), getResult(1, 2, ex)); - assertResult(9, Arrays.asList(9.0, 8.0), getResult(2, 2, ex)); - assertResult(9, Arrays.asList(8.0, 7.0), getResult(3, 2, ex)); - assertResult(9, Arrays.asList(7.0, 6.0), getResult(4, 2, ex)); - assertResult(9, Arrays.asList(6.0, 5.0), getResult(5, 2, ex)); - assertResult(9, Arrays.asList(5.0, 4.0), getResult(6, 2, ex)); - assertResult(9, Arrays.asList(4.0, 3.0), getResult(7, 2, ex)); - assertResult(9, Arrays.asList(3.0), getResult(8, 2, ex)); - assertResult(9, new ArrayList<>(), getResult(9, 2, ex)); - assertResult(9, Arrays.asList(11.0, 10.0, 9.0, 8.0, 7.0), getResult(0, 5, ex)); - assertResult(9, Arrays.asList(6.0, 5.0, 4.0, 3.0), getResult(5, 5, ex)); + assertResult(9, List.of(11.0, 10.0), getResult(0, 2, ex)); + assertResult(9, List.of(10.0, 9.0), getResult(1, 2, ex)); + assertResult(9, List.of(9.0, 8.0), getResult(2, 2, ex)); + assertResult(9, List.of(8.0, 7.0), getResult(3, 2, ex)); + assertResult(9, List.of(7.0, 6.0), getResult(4, 2, ex)); + assertResult(9, List.of(6.0, 5.0), getResult(5, 2, ex)); + assertResult(9, List.of(5.0, 4.0), getResult(6, 2, ex)); + assertResult(9, List.of(4.0, 3.0), getResult(7, 2, ex)); + assertResult(9, List.of(3.0), getResult(8, 2, ex)); + assertResult(9, List.of(), getResult(9, 2, ex)); + assertResult(9, List.of(11.0, 10.0, 9.0, 8.0, 7.0), getResult(0, 5, ex)); + assertResult(9, List.of(6.0, 5.0, 4.0, 3.0), getResult(5, 5, ex)); // restrict=type1 - assertResult(3, Arrays.asList(9.0, 6.0), getResult(0, 2, "&restrict=type1", ex)); - assertResult(3, Arrays.asList(6.0, 3.0), getResult(1, 2, "&restrict=type1", ex)); - assertResult(3, Arrays.asList(3.0), getResult(2, 2, "&restrict=type1", ex)); - assertResult(3, new ArrayList<>(), getResult(3, 2, "&restrict=type1", ex)); + assertResult(3, List.of(9.0, 6.0), getResult(0, 2, "&restrict=type1", ex)); + assertResult(3, List.of(6.0, 3.0), getResult(1, 2, "&restrict=type1", ex)); + assertResult(3, List.of(3.0), getResult(2, 2, "&restrict=type1", ex)); + assertResult(3, List.of(), getResult(3, 2, "&restrict=type1", ex)); } @Test @@ -415,13 +406,13 @@ public class ClusterSearcherTestCase { com.yahoo.search.Result result = getResult(0, 2, extra, ex); assertEquals(3.0, result.hits().asList().get(0).getField("asc-score")); assertEquals(4.0, result.hits().asList().get(1).getField("asc-score")); - assertResult(6, Arrays.asList(3.0, 4.0), getResult(0, 2, extra, ex)); - assertResult(6, Arrays.asList(4.0, 6.0), getResult(1, 2, extra, ex)); - assertResult(6, Arrays.asList(6.0, 7.0), getResult(2, 2, extra, ex)); - assertResult(6, Arrays.asList(7.0, 9.0), getResult(3, 2, extra, ex)); - assertResult(6, Arrays.asList(9.0, 10.0), getResult(4, 2, extra, ex)); - assertResult(6, Arrays.asList(10.0), getResult(5, 2, extra, ex)); - assertResult(6, new ArrayList<>(), getResult(6, 2, extra, ex)); + assertResult(6, List.of(3.0, 4.0), getResult(0, 2, extra, ex)); + assertResult(6, List.of(4.0, 6.0), getResult(1, 2, extra, ex)); + assertResult(6, List.of(6.0, 7.0), getResult(2, 2, extra, ex)); + assertResult(6, List.of(7.0, 9.0), getResult(3, 2, extra, ex)); + assertResult(6, List.of(9.0, 10.0), getResult(4, 2, extra, ex)); + assertResult(6, List.of(10.0), getResult(5, 2, extra, ex)); + assertResult(6, List.of(), getResult(6, 2, extra, ex)); } private static ClusterSearcher createSearcher(String clusterName, Double maxQueryTimeout, Double maxQueryCacheTimeout, @@ -449,8 +440,7 @@ public class ClusterSearcherTestCase { Dispatcher dispatcher = new Dispatcher(new RpcResourcePool(dispatchConfig), ComponentId.createAnonymousComponentId("test-id"), dispatchConfig, - vipStatus, - new MockMetric()); + vipStatus); ComponentRegistry<Dispatcher> dispatchers = new ComponentRegistry<>(); dispatchers.register(new ComponentId("dispatcher." + clusterName), dispatcher); |