- Use unique_ptr to hide FuzzyMatcher to make most common SearchContext smaller.

- GC unused stringattribute files.

2 files changed, 8 insertions, 10 deletions

diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
index 3fa74b78d2a..9b6187bcc77 100644
--- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
+++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
@@ -7,7 +7,6 @@
 #include <vespa/searchlib/attribute/configconverter.h>
 #include <vespa/searchlib/attribute/multinumericattribute.h>
 #include <vespa/searchlib/attribute/multinumericattribute.hpp>
-#include <vespa/searchlib/attribute/stringattribute.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/log/log.h>
@@ -31,7 +30,7 @@ using TestAttributeBase = MultiValueNumericAttribute< IntegerAttributeTemplate<i
 class TestAttribute : public TestAttributeBase
 {
 public:
-    TestAttribute(const std::string &name)
+    explicit TestAttribute(const std::string &name)
         : TestAttributeBase(name)
     {}
 
@@ -44,18 +43,17 @@ public:
 
 TEST("Test attribute guards")
 {
-    AttributeVector::SP vec(new TestAttribute("mvint") );
-    TestAttribute * v = static_cast<TestAttribute *> (vec.get());
+    auto v = std::make_shared<TestAttribute>("mvint");
     EXPECT_EQUAL(v->getGen(), unsigned(0));
     EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
     EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
     {
-        AttributeGuard g0(vec);
+        AttributeGuard g0(v);
         EXPECT_EQUAL(v->getGen(), unsigned(0));
         EXPECT_EQUAL(v->getRefCount(0), unsigned(1));
         EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
         {
-            AttributeGuard g1(vec);
+            AttributeGuard g1(v);
             EXPECT_EQUAL(v->getGen(), unsigned(0));
             EXPECT_EQUAL(v->getRefCount(0), unsigned(2));
             EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
@@ -72,14 +70,14 @@ TEST("Test attribute guards")
     EXPECT_EQUAL(v->getRefCount(1), unsigned(0));
     EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
     {
-        AttributeGuard g0(vec);
+        AttributeGuard g0(v);
         EXPECT_EQUAL(v->getGen(), unsigned(1));
         EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
         EXPECT_EQUAL(v->getRefCount(1), unsigned(1));
         EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
         {
             v->incGen();
-            AttributeGuard g1(vec);
+            AttributeGuard g1(v);
             EXPECT_EQUAL(v->getGen(), unsigned(2));
             EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
             EXPECT_EQUAL(v->getRefCount(1), unsigned(1));
diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
index 96039bee15b..2289000a273 100644
--- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
+++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
@@ -386,8 +386,8 @@ testSingleValue(Attribute & svsa, Config &cfg)
 TEST("testSingleValue")
 {
     EXPECT_EQUAL(24u, sizeof(SearchContext));
-    EXPECT_EQUAL(96u, sizeof(StringSearchHelper));
-    EXPECT_EQUAL(144u, sizeof(attribute::SingleStringEnumSearchContext));
+    EXPECT_EQUAL(32u, sizeof(StringSearchHelper));
+    EXPECT_EQUAL(80u, sizeof(attribute::SingleStringEnumSearchContext));
     {
         Config cfg(BasicType::STRING, CollectionType::SINGLE);
         SingleValueStringAttribute svsa("svsa", cfg);