GC unused code.

2 files changed, 23 insertions, 15 deletions

diff --git a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
index 55c363a12c1..d3712d8a90f 100644
--- a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
+++ b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
@@ -45,8 +45,8 @@ StructDataType::UP
 make_struct_elem_type()
 {
     auto result = std::make_unique<StructDataType>("elem");
-    result->addField(Field("name", *DataType::STRING, true));
-    result->addField(Field("weight", *DataType::INT, true));
+    result->addField(Field("name", *DataType::STRING));
+    result->addField(Field("weight", *DataType::INT));
     return result;
 }
 
@@ -87,8 +87,8 @@ public:
           _array_type(*_elem_type),
           _map_type(*DataType::STRING, *_elem_type)
     {
-        _doc_type.addField(Field("array_in_doc", _array_type, true));
-        _doc_type.addField(Field("map_in_doc", _map_type, true));
+        _doc_type.addField(Field("array_in_doc", _array_type));
+        _doc_type.addField(Field("map_in_doc", _map_type));
 
         auto* result_class = _config.AddResultClass("test", class_id);
         EXPECT_TRUE(result_class->AddConfigEntry("array", ResType::RES_JSONSTRING));
@@ -96,7 +96,7 @@ public:
         EXPECT_TRUE(result_class->AddConfigEntry("map2", ResType::RES_JSONSTRING));
         _config.CreateEnumMaps();
     }
-    ~DocsumStore() {}
+    ~DocsumStore();
     const ResultConfig& get_config() const { return _config; }
     const ResultClass* get_class() const { return _config.LookupResultClass(class_id); }
     search::docsummary::DocsumStoreValue getMappedDocsum() {
@@ -130,6 +130,8 @@ public:
     }
 };
 
+DocsumStore::~DocsumStore() = default;
+
 class AttributeContext : public IAttributeContext {
 private:
     AttributeVector::SP _map_value_name;
@@ -141,7 +143,7 @@ public:
           _map2_key(AttributeFactory::createAttribute("map2.key", Config(BasicType::STRING, CollectionType::ARRAY))),
           _array_weight(AttributeFactory::createAttribute("array.weight", Config(BasicType::INT32, CollectionType::ARRAY)))
     {}
-    ~AttributeContext() {}
+    ~AttributeContext() override;
     const IAttributeVector* getAttribute(const string&) const override { abort(); }
     const IAttributeVector* getAttributeStableEnum(const string&) const override { abort(); }
     void getAttributeList(std::vector<const IAttributeVector*>& list) const override {
@@ -153,6 +155,8 @@ public:
     void asyncForAttribute(const vespalib::string&, std::unique_ptr<search::attribute::IAttributeFunctor>) const override { abort(); }
 };
 
+AttributeContext::~AttributeContext() = default;
+
 class StateCallback : public GetDocsumsStateCallback {
 private:
     std::string _field_name;
@@ -164,7 +168,7 @@ public:
           _matching_elements(matching_elements)
     {
     }
-    ~StateCallback() {}
+    ~StateCallback() override;
     void FillSummaryFeatures(GetDocsumsState*, IDocsumEnvironment*) override {}
     void FillRankFeatures(GetDocsumsState*, IDocsumEnvironment*) override {}
     std::unique_ptr<MatchingElements> fill_matching_elements(const MatchingElementsFields&) override {
@@ -174,6 +178,8 @@ public:
     }
 };
 
+StateCallback::~StateCallback() = default;
+
 class MatchedElementsFilterTest : public ::testing::Test {
 private:
     DocsumStore _doc_store;
@@ -201,7 +207,7 @@ public:
           _fields(std::make_shared<MatchingElementsFields>())
     {
     }
-    ~MatchedElementsFilterTest() {}
+    ~MatchedElementsFilterTest();
     std::unique_ptr<IDocsumFieldWriter> make_field_writer(const std::string& input_field_name) {
         int input_field_enum = _doc_store.get_config().GetFieldNameEnum().Lookup(input_field_name.c_str());
         return MatchedElementsFilterDFW::create(input_field_name, input_field_enum,
@@ -215,6 +221,8 @@ public:
     const MatchingElementsFields& fields() const { return *_fields; }
 };
 
+MatchedElementsFilterTest::~MatchedElementsFilterTest() = default;
+
 TEST_F(MatchedElementsFilterTest, filters_elements_in_array_field_value)
 {
     expect_filtered("array", {}, "[]");
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp b/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp
index 7d8bd2a7c22..f0518f378d1 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/searchdatatype.cpp
@@ -17,13 +17,13 @@ PrimitiveDataType STRING_OBJ(DataType::T_STRING);
 StructDataType URI_OBJ("url");
 
 const StructDataType *setUpUriType() {
-    URI_OBJ.addField(Field("all", STRING_OBJ, true));
-    URI_OBJ.addField(Field("scheme", STRING_OBJ, true));
-    URI_OBJ.addField(Field("host", STRING_OBJ, true));
-    URI_OBJ.addField(Field("port", STRING_OBJ, true));
-    URI_OBJ.addField(Field("path", STRING_OBJ, true));
-    URI_OBJ.addField(Field("query", STRING_OBJ, true));
-    URI_OBJ.addField(Field("fragment", STRING_OBJ, true));
+    URI_OBJ.addField(Field("all", STRING_OBJ));
+    URI_OBJ.addField(Field("scheme", STRING_OBJ));
+    URI_OBJ.addField(Field("host", STRING_OBJ));
+    URI_OBJ.addField(Field("port", STRING_OBJ));
+    URI_OBJ.addField(Field("path", STRING_OBJ));
+    URI_OBJ.addField(Field("query", STRING_OBJ));
+    URI_OBJ.addField(Field("fragment", STRING_OBJ));
     return &URI_OBJ;
 }
 }  // namespace