Merge branch 'master' into balder/topk-probability-four-nines

3 files changed, 18 insertions, 29 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 47f37a75fd0..a2d13439f4e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.xml;
 
+import com.yahoo.component.ComponentId;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
@@ -16,6 +17,7 @@ import org.w3c.dom.Element;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
 import static com.yahoo.test.Matchers.hasItemWithMethod;
+import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS;
 import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_BINDING;
 import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_CLASS;
 import static org.hamcrest.CoreMatchers.is;
@@ -127,6 +129,14 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         assertThat(chainsConfig().chains(), hasItemWithMethod("vespa", "id"));
     }
 
+    @Test
+    public void query_profiles_registry_component_is_added() {
+        createClusterWithOnlyDefaultChains();
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
+        var queryProfileRegistryId = ComponentId.fromString(QUERY_PROFILE_REGISTRY_CLASS);
+        assertTrue(cluster.getComponentsMap().containsKey(queryProfileRegistryId));
+    }
+
     private void createClusterWithOnlyDefaultChains() {
         Element containerElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 5633e1a5eec..5b3c42df869 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -310,14 +310,14 @@ public class ContentClusterTest extends ContentBaseTest {
             StorDistributormanagerConfig.Builder builder = new StorDistributormanagerConfig.Builder();
             model.getConfig(builder, "bar/distributor/0");
             StorDistributormanagerConfig config = new StorDistributormanagerConfig(builder);
-            assertEquals(false, config.inlinebucketsplitting());
+            assertFalse(config.inlinebucketsplitting());
         }
 
         {
             StorFilestorConfig.Builder builder = new StorFilestorConfig.Builder();
             model.getConfig(builder, "bar/storage/0");
             StorFilestorConfig config = new StorFilestorConfig(builder);
-            assertEquals(false, config.enable_multibit_split_optimalization());
+            assertFalse(config.enable_multibit_split_optimalization());
         }
     }
 
@@ -343,7 +343,7 @@ public class ContentClusterTest extends ContentBaseTest {
         List<String> sds = ApplicationPackageUtils.generateSchemas("type1", "type2");
         try{
             new VespaModelCreatorWithMockPkg(getHosts(), xml, sds).create();
-            assertTrue("Deploying without redundancy should fail", false);
+            fail("Deploying without redundancy should fail");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage(), e.getMessage().contains("missing required element \"redundancy\""));
         }
@@ -773,7 +773,7 @@ public class ContentClusterTest extends ContentBaseTest {
                 "  <documents/>" +
                 "  <engine>" +
                 "    <proton>" +
-                "      <flush-on-shutdown>" + Boolean.toString(flushOnShutdown) + "</flush-on-shutdown>" +
+                "      <flush-on-shutdown>" + flushOnShutdown + "</flush-on-shutdown>" +
                 "    </proton>" +
                 "  </engine>" +
                 "  <group>" +
@@ -944,27 +944,6 @@ public class ContentClusterTest extends ContentBaseTest {
         assertEquals(0.9999, cfg.topKProbability(), 0.0);
     }
 
-    private void verifyRoundRobinPropertiesControl(boolean useAdaptiveDispatch) {
-        VespaModel model = createEnd2EndOneNode(new TestProperties().setUseAdaptiveDispatch(useAdaptiveDispatch));
-
-        ContentCluster cc = model.getContentClusters().get("storage");
-        DispatchConfig.Builder builder = new DispatchConfig.Builder();
-        cc.getSearch().getConfig(builder);
-
-        DispatchConfig cfg = new DispatchConfig(builder);
-        if (useAdaptiveDispatch) {
-            assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, cfg.distributionPolicy());
-        } else {
-            assertEquals(DispatchConfig.DistributionPolicy.ROUNDROBIN, cfg.distributionPolicy());
-        }
-    }
-
-    @Test
-    public void default_dispatch_controlled_by_properties() {
-        verifyRoundRobinPropertiesControl(false);
-        verifyRoundRobinPropertiesControl(true);
-    }
-
     @Test
     public void default_topKprobability_controlled_by_properties() {
         verifyTopKProbabilityPropertiesControl();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
index b61159e2a4c..7c93b4ef02b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
@@ -65,7 +65,7 @@ public class ClusterTest {
         assertEquals(0.23, config.minWaitAfterCoverageFactor(), DELTA);
         assertEquals(0.58, config.maxWaitAfterCoverageFactor(), DELTA);
         assertEquals(2, config.searchableCopies());
-        assertEquals(DispatchConfig.DistributionPolicy.ROUNDROBIN, config.distributionPolicy());
+        assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy());
     }
 
     @Test
@@ -74,7 +74,7 @@ public class ClusterTest {
                                                    "",
                                                    joinLines(
                                                            "<max-hits-per-partition>77</max-hits-per-partition>",
-                                                           "<dispatch-policy>adaptive</dispatch-policy>",
+                                                           "<dispatch-policy>round-robin</dispatch-policy>",
                                                            "<min-group-coverage>13</min-group-coverage>",
                                                            "<min-active-docs-coverage>93</min-active-docs-coverage>",
                                                            "<top-k-probability>0.777</top-k-probability>"),
@@ -85,7 +85,7 @@ public class ClusterTest {
         assertEquals(2, config.searchableCopies());
         assertEquals(93.0, config.minActivedocsPercentage(), DELTA);
         assertEquals(13.0, config.minGroupCoverage(), DELTA);
-        assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy());
+        assertEquals(DispatchConfig.DistributionPolicy.ROUNDROBIN, config.distributionPolicy());
         assertEquals(77, config.maxHitsPerNode());
         assertEquals(0.777, config.topKProbability(), DELTA);
     }
@@ -98,7 +98,7 @@ public class ClusterTest {
         cluster.getSearch().getConfig(builder);
         DispatchConfig config = new DispatchConfig(builder);
         assertEquals(2, config.searchableCopies());
-        assertEquals(DispatchConfig.DistributionPolicy.ROUNDROBIN, config.distributionPolicy());
+        assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy());
         assertEquals(0, config.maxNodesDownPerGroup());
         assertEquals(1.0, config.maxWaitAfterCoverageFactor(), DELTA);
         assertEquals(0, config.minWaitAfterCoverageFactor(), DELTA);