From 77bbfe491a64f9e9dee45b8a2312bb9ba4787485 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Fri, 23 Sep 2022 11:23:30 +0000 Subject: Remove summary field types from summary.def. They are no longer used in the backend. --- .../attribute_aspect_delayer_test.cpp | 96 +++++++++++----------- .../documentdbconfig/documentdbconfig_test.cpp | 1 - 2 files changed, 47 insertions(+), 50 deletions(-) (limited to 'searchcore/src/tests/proton') 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 d7904881e4d..6051ef6efb7 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 @@ -28,7 +28,7 @@ using namespace search::docsummary; namespace vespa::config::search::internal { std::ostream &operator<<(std::ostream &os, const SummaryConfig::Classes::Fields &field) { - return os << "{name=" << field.name << ", type=" << field.type << ", command=" << field.command << ", source=" << field.source << "}"; + return os << "{name=" << field.name << ", command=" << field.command << ", source=" << field.source << "}"; } } @@ -96,19 +96,17 @@ AttributesConfig::Attribute make_fa(const AttributesConfig::Attribute &cfg) return attr; } -SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string &type) +SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name) { SummaryConfig::Classes::Fields field; field.name = name; - field.type = type; return field; } -SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string &type, const vespalib::string& command, const vespalib::string& source) +SummaryConfig::Classes::Fields make_summary_field(const vespalib::string &name, const vespalib::string& command, const vespalib::string& source) { SummaryConfig::Classes::Fields field; field.name = name; - field.type = type; field.command = command; field.source = source; return field; @@ -196,52 +194,52 @@ TEST_F(DelayerTest, require_that_empty_config_is_ok) TEST_F(DelayerTest, require_that_simple_attribute_config_is_ok) { setup(attrCfg({make_int32_sv_cfg()}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged) { addFields({"a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "integer")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged_geopos_override) { addFields({"a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::geo_position, "a")})); + sCfg({make_summary_field("a", command::geo_position, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "integer", command::geo_position, "a")}); + assertSummaryConfig({make_summary_field("a", command::geo_position, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_if_field_type_is_unchanged_mapped_summary) { addFields({"a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a_mapped", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a_mapped", command::attribute, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a_mapped", "integer", command::copy, "a")}); + assertSummaryConfig({make_summary_field("a_mapped", command::copy, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_is_not_delayed_if_field_type_changed) { setup(attrCfg({}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::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()}), attrCfg({}), sCfg({make_summary_field("a", "integer")})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_summary_map_override_is_removed_when_summary_aspect_is_removed_even_if_removing_attribute_aspect_is_delayed) @@ -262,18 +260,18 @@ TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_if_field_t TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_if_field_type_changed) { - setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "integer")})); + setup(attrCfg({make_int32_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "integer")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_if_also_indexed) { addFields({"a"}); addOldIndexField("a"); - setup(attrCfg({make_string_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "string")})); + setup(attrCfg({make_string_sv_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "string")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_for_tensor_field) @@ -281,61 +279,61 @@ TEST_F(DelayerTest, require_that_adding_attribute_aspect_is_delayed_for_tensor_f addFields({"a"}); setup(attrCfg({}), attrCfg({make_tensor_cfg("tensor(x[10])")}), - sCfg({make_summary_field("a", "tensor", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "tensor")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_delayed_for_tensor_field) { addFields({"a"}); setup(attrCfg({make_tensor_cfg("tensor(x[10])")}), - attrCfg({}), sCfg({make_summary_field("a", "tensor")})); + attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({make_tensor_cfg("tensor(x[10])")}); - assertSummaryConfig({make_summary_field("a", "tensor", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_for_predicate) { addFields({"a"}); - setup(attrCfg({make_predicate_cfg(4)}), attrCfg({}), sCfg({make_summary_field("a", "string")})); + setup(attrCfg({make_predicate_cfg(4)}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "string")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_removing_attribute_aspect_is_not_delayed_for_reference) { addFields({"a"}); - setup(attrCfg({make_reference_cfg()}), attrCfg({}), sCfg({make_summary_field("a", "longstring")})); + setup(attrCfg({make_reference_cfg()}), attrCfg({}), sCfg({make_summary_field("a")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("a", "longstring")}); + assertSummaryConfig({make_summary_field("a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_false_true_edge) { addFields({"a"}); setup(attrCfg({make_int32_sv_cfg()}), attrCfg({make_fa(make_int32_sv_cfg())}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_int32_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::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())}), attrCfg({make_int32_sv_cfg()}), - sCfg({make_summary_field("a", "integer", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_fa(make_int32_sv_cfg())}); - assertSummaryConfig({make_summary_field("a", "integer", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::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])")}), attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), - sCfg({make_summary_field("a", "tensor", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_tensor_cfg("tensor(x[10])")}); - assertSummaryConfig({make_summary_field("a", "tensor", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_edge_on_tensor_attribute) @@ -343,9 +341,9 @@ TEST_F(DelayerTest, require_that_fast_access_flag_change_is_delayed_true_false_e addFields({"a"}); setup(attrCfg({make_fa(make_tensor_cfg("tensor(x[10])"))}), attrCfg({make_tensor_cfg("tensor(x[10])")}), - sCfg({make_summary_field("a", "tensor", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_fa(make_tensor_cfg("tensor(x[10])"))}); - assertSummaryConfig({make_summary_field("a", "tensor", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_fast_access_flag_change_is_not_delayed_true_false_edge_on_string_attribute_indexed_field) @@ -353,45 +351,45 @@ 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())}), attrCfg({make_string_sv_cfg()}), - sCfg({make_summary_field("a", "string", command::attribute, "a")})); + sCfg({make_summary_field("a", command::attribute, "a")})); assertAttributeConfig({make_string_sv_cfg()}); - assertSummaryConfig({make_summary_field("a", "string", command::attribute, "a")}); + assertSummaryConfig({make_summary_field("a", command::attribute, "a")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_not_delayed_if_field_type_is_changed) { setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), - sCfg({make_summary_field("array", "jsonstring", command::attribute_combiner, "array")})); + sCfg({make_summary_field("array", command::attribute_combiner, "array")})); assertAttributeConfig({make_int32_sv_cfg("array.a")}); - assertSummaryConfig({make_summary_field("array", "jsonstring", command::attribute_combiner, "array")}); + assertSummaryConfig({make_summary_field("array", command::attribute_combiner, "array")}); } TEST_F(DelayerTest, require_that_adding_attribute_aspect_to_struct_field_is_delayed_if_field_type_is_unchanged) { addFields({"array.a"}); setup(attrCfg({}), attrCfg({make_int32_sv_cfg("array.a")}), - sCfg({make_summary_field("array", "jsonstring", command::attribute_combiner, "array")})); + sCfg({make_summary_field("array", command::attribute_combiner, "array")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("array", "jsonstring")}); + assertSummaryConfig({make_summary_field("array")}); } 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")}), attrCfg({}), sCfg({make_summary_field("array", "jsonstring")})); + setup(attrCfg({make_int32_sv_cfg("array.a")}), attrCfg({}), sCfg({make_summary_field("array")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("array", "jsonstring")}); + assertSummaryConfig({make_summary_field("array")}); } 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({}), attrCfg({make_int32_sv_cfg("array.a")}), - sCfg({make_summary_field("array", "jsonstring", command::attribute_combiner, "array"), - make_summary_field("array_filtered", "jsonstring", command::matched_attribute_elements_filter, "array")})); + sCfg({make_summary_field("array", command::attribute_combiner, "array"), + make_summary_field("array_filtered", command::matched_attribute_elements_filter, "array")})); assertAttributeConfig({}); - assertSummaryConfig({make_summary_field("array", "jsonstring"), - make_summary_field("array_filtered", "jsonstring", command::matched_elements_filter, "array")}); + assertSummaryConfig({make_summary_field("array"), + make_summary_field("array_filtered", command::matched_elements_filter, "array")}); } } diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp index 619160ad0d9..c7e060a9269 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp @@ -108,7 +108,6 @@ public: if (hasField) { 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"; -- cgit v1.2.3