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 | |
parent | c2236fbba225babc5088cc9a06638b76b2183b69 (diff) |
Stop using summarymap config in backend.
28 files changed, 72 insertions, 357 deletions
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index a9c18d4b8a9..4c3acb403e8 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -9,7 +9,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/subscription/sourcespec.h> #include <vespa/document/base/testdocman.h> #include <vespa/document/config/documenttypes_config_fwd.h> @@ -140,7 +139,6 @@ public: indexschema, attributes, summary, - std::make_shared<SummarymapConfig>(), std::make_shared<JuniperrcConfig>(), _typeCfg, _repo, diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp index 4ff459a5a9d..f2433b2adf6 100644 --- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp @@ -3,7 +3,6 @@ #include <vespa/config-attributes.h> #include <vespa/config-indexschema.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/searchcore/proton/attribute/attribute_aspect_delayer.h> #include <vespa/searchcore/proton/common/i_document_type_inspector.h> #include <vespa/searchcore/proton/common/indexschema_inspector.h> @@ -21,18 +20,8 @@ using vespa::config::search::IndexschemaConfig; using vespa::config::search::IndexschemaConfigBuilder; using vespa::config::search::SummaryConfig; using vespa::config::search::SummaryConfigBuilder; -using vespa::config::search::SummarymapConfig; -using vespa::config::search::SummarymapConfigBuilder; using search::attribute::Config; -namespace std { - -ostream &operator<<(ostream &os, const SummarymapConfig::Override &override) { - return os << "{field=" << override.field << ", command=" << override.command << ", arguments=" << override.arguments << "}"; -} - -} - namespace vespa::config::search::internal { std::ostream &operator<<(std::ostream &os, const SummaryConfig::Classes::Fields &field) { @@ -104,61 +93,6 @@ AttributesConfig::Attribute make_fa(const AttributesConfig::Attribute &cfg) return attr; } -SummarymapConfig::Override make_attribute_override(const vespalib::string &name, const vespalib::string &source) -{ - SummarymapConfig::Override override; - override.field = name; - override.command = "attribute"; - override.arguments = source; - return override; -} - -SummarymapConfig::Override make_attribute_override(const vespalib::string &name) -{ - return make_attribute_override(name, name); -} - -SummarymapConfig::Override make_geopos_override(const vespalib::string &name) -{ - SummarymapConfig::Override override; - override.field = name; - override.command = "geopos"; - override.arguments = name; - return override; -} - -SummarymapConfig::Override make_attribute_combiner_override(const vespalib::string &name, const vespalib::string &source) -{ - SummarymapConfig::Override override; - override.field = name; - override.command = "attributecombiner"; - override.arguments = source; - return override; -} - -SummarymapConfig::Override make_attribute_combiner_override(const vespalib::string &name) -{ - return make_attribute_combiner_override(name, ""); -} - -SummarymapConfig::Override make_matched_attribute_elements_filter_override(const vespalib::string &name, const vespalib::string &source) -{ - SummarymapConfig::Override override; - override.field = name; - override.command = "matchedattributeelementsfilter"; - override.arguments = source; - return override; -} - -SummarymapConfig::Override make_matched_elements_filter_override(const vespalib::string &name, const vespalib::string &source) -{ - SummarymapConfig::Override override; - override.field = name; - override.command = "matchedelementsfilter"; - override.arguments = source; - return override; -} - SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string &type) { SummaryConfig::Classes::Fields field; @@ -187,13 +121,6 @@ SummaryConfig sCfg(std::vector<SummaryConfig::Classes::Fields> fields) return result; } -SummarymapConfig smCfg(std::vector<SummarymapConfig::Override> overrides) -{ - SummarymapConfigBuilder result; - result.override = overrides; - return result; -} - class MyInspector : public IDocumentTypeInspector { std::set<vespalib::string> _unchanged; @@ -236,11 +163,11 @@ public: field.name = name; _oldIndexSchema.indexfield.emplace_back(field); } - void setup(const AttributesConfig &oldAttributesConfig, const SummarymapConfig &oldSummarymapConfig, - const AttributesConfig &newAttributesConfig, const SummaryConfig &newSummaryConfig, const SummarymapConfig &newSummarymapConfig) { + void setup(const AttributesConfig &oldAttributesConfig, + const AttributesConfig &newAttributesConfig, const SummaryConfig &newSummaryConfig) { IndexschemaInspector indexschemaInspector(_oldIndexSchema); - _delayer.setup(oldAttributesConfig, oldSummarymapConfig, - newAttributesConfig, newSummaryConfig, newSummarymapConfig, + _delayer.setup(oldAttributesConfig, + newAttributesConfig, newSummaryConfig, indexschemaInspector, _inspector); } void assertAttributeConfig(const std::vector<AttributesConfig::Attribute> &exp) @@ -248,11 +175,6 @@ public: auto actConfig = _delayer.getAttributesConfig(); EXPECT_EQ(exp, actConfig->attribute); } - void assertSummarymapConfig(const std::vector<SummarymapConfig::Override> &exp) - { - auto summarymapConfig = _delayer.getSummarymapConfig(); - EXPECT_EQ(exp, summarymapConfig->override); - } void assertSummaryConfig(const std::vector<SummaryConfig::Classes::Fields> &exp) { auto summaryConfig = _delayer.getSummaryConfig(); @@ -263,87 +185,77 @@ public: TEST_F(DelayerTest, require_that_empty_config_is_ok) { - setup(attrCfg({}), smCfg({}), attrCfg({}), sCfg({}), smCfg({})); + setup(attrCfg({}), attrCfg({}), sCfg({})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({}); } TEST_F(DelayerTest, require_that_simple_attribute_config_is_ok) { - setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "integer", "attribute", "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged) { addFields({"a"}); - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a", "integer")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged_geopos_override) { addFields({"a"}); - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "geopos", "a")}), smCfg({make_geopos_override("a")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "geopos", "a")})); assertAttributeConfig({}); - assertSummarymapConfig({make_geopos_override("a")}); assertSummaryConfig({make_summary_field("a", "integer", "geopos", "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged_mapped_summary) { addFields({"a"}); - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a_mapped", "integer", "attribute", "a")}), smCfg({make_attribute_override("a_mapped", "a")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a_mapped", "integer", "attribute", "a")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a_mapped", "integer", "copy", "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_is_not_delayed_if_field_type_changed) { - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "integer", "attribute", "a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_if_field_type_is_unchanged) { addFields({"a"}); - setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({}), sCfg({make_summary_field("a", "integer")}), smCfg({})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "integer")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "integer", "attribute", "a")}); } TEST_F(DelayerTest, require_that_summary_map_override_is_removed_when_summary_aspect_is_removed_even_if_removing_attribute_aspect_is_delayed) { addFields({"a"}); - setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({}), sCfg({}), smCfg({})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummarymapConfig({}); assertSummaryConfig({}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_if_field_type_is_unchanged_gepos_override) { addFields({"a"}); - setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_geopos_override("a")}), attrCfg({}), sCfg({}), smCfg({})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummarymapConfig({}); assertSummaryConfig({}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_if_field_type_changed) { - setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({}), sCfg({make_summary_field("a", "integer")}), smCfg({})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "integer")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a", "integer")}); } @@ -351,85 +263,75 @@ TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_if_als { addFields({"a"}); addOldIndexField("a"); - setup(attrCfg({make_string_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({}), sCfg({make_summary_field("a", "string")}), smCfg({})); + setup(attrCfg({make_string_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "string")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a", "string")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_for_tensor_field) { addFields({"a"}); - setup(attrCfg({}), smCfg({}), - attrCfg({make_tensor_cfg("tensor(x[10])")}), sCfg({make_summary_field("a", "tensor", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({}), + attrCfg({make_tensor_cfg("tensor(x[10])")}), sCfg({make_summary_field("a", "tensor", "attribute", "a")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a", "tensor")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_for_tensor_field) { addFields({"a"}); - setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), smCfg({make_attribute_override("a")}), - attrCfg({}), sCfg({make_summary_field("a", "tensor")}), smCfg({})); + setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), + attrCfg({}), sCfg({make_summary_field("a", "tensor")})); assertAttributeConfig({make_tensor_cfg("tensor(x[10])")}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "tensor", "attribute", "a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_for_predicate) { addFields({"a"}); - setup(attrCfg({make_predicate_cfg(4)}), smCfg({}), attrCfg({}), sCfg({make_summary_field("a", "string")}), smCfg({})); + setup(attrCfg({make_predicate_cfg(4)}), attrCfg({}), sCfg({make_summary_field("a", "string")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a", "string")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_for_reference) { addFields({"a"}); - setup(attrCfg({make_reference_cfg()}), smCfg({}), attrCfg({}), sCfg({make_summary_field("a", "longstring")}), smCfg({})); + setup(attrCfg({make_reference_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "longstring")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("a", "longstring")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_false_true_edge) { addFields({"a"}); - setup(attrCfg({make_int32_sv_cfg()}), smCfg({make_attribute_override("a")}), attrCfg({make_fa(make_int32_sv_cfg())}), sCfg({make_summary_field("a", "integer", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({make_fa(make_int32_sv_cfg())}), sCfg({make_summary_field("a", "integer", "attribute", "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "integer", "attribute", "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_edge) { addFields({"a"}); - setup(attrCfg({make_fa(make_int32_sv_cfg())}), smCfg({make_attribute_override("a")}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({make_fa(make_int32_sv_cfg())}), attrCfg({make_int32_sv_cfg()}), sCfg({make_summary_field("a", "integer", "attribute", "a")})); assertAttributeConfig({make_fa(make_int32_sv_cfg())}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "integer", "attribute", "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_false_true_edge_on_tensor_attribute) { addFields({"a"}); - setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), smCfg({make_attribute_override("a")}), - attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), sCfg({make_summary_field("a", "tensor", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), sCfg({make_summary_field("a", "tensor", "attribute", "a")})); assertAttributeConfig({make_tensor_cfg("tensor(x[10])")}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "tensor", "attribute", "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_edge_on_tensor_attribute) { addFields({"a"}); - setup(attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), smCfg({make_attribute_override("a")}), - attrCfg({make_tensor_cfg("tensor(x[10])")}), sCfg({make_summary_field("a", "tensor", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), + attrCfg({make_tensor_cfg("tensor(x[10])")}), sCfg({make_summary_field("a", "tensor", "attribute", "a")})); assertAttributeConfig({make_fa(make_tensor_cfg("tensor(x[10])"))}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "tensor", "attribute", "a")}); } @@ -437,44 +339,39 @@ TEST_F(DelayerTest, require_that_fast_access_flag_change_is_not_delayed_true_fal { addFields({"a"}); addOldIndexField("a"); - setup(attrCfg({make_fa(make_string_sv_cfg())}), smCfg({make_attribute_override("a")}), attrCfg({make_string_sv_cfg()}), sCfg({make_summary_field("a", "string", "attribute", "a")}), smCfg({make_attribute_override("a")})); + setup(attrCfg({make_fa(make_string_sv_cfg())}), attrCfg({make_string_sv_cfg()}), sCfg({make_summary_field("a", "string", "attribute", "a")})); assertAttributeConfig({make_string_sv_cfg()}); - assertSummarymapConfig({make_attribute_override("a")}); assertSummaryConfig({make_summary_field("a", "string", "attribute", "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_not_delayed_if_field_type_is_changed) { - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), sCfg({make_summary_field("array", "jsonstring", "attributecombiner", "array")}), smCfg({make_attribute_combiner_override("array")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), sCfg({make_summary_field("array", "jsonstring", "attributecombiner", "array")})); assertAttributeConfig({make_int32_sv_cfg("array.a")}); - assertSummarymapConfig({make_attribute_combiner_override("array")}); assertSummaryConfig({make_summary_field("array", "jsonstring", "attributecombiner", "array")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_delayed_if_field_type_is_unchanged) { addFields({"array.a"}); - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), sCfg({make_summary_field("array", "jsonstring", "attributecombiner", "array")}), smCfg({make_attribute_combiner_override("array")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), sCfg({make_summary_field("array", "jsonstring", "attributecombiner", "array")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("array", "jsonstring")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_from_struct_field_is_not_delayed) { addFields({"array.a"}); - setup(attrCfg({make_int32_sv_cfg("array.a")}), smCfg({make_attribute_combiner_override("array")}), attrCfg({}), sCfg({make_summary_field("array", "jsonstring")}), smCfg({})); + setup(attrCfg({make_int32_sv_cfg("array.a")}), attrCfg({}), sCfg({make_summary_field("array", "jsonstring")})); assertAttributeConfig({}); - assertSummarymapConfig({}); assertSummaryConfig({make_summary_field("array", "jsonstring")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_delayed_if_field_type_is_unchanged_with_filtering_docsum) { addFields({"array.a"}); - setup(attrCfg({}), smCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), sCfg({make_summary_field("array", "jsonstring", "attributecombiner", "array"), make_summary_field("array_filtered", "jsonstring", "matchedattributeelementsfilter", "array")}), smCfg({make_attribute_combiner_override("array"), make_matched_attribute_elements_filter_override("array_filtered", "array")})); + setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), sCfg({make_summary_field("array", "jsonstring", "attributecombiner", "array"), make_summary_field("array_filtered", "jsonstring", "matchedattributeelementsfilter", "array")})); assertAttributeConfig({}); - assertSummarymapConfig({make_matched_elements_filter_override("array_filtered", "array")}); assertSummaryConfig({make_summary_field("array", "jsonstring"), make_summary_field("array_filtered", "jsonstring", "matchedelementsfilter", "array")}); } diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp index 6fff5998ee8..8bd1168d9af 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 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()); } }; diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index d5acd5d40bf..ce66e99d2fc 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()); diff --git a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp index f6c1518ba90..afd224c55de 100644 --- a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp +++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp @@ -27,7 +27,6 @@ #include <vespa/config-indexschema.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <map> #include <thread> @@ -58,7 +57,6 @@ struct DoctypeFixture { OnnxModelsConfigBuilder onnxModelsBuilder; IndexschemaConfigBuilder indexschemaBuilder; SummaryConfigBuilder summaryBuilder; - SummarymapConfigBuilder summarymapBuilder; JuniperrcConfigBuilder juniperrcBuilder; ImportedFieldsConfigBuilder importedFieldsBuilder; }; @@ -118,7 +116,6 @@ struct ConfigTestFixture { set.addBuilder(db.configid, &fixture->onnxModelsBuilder); set.addBuilder(db.configid, &fixture->indexschemaBuilder); set.addBuilder(db.configid, &fixture->summaryBuilder); - set.addBuilder(db.configid, &fixture->summarymapBuilder); set.addBuilder(db.configid, &fixture->juniperrcBuilder); set.addBuilder(db.configid, &fixture->importedFieldsBuilder); return dbConfig.emplace(std::make_pair(name, std::move(fixture))).first->second.get(); @@ -155,7 +152,6 @@ struct ConfigTestFixture { fixture->rankProfilesBuilder == dbc->getRankProfilesConfig() && fixture->indexschemaBuilder == dbc->getIndexschemaConfig() && fixture->summaryBuilder == dbc->getSummaryConfig() && - fixture->summarymapBuilder == dbc->getSummarymapConfig() && fixture->juniperrcBuilder == dbc->getJuniperrcConfig()); } @@ -272,7 +268,7 @@ TEST_FF("require that documentdb config manager subscribes for config", DocumentDBConfigManager(f1.configId + "/typea", "typea")) { f1.addDocType("typea"); const ConfigKeySet keySet(f2.createConfigKeySet()); - ASSERT_EQUAL(10u, keySet.size()); + ASSERT_EQUAL(9u, keySet.size()); ASSERT_TRUE(f1.configEqual("typea", getDocumentDBConfig(f1, f2))); } diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp index 3aa014ca8ac..07fd4ac6fc3 100644 --- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp +++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_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-bucketspaces.h> #include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/repo/documenttyperepo.h> @@ -54,7 +53,6 @@ struct DBConfigFixture { RankProfilesConfigBuilder _rankProfilesBuilder; IndexschemaConfigBuilder _indexschemaBuilder; SummaryConfigBuilder _summaryBuilder; - SummarymapConfigBuilder _summarymapBuilder; JuniperrcConfigBuilder _juniperrcBuilder; ImportedFieldsConfigBuilder _importedFieldsBuilder; @@ -97,7 +95,6 @@ struct DBConfigFixture { std::make_shared<IndexschemaConfig>(_indexschemaBuilder), std::make_shared<AttributesConfig>(_attributesBuilder), std::make_shared<SummaryConfig>(_summaryBuilder), - std::make_shared<SummarymapConfig>(_summarymapBuilder), std::make_shared<JuniperrcConfig>(_juniperrcBuilder), documentTypes, repo, diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp index b18ea6dd89d..2af8f909dac 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp @@ -20,7 +20,6 @@ #include <vespa/config-stor-distribution.h> #include <vespa/config-stor-filestor.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/config-upgrading.h> #include <vespa/config/common/configcontext.h> #include <vespa/document/bucket/bucketspace.h> @@ -121,7 +120,6 @@ using vespa::config::search::ImportedFieldsConfig; using vespa::config::search::IndexschemaConfig; using vespa::config::search::RankProfilesConfig; using vespa::config::search::SummaryConfig; -using vespa::config::search::SummarymapConfig; using vespa::config::search::core::ProtonConfig; using vespa::config::search::core::ProtonConfigBuilder; using vespa::config::search::summary::JuniperrcConfig; @@ -193,7 +191,6 @@ std::shared_ptr<DocumentDBConfig> make_document_db_config(std::shared_ptr<Docume indexschema, attributes, summary, - std::make_shared<SummarymapConfig>(), std::make_shared<JuniperrcConfig>(), document_types, repo, diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp index 2b954cf4dac..e25bc4c71d5 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.cpp @@ -3,7 +3,6 @@ #include "attribute_aspect_delayer.h" #include <vespa/config-attributes.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/searchcommon/attribute/attribute_utils.h> #include <vespa/searchcore/proton/common/config_hash.hpp> #include <vespa/searchcore/proton/common/i_document_type_inspector.h> @@ -19,8 +18,6 @@ using vespa::config::search::AttributesConfig; using vespa::config::search::AttributesConfigBuilder; using vespa::config::search::SummaryConfig; using vespa::config::search::SummaryConfigBuilder; -using vespa::config::search::SummarymapConfig; -using vespa::config::search::SummarymapConfigBuilder; namespace proton { @@ -42,39 +39,6 @@ bool willTriggerReprocessOnAttributeAspectRemoval(const search::attribute::Confi !indexschemaInspector.isStringIndex(name); } -class KnownSummaryFields -{ - vespalib::hash_set<vespalib::string> _fields; - -public: - KnownSummaryFields(const SummaryConfig &summaryConfig); - ~KnownSummaryFields(); - - bool known(const vespalib::string &fieldName) const { - return _fields.find(fieldName) != _fields.end(); - } -}; - -KnownSummaryFields::KnownSummaryFields(const SummaryConfig &summaryConfig) - : _fields() -{ - for (const auto &summaryClass : summaryConfig.classes) { - for (const auto &summaryField : summaryClass.fields) { - _fields.insert(summaryField.name); - } - } -} - -KnownSummaryFields::~KnownSummaryFields() = default; - -vespalib::string source_field(const SummarymapConfig::Override &override) { - if (override.arguments == "") { - return override.field; - } else { - return override.arguments; - } -} - vespalib::string source_field(const SummaryConfig::Classes::Fields& summary_field) { @@ -126,10 +90,6 @@ public: ~AttributeAspectConfigRewriter(); void calculate_delayed_attribute_aspects(); void build_attributes_config(AttributesConfigBuilder& attributes_config_builder) const; - void build_summary_map_config(const SummarymapConfig& old_summarymap_config, - const SummarymapConfig& new_summarymap_config, - const SummaryConfig& new_summary_config, - SummarymapConfigBuilder& summary_map_config_builder) const; void build_summary_config(const SummaryConfig& new_summary_config, SummaryConfigBuilder& summary_config_builder) const; }; @@ -259,43 +219,6 @@ AttributeAspectConfigRewriter::build_attributes_config(AttributesConfigBuilder& } void -AttributeAspectConfigRewriter::build_summary_map_config(const SummarymapConfig& old_summarymap_config, - const SummarymapConfig& new_summarymap_config, - const SummaryConfig& new_summary_config, - SummarymapConfigBuilder& summarymap_config_builder) const -{ - KnownSummaryFields knownSummaryFields(new_summary_config); - for (const auto &override : new_summarymap_config.override) { - if (override.command == attribute_dfw_string) { - if (!is_delayed_add_attribute_aspect(source_field(override))) { - summarymap_config_builder.override.emplace_back(override); - } - } else if (override.command == attribute_combiner_dfw_string) { - if (!is_delayed_add_attribute_aspect_struct(source_field(override))) { - summarymap_config_builder.override.emplace_back(override); - } - } else if (override.command == matched_attribute_elements_filter_dfw_string) { - if (!is_delayed_add_attribute_aspect_struct(source_field(override))) { - summarymap_config_builder.override.emplace_back(override); - } else { - SummarymapConfig::Override mutated_override(override); - mutated_override.command = matched_elements_filter_dfw_string; - summarymap_config_builder.override.emplace_back(mutated_override); - } - } else { - summarymap_config_builder.override.emplace_back(override); - } - } - for (const auto &override : old_summarymap_config.override) { - if (override.command == attribute_dfw_string) { - if (is_delayed_remove_attribute_aspect(source_field(override)) && knownSummaryFields.known(override.field)) { - summarymap_config_builder.override.emplace_back(override); - } - } - } -} - -void AttributeAspectConfigRewriter::build_summary_config(const SummaryConfig& new_summary_config, SummaryConfigBuilder& summary_config_builder) const { @@ -338,7 +261,6 @@ AttributeAspectConfigRewriter::build_summary_config(const SummaryConfig& new_sum AttributeAspectDelayer::AttributeAspectDelayer() : _attributesConfig(std::make_shared<AttributesConfigBuilder>()), - _summarymapConfig(std::make_shared<SummarymapConfigBuilder>()), _summaryConfig(std::make_shared<SummaryConfigBuilder>()) { } @@ -353,12 +275,6 @@ AttributeAspectDelayer::getAttributesConfig() const return _attributesConfig; } -std::shared_ptr<AttributeAspectDelayer::SummarymapConfig> -AttributeAspectDelayer::getSummarymapConfig() const -{ - return _summarymapConfig; -} - std::shared_ptr<AttributeAspectDelayer::SummaryConfig> AttributeAspectDelayer::getSummaryConfig() const { @@ -367,10 +283,8 @@ AttributeAspectDelayer::getSummaryConfig() const void AttributeAspectDelayer::setup(const AttributesConfig &oldAttributesConfig, - const SummarymapConfig &oldSummarymapConfig, const AttributesConfig &newAttributesConfig, const SummaryConfig &newSummaryConfig, - const SummarymapConfig &newSummarymapConfig, const IIndexschemaInspector &oldIndexschemaInspector, const IDocumentTypeInspector &inspector) { @@ -379,10 +293,6 @@ AttributeAspectDelayer::setup(const AttributesConfig &oldAttributesConfig, oldIndexschemaInspector, inspector); cfg_rewriter.build_attributes_config(*_attributesConfig); - cfg_rewriter.build_summary_map_config(oldSummarymapConfig, - newSummarymapConfig, - newSummaryConfig, - *_summarymapConfig); cfg_rewriter.build_summary_config(newSummaryConfig, *_summaryConfig); } diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h index 9d8338349d1..dc9bcd5d963 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h @@ -8,7 +8,6 @@ namespace document { class DocumentType; } namespace vespa::config::search::internal { class InternalAttributesType; class InternalIndexschemaType; -class InternalSummarymapType; class InternalSummaryType; } @@ -27,13 +26,10 @@ class AttributeAspectDelayer using AttributesConfig = const vespa::config::search::internal::InternalAttributesType; using DocumentType = document::DocumentType; using IndexschemaConfig = const vespa::config::search::internal::InternalIndexschemaType; - using SummarymapConfigBuilder = vespa::config::search::internal::InternalSummarymapType; - using SummarymapConfig = const vespa::config::search::internal::InternalSummarymapType; using SummaryConfigBuilder = vespa::config::search::internal::InternalSummaryType; using SummaryConfig = const vespa::config::search::internal::InternalSummaryType; std::shared_ptr<AttributesConfigBuilder> _attributesConfig; - std::shared_ptr<SummarymapConfigBuilder> _summarymapConfig; std::shared_ptr<SummaryConfigBuilder> _summaryConfig; public: @@ -45,15 +41,12 @@ public: * config before applying new config when system is online. */ void setup(const AttributesConfig &oldAttributesConfig, - const SummarymapConfig &oldSummarymapConfig, const AttributesConfig &newAttributesConfig, const SummaryConfig &newSummaryConfig, - const SummarymapConfig &newSummarymapConfig, const IIndexschemaInspector &oldIndexschemaInspector, const IDocumentTypeInspector &inspector); std::shared_ptr<AttributesConfig> getAttributesConfig() const; - std::shared_ptr<SummarymapConfig> getSummarymapConfig() const; std::shared_ptr<SummaryConfig> getSummaryConfig() const; }; diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h index 946c45feb4b..ef2b732a0a9 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h @@ -9,7 +9,6 @@ #include <vespa/searchsummary/docsummary/idocsumenvironment.h> #include <vespa/searchsummary/docsummary/resultconfig.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> namespace document { class DocumentTypeRepo; } @@ -45,7 +44,6 @@ public: virtual ISummarySetup::SP createSummarySetup(const vespa::config::search::SummaryConfig &summaryCfg, - const vespa::config::search::SummarymapConfig &summarymapCfg, const vespa::config::search::summary::JuniperrcConfig &juniperCfg, const std::shared_ptr<const document::DocumentTypeRepo> &repo, const std::shared_ptr<search::IAttributeManager> &attributeMgr) = 0; diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp index 6a0133e913d..031d8ec87dc 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp @@ -81,7 +81,7 @@ ShrinkSummaryLidSpaceFlushTarget::initFlush(SerialNum currentSerial, std::shared SummaryManager::SummarySetup:: SummarySetup(const vespalib::string & baseDir, const SummaryConfig & summaryCfg, - const SummarymapConfig & summarymapCfg, const JuniperrcConfig & juniperCfg, + const JuniperrcConfig & juniperCfg, search::IAttributeManager::SP attributeMgr, search::IDocumentStore::SP docStore, std::shared_ptr<const DocumentTypeRepo> repo) : _docsumWriter(), @@ -106,7 +106,6 @@ SummarySetup(const vespalib::string & baseDir, const SummaryConfig & summaryCfg, docsum_field_writer_factory.reset(); _docsumWriter = std::make_unique<DynamicDocsumWriter>(std::move(resultConfig), std::unique_ptr<KeywordExtractor>()); - (void) summarymapCfg; } IDocsumStore::UP @@ -117,11 +116,11 @@ SummaryManager::SummarySetup::createDocsumStore() ISummaryManager::ISummarySetup::SP -SummaryManager::createSummarySetup(const SummaryConfig & summaryCfg, const SummarymapConfig & summarymapCfg, +SummaryManager::createSummarySetup(const SummaryConfig & summaryCfg, const JuniperrcConfig & juniperCfg, const std::shared_ptr<const DocumentTypeRepo> &repo, const search::IAttributeManager::SP &attributeMgr) { - return std::make_shared<SummarySetup>(_baseDir, summaryCfg, summarymapCfg, + return std::make_shared<SummarySetup>(_baseDir, summaryCfg, juniperCfg, attributeMgr, _docStore, repo); } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h index 8be949a7351..be05498e19f 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h @@ -32,7 +32,6 @@ public: public: SummarySetup(const vespalib::string & baseDir, const vespa::config::search::SummaryConfig & summaryCfg, - const vespa::config::search::SummarymapConfig & summarymapCfg, const vespa::config::search::summary::JuniperrcConfig & juniperCfg, search::IAttributeManager::SP attributeMgr, search::IDocumentStore::SP docStore, @@ -71,7 +70,6 @@ public: ISummarySetup::SP createSummarySetup(const vespa::config::search::SummaryConfig &summaryCfg, - const vespa::config::search::SummarymapConfig &summarymapCfg, const vespa::config::search::summary::JuniperrcConfig &juniperCfg, const std::shared_ptr<const document::DocumentTypeRepo> &repo, const search::IAttributeManager::SP &attributeMgr) override; diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp index b93f96aa3bb..70478be5b70 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp @@ -6,7 +6,6 @@ #include <vespa/config-imported-fields.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/config/config-documenttypes.h> @@ -25,7 +24,6 @@ using namespace vespa::config::search; using document::DocumentTypeRepo; using search::TuneFileDocumentDB; using search::index::Schema; -using vespa::config::search::SummarymapConfig; using vespa::config::search::core::RankingConstantsConfig; using vespa::config::search::core::OnnxModelsConfig; @@ -39,7 +37,6 @@ DocumentDBConfig::ComparisonResult::ComparisonResult() indexschemaChanged(false), attributesChanged(false), summaryChanged(false), - summarymapChanged(false), juniperrcChanged(false), documenttypesChanged(false), documentTypeRepoChanged(false), @@ -62,7 +59,6 @@ DocumentDBConfig::DocumentDBConfig( const IndexschemaConfigSP &indexschema, const AttributesConfigSP &attributes, const SummaryConfigSP &summary, - const SummarymapConfigSP &summarymap, const JuniperrcConfigSP &juniperrc, const DocumenttypesConfigSP &documenttypes, const std::shared_ptr<const DocumentTypeRepo> &repo, @@ -85,7 +81,6 @@ DocumentDBConfig::DocumentDBConfig( _indexschema(indexschema), _attributes(attributes), _summary(summary), - _summarymap(summarymap), _juniperrc(juniperrc), _documenttypes(documenttypes), _repo(repo), @@ -113,7 +108,6 @@ DocumentDBConfig(const DocumentDBConfig &cfg) _indexschema(cfg._indexschema), _attributes(cfg._attributes), _summary(cfg._summary), - _summarymap(cfg._summarymap), _juniperrc(cfg._juniperrc), _documenttypes(cfg._documenttypes), _repo(cfg._repo), @@ -140,7 +134,6 @@ DocumentDBConfig::operator==(const DocumentDBConfig & rhs) const equals<IndexschemaConfig>(_indexschema.get(), rhs._indexschema.get()) && equals<AttributesConfig>(_attributes.get(), rhs._attributes.get()) && equals<SummaryConfig>(_summary.get(), rhs._summary.get()) && - equals<SummarymapConfig>(_summarymap.get(), rhs._summarymap.get()) && equals<JuniperrcConfig>(_juniperrc.get(), rhs._juniperrc.get()) && equals<DocumenttypesConfig>(_documenttypes.get(), rhs._documenttypes.get()) && _repo.get() == rhs._repo.get() && @@ -165,7 +158,6 @@ DocumentDBConfig::compare(const DocumentDBConfig &rhs) const retval.indexschemaChanged = !equals<IndexschemaConfig>(_indexschema.get(), rhs._indexschema.get()); retval.attributesChanged = !equals<AttributesConfig>(_attributes.get(), rhs._attributes.get()); retval.summaryChanged = !equals<SummaryConfig>(_summary.get(), rhs._summary.get()); - retval.summarymapChanged = !equals<SummarymapConfig>(_summarymap.get(), rhs._summarymap.get()); retval.juniperrcChanged = !equals<JuniperrcConfig>(_juniperrc.get(), rhs._juniperrc.get()); retval.documenttypesChanged = !equals<DocumenttypesConfig>(_documenttypes.get(), rhs._documenttypes.get()); retval.documentTypeRepoChanged = _repo.get() != rhs._repo.get(); @@ -191,7 +183,6 @@ DocumentDBConfig::valid() const _indexschema && _attributes && _summary && - _summarymap && _juniperrc && _documenttypes && _repo && @@ -252,7 +243,6 @@ DocumentDBConfig::makeReplayConfig(const SP & orig) o._indexschema, o._attributes, emptyConfig(o._summary), - std::make_shared<SummarymapConfig>(), o._juniperrc, o._documenttypes, o._repo, @@ -296,7 +286,6 @@ DocumentDBConfig::newFromAttributesConfig(const AttributesConfigSP &attributes) _indexschema, attributes, _summary, - _summarymap, _juniperrc, _documenttypes, _repo, @@ -318,13 +307,12 @@ DocumentDBConfig::makeDelayedAttributeAspectConfig(const SP &newCfg, const Docum AttributeAspectDelayer attributeAspectDelayer; DocumentTypeInspector inspector(*oldCfg.getDocumentType(), *n.getDocumentType()); IndexschemaInspector oldIndexschemaInspector(oldCfg.getIndexschemaConfig()); - attributeAspectDelayer.setup(oldCfg.getAttributesConfig(), oldCfg.getSummarymapConfig(), - n.getAttributesConfig(), n.getSummaryConfig(), n.getSummarymapConfig(), + attributeAspectDelayer.setup(oldCfg.getAttributesConfig(), + n.getAttributesConfig(), n.getSummaryConfig(), oldIndexschemaInspector, inspector); bool attributes_config_changed = (n.getAttributesConfig() != *attributeAspectDelayer.getAttributesConfig()); - bool summarymap_config_changed = (n.getSummarymapConfig() != *attributeAspectDelayer.getSummarymapConfig()); bool summary_config_changed = (n.getSummaryConfig() != *attributeAspectDelayer.getSummaryConfig()); - bool delayedAttributeAspects = (attributes_config_changed || summarymap_config_changed || summary_config_changed); + bool delayedAttributeAspects = (attributes_config_changed || summary_config_changed); if (!delayedAttributeAspects) { return newCfg; } @@ -337,7 +325,6 @@ DocumentDBConfig::makeDelayedAttributeAspectConfig(const SP &newCfg, const Docum n._indexschema, (attributes_config_changed ? attributeAspectDelayer.getAttributesConfig() : n._attributes), (summary_config_changed ? attributeAspectDelayer.getSummaryConfig() : n._summary), - (summarymap_config_changed ? attributeAspectDelayer.getSummarymapConfig() : n._summarymap), n._juniperrc, n._documenttypes, n._repo, diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h index 5f5887df6ea..4c814de0b90 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h @@ -18,7 +18,6 @@ namespace vespa::config::search::internal { class InternalSummaryType; - class InternalSummarymapType; class InternalRankProfilesType; class InternalAttributesType; class InternalIndexschemaType; @@ -46,7 +45,6 @@ public: bool indexschemaChanged; bool attributesChanged; bool summaryChanged; - bool summarymapChanged; bool juniperrcChanged; bool documenttypesChanged; bool documentTypeRepoChanged; @@ -67,7 +65,6 @@ public: ComparisonResult &setIndexschemaChanged(bool val) { indexschemaChanged = val; return *this; } ComparisonResult &setAttributesChanged(bool val) { attributesChanged = val; return *this; } ComparisonResult &setSummaryChanged(bool val) { summaryChanged = val; return *this; } - ComparisonResult &setSummarymapChanged(bool val) { summarymapChanged = val; return *this; } ComparisonResult &setJuniperrcChanged(bool val) { juniperrcChanged = val; return *this; } ComparisonResult &setDocumenttypesChanged(bool val) { documenttypesChanged = val; return *this; } ComparisonResult &setDocumentTypeRepoChanged(bool val) { documentTypeRepoChanged = val; return *this; } @@ -106,8 +103,6 @@ public: using OnnxModels = matching::OnnxModels; using SummaryConfig = const vespa::config::search::internal::InternalSummaryType; using SummaryConfigSP = std::shared_ptr<SummaryConfig>; - using SummarymapConfig = const vespa::config::search::internal::InternalSummarymapType; - using SummarymapConfigSP = std::shared_ptr<SummarymapConfig>; using JuniperrcConfig = const vespa::config::search::summary::internal::InternalJuniperrcType; using JuniperrcConfigSP = std::shared_ptr<JuniperrcConfig>; using DocumenttypesConfigSP = std::shared_ptr<DocumenttypesConfig>; @@ -126,7 +121,6 @@ private: IndexschemaConfigSP _indexschema; AttributesConfigSP _attributes; SummaryConfigSP _summary; - SummarymapConfigSP _summarymap; JuniperrcConfigSP _juniperrc; DocumenttypesConfigSP _documenttypes; std::shared_ptr<const document::DocumentTypeRepo> _repo; @@ -166,7 +160,6 @@ public: const IndexschemaConfigSP &indexschema, const AttributesConfigSP &attributes, const SummaryConfigSP &summary, - const SummarymapConfigSP &summarymap, const JuniperrcConfigSP &juniperrc, const DocumenttypesConfigSP &documenttypesConfig, const std::shared_ptr<const document::DocumentTypeRepo> &repo, @@ -197,7 +190,6 @@ public: const IndexschemaConfig &getIndexschemaConfig() const { return *_indexschema; } const AttributesConfig &getAttributesConfig() const { return *_attributes; } const SummaryConfig &getSummaryConfig() const { return *_summary; } - const SummarymapConfig &getSummarymapConfig() const { return *_summarymap; } const JuniperrcConfig &getJuniperrcConfig() const { return *_juniperrc; } const DocumenttypesConfig &getDocumenttypesConfig() const { return *_documenttypes; } const RankProfilesConfigSP &getRankProfilesConfigSP() const { return _rankProfiles; } @@ -207,7 +199,6 @@ public: const IndexschemaConfigSP &getIndexschemaConfigSP() const { return _indexschema; } const AttributesConfigSP &getAttributesConfigSP() const { return _attributes; } const SummaryConfigSP &getSummaryConfigSP() const { return _summary; } - const SummarymapConfigSP &getSummarymapConfigSP() const { return _summarymap; } const JuniperrcConfigSP &getJuniperrcConfigSP() const { return _juniperrc; } const DocumenttypesConfigSP &getDocumenttypesConfigSP() const { return _documenttypes; } const std::shared_ptr<const document::DocumentTypeRepo> &getDocumentTypeRepoSP() const { return _repo; } diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index 1aadc845744..5c8abc36440 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -11,7 +11,6 @@ #include <vespa/config/common/exceptions.h> #include <vespa/config-imported-fields.h> #include <vespa/config-rank-profiles.h> -#include <vespa/config-summarymap.h> #include <vespa/config/file_acquirer/file_acquirer.h> #include <vespa/config/common/configcontext.h> #include <vespa/config/retriever/configretriever.h> @@ -68,7 +67,6 @@ DocumentDBConfigManager::createConfigKeySet() const IndexschemaConfig, AttributesConfig, SummaryConfig, - SummarymapConfig, JuniperrcConfig, ImportedFieldsConfig>(_configId); return set; @@ -291,7 +289,6 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot using OnnxModelsConfigSP = std::shared_ptr<vespa::config::search::core::OnnxModelsConfig>; using IndexschemaConfigSP = DocumentDBConfig::IndexschemaConfigSP; using SummaryConfigSP = DocumentDBConfig::SummaryConfigSP; - using SummarymapConfigSP = DocumentDBConfig::SummarymapConfigSP; using JuniperrcConfigSP = DocumentDBConfig::JuniperrcConfigSP; using ImportedFieldsConfigSP = DocumentDBConfig::ImportedFieldsConfigSP; using MaintenanceConfigSP = DocumentDBConfig::MaintenanceConfigSP; @@ -392,7 +389,6 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot } AttributesConfigSP newAttributesConfig = snapshot.getConfig<AttributesConfig>(_configId); SummaryConfigSP newSummaryConfig = snapshot.getConfig<SummaryConfig>(_configId); - SummarymapConfigSP newSummarymapConfig = snapshot.getConfig<SummarymapConfig>(_configId); JuniperrcConfigSP newJuniperrcConfig = snapshot.getConfig<JuniperrcConfig>(_configId); ImportedFieldsConfigSP newImportedFieldsConfig = snapshot.getConfig<ImportedFieldsConfig>(_configId); @@ -411,7 +407,6 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot newIndexschemaConfig, filterImportedAttributes(newAttributesConfig), newSummaryConfig, - newSummarymapConfig, newJuniperrcConfig, _bootstrapConfig->getDocumenttypesConfigSP(), _bootstrapConfig->getDocumentTypeRepoSP(), diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp index 5ee70575916..c65114c43ac 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp @@ -10,7 +10,6 @@ #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/searchcommon/common/schemaconfigurer.h> #include <vespa/vespalib/io/fileutil.h> -#include <vespa/config-summarymap.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-attributes.h> #include <vespa/config-imported-fields.h> @@ -37,7 +36,6 @@ using vespa::config::search::AttributesConfig; using vespa::config::search::IndexschemaConfig; using vespa::config::search::RankProfilesConfig; using vespa::config::search::SummaryConfig; -using vespa::config::search::SummarymapConfig; using vespa::config::search::core::ProtonConfig; using vespa::config::search::summary::JuniperrcConfig; using vespa::config::content::core::BucketspacesConfig; @@ -210,6 +208,23 @@ getFileList(const vespalib::string &snapDir) return res; } +// add an empty file if it's not already present +void addEmptyFile(vespalib::string snapDir, vespalib::string fileName) +{ + vespalib::string path = snapDir + "/" + fileName; + if (access(path.c_str(), R_OK) == 0) { + // exists OK + return; + } + int fd = creat(path.c_str(), 0444); + if (fd < 0) { + LOG(error, "Could not create empty file '%s': %s", path.c_str(), strerror(errno)); + return; + } + fsync(fd); + close(fd); +} + } FileConfigManager::FileConfigManager(FNET_Transport & transport, @@ -274,9 +289,9 @@ FileConfigManager::saveConfig(const DocumentDBConfig &snapshot, SerialNum serial save(snapDir, snapshot.getIndexschemaConfig()); save(snapDir, snapshot.getAttributesConfig()); save(snapDir, snapshot.getSummaryConfig()); - save(snapDir, snapshot.getSummarymapConfig()); save(snapDir, snapshot.getJuniperrcConfig()); save(snapDir, snapshot.getDocumenttypesConfig()); + addEmptyFile(snapDir, "summarymap.cfg"); bool saveSchemaRes = snapshot.getSchemaSP()->saveToFile(snapDir + "/schema.txt"); assert(saveSchemaRes); @@ -296,26 +311,6 @@ FileConfigManager::saveConfig(const DocumentDBConfig &snapshot, SerialNum serial (void) saveValidSnap; } -namespace { - -// add an empty file if it's not already present -void addEmptyFile(vespalib::string snapDir, vespalib::string fileName) -{ - vespalib::string path = snapDir + "/" + fileName; - if (access(path.c_str(), R_OK) == 0) { - // exists OK - return; - } - int fd = creat(path.c_str(), 0444); - if (fd < 0) { - LOG(error, "Could not create empty file '%s': %s", path.c_str(), strerror(errno)); - return; - } - close(fd); -} - -} - void FileConfigManager::loadConfig(const DocumentDBConfig ¤tSnapshot, search::SerialNum serialNum, DocumentDBConfig::SP &loadedSnapshot) diff --git a/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp b/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp index 5ed190bad46..2705ef24455 100644 --- a/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp @@ -20,7 +20,6 @@ ReconfigParams::configHasChanged() const _res.indexschemaChanged || _res.attributesChanged || _res.summaryChanged || - _res.summarymapChanged || _res.juniperrcChanged || _res.documenttypesChanged || _res.documentTypeRepoChanged || @@ -59,7 +58,7 @@ ReconfigParams::shouldAttributeManagerChange() const bool ReconfigParams::shouldSummaryManagerChange() const { - return _res.summaryChanged || _res.summarymapChanged || _res.juniperrcChanged + return _res.summaryChanged || _res.juniperrcChanged || _res.documentTypeRepoChanged || _res.documenttypesChanged || _res.storeChanged; } diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp index a182c4efb5c..722771e4b86 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp @@ -222,7 +222,6 @@ SearchableDocSubDBConfigurer::reconfigure(const DocumentDBConfig &newConfig, ISummaryManager::SP sumMgr(_summaryMgr); ISummaryManager::ISummarySetup::SP newSumSetup = sumMgr->createSummarySetup(newConfig.getSummaryConfig(), - newConfig.getSummarymapConfig(), newConfig.getJuniperrcConfig(), newConfig.getDocumentTypeRepoSP(), attrMgr); diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h index b19ebb1546e..c6effd07cad 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h +++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.h @@ -18,7 +18,6 @@ #include <vespa/config-indexschema.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/vespalib/util/varholder.h> #include <vespa/searchcore/proton/reference/i_document_db_reference_resolver.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp index ca731d1e379..e366b2cbb2d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp @@ -202,7 +202,6 @@ SearchableDocSubDB::initViews(const DocumentDBConfig &configSnapshot, const Sess _rSearchView.set(SearchView::create( getSummaryManager()->createSummarySetup( configSnapshot.getSummaryConfig(), - configSnapshot.getSummarymapConfig(), configSnapshot.getJuniperrcConfig(), configSnapshot.getDocumentTypeRepoSP(), attrMgr), diff --git a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp index 5c57f821fe1..afaf62d043c 100644 --- a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp +++ b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp @@ -2,7 +2,6 @@ #include "documentdb_config_builder.h" #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-attributes.h> #include <vespa/config-indexschema.h> @@ -20,7 +19,6 @@ using vespa::config::search::RankProfilesConfig; using vespa::config::search::IndexschemaConfig; using vespa::config::search::AttributesConfig; using vespa::config::search::SummaryConfig; -using vespa::config::search::SummarymapConfig; using vespa::config::search::summary::JuniperrcConfig; using vespa::config::search::ImportedFieldsConfig; using proton::ThreadingServiceConfig; @@ -39,7 +37,6 @@ DocumentDBConfigBuilder::DocumentDBConfigBuilder(int64_t generation, _indexschema(std::make_shared<IndexschemaConfig>()), _attributes(std::make_shared<AttributesConfig>()), _summary(std::make_shared<SummaryConfig>()), - _summarymap(std::make_shared<SummarymapConfig>()), _juniperrc(std::make_shared<JuniperrcConfig>()), _documenttypes(std::make_shared<DocumenttypesConfig>()), _repo(std::make_shared<document::DocumentTypeRepo>()), @@ -64,7 +61,6 @@ DocumentDBConfigBuilder::DocumentDBConfigBuilder(const DocumentDBConfig &cfg) _indexschema(cfg.getIndexschemaConfigSP()), _attributes(cfg.getAttributesConfigSP()), _summary(cfg.getSummaryConfigSP()), - _summarymap(cfg.getSummarymapConfigSP()), _juniperrc(cfg.getJuniperrcConfigSP()), _documenttypes(cfg.getDocumenttypesConfigSP()), _repo(cfg.getDocumentTypeRepoSP()), @@ -93,7 +89,6 @@ DocumentDBConfigBuilder::build() _indexschema, _attributes, _summary, - _summarymap, _juniperrc, _documenttypes, _repo, diff --git a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h index c8d49c3175b..3f84128c7f9 100644 --- a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h +++ b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.h @@ -19,7 +19,6 @@ private: DocumentDBConfig::IndexschemaConfigSP _indexschema; DocumentDBConfig::AttributesConfigSP _attributes; DocumentDBConfig::SummaryConfigSP _summary; - DocumentDBConfig::SummarymapConfigSP _summarymap; DocumentDBConfig::JuniperrcConfigSP _juniperrc; DocumentDBConfig::DocumenttypesConfigSP _documenttypes; std::shared_ptr<const document::DocumentTypeRepo> _repo; @@ -74,10 +73,6 @@ public: _summary = summary_in; return *this; } - DocumentDBConfigBuilder &summarymap(const DocumentDBConfig::SummarymapConfigSP &summarymap_in) { - _summarymap = summarymap_in; - return *this; - } DocumentDBConfig::SP build(); }; diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_summary_manager.h b/searchcore/src/vespa/searchcore/proton/test/dummy_summary_manager.h index f826cbbe921..e2a6802b4e9 100644 --- a/searchcore/src/vespa/searchcore/proton/test/dummy_summary_manager.h +++ b/searchcore/src/vespa/searchcore/proton/test/dummy_summary_manager.h @@ -11,7 +11,6 @@ struct DummySummaryManager : public ISummaryManager { ISummarySetup::SP createSummarySetup(const vespa::config::search::SummaryConfig &, - const vespa::config::search::SummarymapConfig &, const vespa::config::search::summary::JuniperrcConfig &, const std::shared_ptr<const document::DocumentTypeRepo> &, const std::shared_ptr<search::IAttributeManager> &) override { diff --git a/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp b/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp index 1d7795d26dc..0eff397bc10 100644 --- a/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp +++ b/searchsummary/src/tests/docsummary/summary_field_converter/summary_field_converter_test.cpp @@ -40,7 +40,6 @@ #include <vespa/searchsummary/docsummary/linguisticsannotation.h> #include <vespa/searchsummary/docsummary/searchdatatype.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/config-summarymap.h> #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/data/slime/json_format.h> @@ -90,8 +89,6 @@ using document::WeightedSetFieldValue; using search::index::Schema; using search::linguistics::SPANTREE_NAME; using search::linguistics::TERM; -using vespa::config::search::SummarymapConfig; -using vespa::config::search::SummarymapConfigBuilder; using vespalib::Slime; using vespalib::eval::SimpleValue; using vespalib::eval::TensorSpec; @@ -136,7 +133,6 @@ FieldBlock::~FieldBlock() = default; class Test : public vespalib::TestApp { std::unique_ptr<Schema> _schema; - std::unique_ptr<SummarymapConfigBuilder> _summarymap; std::shared_ptr<const DocumentTypeRepo> _documentRepo; const DocumentType *_documentType; document::FixedTypeRepo _fixedRepo; @@ -286,7 +282,6 @@ Test::Main() void Test::setUp() { _schema = std::make_unique<Schema>(); - _summarymap = std::make_unique<SummarymapConfigBuilder>(); } void Test::tearDown() { diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index 09018538f95..2ccaf7f9bee 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -29,7 +29,6 @@ SearchEnvironment::Env::createKeySet(const vespalib::string & configId) config::ConfigKeySet set; set.add<vespa::config::search::vsm::VsmfieldsConfig, vespa::config::search::SummaryConfig, - vespa::config::search::SummarymapConfig, vespa::config::search::vsm::VsmsummaryConfig, vespa::config::search::summary::JuniperrcConfig, vespa::config::search::RankProfilesConfig>(configId); diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp index e220cf685e2..59f10df0837 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -127,7 +127,6 @@ VSMAdapter::configure(const VSMConfigSnapshot & snapshot) LOG(debug, "(re-)configure VSM (docsum tools)"); std::shared_ptr<SummaryConfig> summary(snapshot.getConfig<SummaryConfig>()); - std::shared_ptr<SummarymapConfig> summaryMap(snapshot.getConfig<SummarymapConfig>()); std::shared_ptr<VsmsummaryConfig> vsmSummary(snapshot.getConfig<VsmsummaryConfig>()); std::shared_ptr<JuniperrcConfig> juniperrc(snapshot.getConfig<JuniperrcConfig>()); @@ -137,7 +136,6 @@ VSMAdapter::configure(const VSMConfigSnapshot & snapshot) LOG(debug, "configureFields(): Size of cfg fieldspec: %zd", _fieldsCfg.get()->fieldspec.size()); // UlfC: debugging LOG(debug, "configureFields(): Size of cfg documenttype: %zd", _fieldsCfg.get()->documenttype.size()); // UlfC: debugging LOG(debug, "configureSummary(): Size of cfg classes: %zd", summary->classes.size()); // UlfC: debugging - LOG(debug, "configureSummaryMap(): Size of cfg override: %zd", summaryMap->override.size()); // UlfC: debugging LOG(debug, "configureVsmSummary(): Size of cfg fieldmap: %zd", vsmSummary->fieldmap.size()); // UlfC: debugging LOG(debug, "configureVsmSummary(): outputclass='%s'", vsmSummary->outputclass.c_str()); // UlfC: debugging diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index d6c1f55d092..c256264bbbf 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -5,7 +5,6 @@ #include <vespa/searchlib/query/base.h> #include <vespa/vsm/config/vsm-cfif.h> #include <vespa/config-summary.h> -#include <vespa/config-summarymap.h> #include <vespa/searchlib/common/featureset.h> #include <vespa/searchsummary/docsummary/docsumwriter.h> #include <vespa/searchsummary/docsummary/docsumstate.h> @@ -21,7 +20,6 @@ using search::docsummary::IDocsumEnvironment; using search::docsummary::JuniperProperties; using vespa::config::search::SummaryConfig; -using vespa::config::search::SummarymapConfig; using vespa::config::search::summary::JuniperrcConfig; namespace config { class ConfigSnapshot; } |