diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-09-06 16:05:26 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-09-06 16:05:26 +0200 |
commit | c5f07cf368cae454e0db4cae3c8a77be13f89526 (patch) | |
tree | 44262e53033ec245e9a8a7b6b5cec33ea6113215 /searchcore/src/tests/proton/documentdb/documentdbconfig | |
parent | c2236fbba225babc5088cc9a06638b76b2183b69 (diff) |
Stop using summarymap config in backend.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/documentdbconfig')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp index 47e9568e086..c3b117f300a 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/config/documenttypes_config_fwd.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> @@ -101,7 +100,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); @@ -111,18 +110,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(); } @@ -143,15 +138,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); } @@ -186,30 +180,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()); } }; |