Merge branch 'master' into balder/unify-access-to-ranking-assets

3 files changed, 15 insertions, 26 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index e9fb8be9600..53ea1b3542f 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -209,7 +209,7 @@ Fixture::initViewSet(ViewSet &views)
     IndexSearchable::SP indexSearchable;
     auto matchView = std::make_shared<MatchView>(matchers, indexSearchable, attrMgr, sesMgr, metaStore, views._docIdLimit);
     views.searchView.set(SearchView::create
-                                 (summaryMgr->createSummarySetup(SummaryConfig(), SummarymapConfig(),
+                                 (summaryMgr->createSummarySetup(SummaryConfig(),
                                                                  JuniperrcConfig(), views.repo, attrMgr),
                                   std::move(matchView)));
     views.feedView.set(
@@ -554,7 +554,7 @@ TEST_F("require that reconfigure returns reprocessing initializer", FastAccessFi
 TEST_F("require that we can reconfigure summary manager", Fixture)
 {
     ViewPtrs o = f._views.getViewPtrs();
-    ReconfigParams params(CCR().setSummarymapChanged(true));
+    ReconfigParams params(CCR().setSummaryChanged(true));
     // Use new config snapshot == old config snapshot (only relevant for reprocessing)
     f._configurer->reconfigure(*createConfig(), *createConfig(), params, f._resolver);
 
@@ -641,7 +641,6 @@ TEST("require that maintenance controller should change if some config has chang
     TEST_DO(assertMaintenanceControllerShouldChange(CCR().setIndexschemaChanged(true)));
     TEST_DO(assertMaintenanceControllerShouldChange(CCR().setAttributesChanged(true)));
     TEST_DO(assertMaintenanceControllerShouldChange(CCR().setSummaryChanged(true)));
-    TEST_DO(assertMaintenanceControllerShouldChange(CCR().setSummarymapChanged(true)));
     TEST_DO(assertMaintenanceControllerShouldChange(CCR().setJuniperrcChanged(true)));
     TEST_DO(assertMaintenanceControllerShouldChange(CCR().setDocumenttypesChanged(true)));
     TEST_DO(assertMaintenanceControllerShouldChange(CCR().setDocumentTypeRepoChanged(true)));
@@ -677,7 +676,6 @@ TEST("require that subdbs should change if relevant config changed")
     TEST_DO(assertSubDbsShouldChange(CCR().setDocumenttypesChanged(true)));
     TEST_DO(assertSubDbsShouldChange(CCR().setDocumentTypeRepoChanged(true)));
     TEST_DO(assertSubDbsShouldChange(CCR().setSummaryChanged(true)));
-    TEST_DO(assertSubDbsShouldChange(CCR().setSummarymapChanged(true)));
     TEST_DO(assertSubDbsShouldChange(CCR().setJuniperrcChanged(true)));
     TEST_DO(assertSubDbsShouldChange(CCR().setAttributesChanged(true)));
     TEST_DO(assertSubDbsShouldChange(CCR().setImportedFieldsChanged(true)));
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
index fd47cc9b264..c2d3da1b4f6 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
@@ -7,7 +7,6 @@
 #include <vespa/searchcore/proton/test/documentdb_config_builder.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/config-summary.h>
-#include <vespa/config-summarymap.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/datatype.h>
@@ -100,7 +99,7 @@ public:
         _builder.attributes(make_shared<AttributesConfig>(builder));
         return *this;
     }
-    MyConfigBuilder &addSummary(bool hasField) {
+    MyConfigBuilder &addSummary(bool hasField, bool has_attribute) {
         SummaryConfigBuilder builder;
         builder.defaultsummaryid = 0;
         builder.classes.resize(1);
@@ -110,18 +109,14 @@ public:
             builder.classes.back().fields.resize(1);
             builder.classes.back().fields.back().name = "my_attribute";
             builder.classes.back().fields.back().type = "integer";
+            if (has_attribute) {
+                builder.classes.back().fields.back().command = "attribute";
+                builder.classes.back().fields.back().source = "my_attribute";
+            }
         }
         _builder.summary(make_shared<SummaryConfig>(builder));
         return *this;
     }
-    MyConfigBuilder &addSummarymap() {
-        SummarymapConfigBuilder builder;
-        builder.override.resize(1);
-        builder.override.back().field = "my_attribute";
-        builder.override.back().command = "attribute";
-        _builder.summarymap(make_shared<SummarymapConfig>(builder));
-        return *this;
-    }
     ConfigSP build() {
         return _builder.build();
     }
@@ -142,15 +137,14 @@ struct Fixture {
           replayCfg(),
           nullCfg()
     {
-        basicCfg = MyConfigBuilder(4, schema, repo).addAttribute().addSummary(false).build();
+        basicCfg = MyConfigBuilder(4, schema, repo).addAttribute().addSummary(false, false).build();
         fullCfg = MyConfigBuilder(4, schema, repo).addAttribute().
                                                    addRankProfile().
                                                    addRankingConstant().
                                                    addRankingExpression().
                                                    addOnnxModel().
                                                    addImportedField().
-                                                   addSummary(true).
-                                                   addSummarymap().
+                                                   addSummary(true, true).
                                                    build();
         replayCfg = DocumentDBConfig::makeReplayConfig(fullCfg);
     }
@@ -185,30 +179,29 @@ struct DelayAttributeAspectFixture {
                                                    addRankingExpression().
                                                    addOnnxModel().
                                                    addImportedField().
-                                                   addSummary(true).
-                                                   addSummarymap().
+                                                   addSummary(true, true).
                                                    build();
         noAttrCfg = MyConfigBuilder(4, schema, makeDocTypeRepo(hasDocField)).addRankProfile().
                          addRankingConstant().
                          addRankingExpression().
                          addOnnxModel().
                          addImportedField().
-                         addSummary(hasDocField).
+                         addSummary(hasDocField, false).
                          build();
     }
 
     void assertDelayedConfig(const DocumentDBConfig &testCfg) {
         EXPECT_FALSE(noAttrCfg->getAttributesConfig() == testCfg.getAttributesConfig());
-        EXPECT_FALSE(noAttrCfg->getSummarymapConfig() == testCfg.getSummarymapConfig());
+        EXPECT_FALSE(noAttrCfg->getSummaryConfig() == testCfg.getSummaryConfig());
         EXPECT_TRUE(attrCfg->getAttributesConfig() == testCfg.getAttributesConfig());
-        EXPECT_TRUE(attrCfg->getSummarymapConfig() == testCfg.getSummarymapConfig());
+        EXPECT_TRUE(attrCfg->getSummaryConfig() == testCfg.getSummaryConfig());
         EXPECT_TRUE(testCfg.getDelayedAttributeAspects());
     }
     void assertNotDelayedConfig(const DocumentDBConfig &testCfg) {
         EXPECT_TRUE(noAttrCfg->getAttributesConfig() == testCfg.getAttributesConfig());
-        EXPECT_TRUE(noAttrCfg->getSummarymapConfig() == testCfg.getSummarymapConfig());
+        EXPECT_TRUE(noAttrCfg->getSummaryConfig() == testCfg.getSummaryConfig());
         EXPECT_FALSE(attrCfg->getAttributesConfig() == testCfg.getAttributesConfig());
-        EXPECT_FALSE(attrCfg->getSummarymapConfig() == testCfg.getSummarymapConfig());
+        EXPECT_FALSE(attrCfg->getSummaryConfig() == testCfg.getSummaryConfig());
         EXPECT_FALSE(testCfg.getDelayedAttributeAspects());
     }
 };
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 3f254558740..e1ec5916291 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -6,7 +6,6 @@
 #include <vespa/config-indexschema.h>
 #include <vespa/config-rank-profiles.h>
 #include <vespa/config-summary.h>
-#include <vespa/config-summarymap.h>
 #include <vespa/config/helper/configgetter.hpp>
 #include <vespa/document/config/documenttypes_config_fwd.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -89,7 +88,6 @@ assertEqualSnapshot(const DocumentDBConfig &exp, const DocumentDBConfig &act)
     EXPECT_TRUE(exp.getIndexschemaConfig() == act.getIndexschemaConfig());
     EXPECT_TRUE(exp.getAttributesConfig() == act.getAttributesConfig());
     EXPECT_TRUE(exp.getSummaryConfig() == act.getSummaryConfig());
-    EXPECT_TRUE(exp.getSummarymapConfig() == act.getSummarymapConfig());
     EXPECT_TRUE(exp.getJuniperrcConfig() == act.getJuniperrcConfig());
     EXPECT_TRUE(exp.getImportedFieldsConfig() == act.getImportedFieldsConfig());
     EXPECT_EQUAL(0u, exp.getImportedFieldsConfig().attribute.size());