diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-15 21:58:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-15 21:58:05 +0100 |
commit | a929c7ad20c4d4e3087b2b495fea7e1545e72979 (patch) | |
tree | a05616e936625c649a212c8144e3bcece7ff9d47 /searchlib/src/tests/attribute/attribute_test.cpp | |
parent | 0d2b7aef3fddce1d768d096ad973dc95ecc101e9 (diff) | |
parent | 4a98b48751984f0cb80c5bd6ad7924df41a219c5 (diff) |
Merge pull request #26454 from vespa-engine/balder/reduce-buffertype-structure-sizev8.140.13
- GC unused _activeBuffers member.
Diffstat (limited to 'searchlib/src/tests/attribute/attribute_test.cpp')
-rw-r--r-- | searchlib/src/tests/attribute/attribute_test.cpp | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp index 6699ea82f1f..7eb43faac18 100644 --- a/searchlib/src/tests/attribute/attribute_test.cpp +++ b/searchlib/src/tests/attribute/attribute_test.cpp @@ -6,15 +6,13 @@ #include <vespa/searchlib/attribute/attributefactory.h> #include <vespa/searchlib/attribute/attributeguard.h> #include <vespa/searchlib/attribute/attributememorysavetarget.h> -#include <vespa/searchlib/attribute/multienumattribute.hpp> #include <vespa/searchlib/attribute/multistringattribute.h> -#include <vespa/searchlib/attribute/multivalueattribute.hpp> #include <vespa/searchlib/attribute/predicate_attribute.h> -#include <vespa/searchlib/attribute/singlenumericpostattribute.h> #include <vespa/searchlib/attribute/singlestringattribute.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/test/weighted_type_test_utils.h> #include <vespa/searchlib/util/randomgenerator.h> +#include <vespa/searchcommon/attribute/config.h> #include <vespa/document/fieldvalue/intfieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/update/arithmeticvalueupdate.h> @@ -899,7 +897,7 @@ AttributeTest::testSingle() { AttributePtr ptr = createAttribute("sv-int32", Config(BasicType::INT32, CollectionType::SINGLE)); ptr->updateStat(true); - EXPECT_EQ(12288u, ptr->getStatus().getAllocated()); + EXPECT_EQ(4224u, ptr->getStatus().getAllocated()); EXPECT_EQ(0u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<IntegerAttribute, AttributeVector::largeint_t, int32_t>(ptr, values); @@ -914,7 +912,7 @@ AttributeTest::testSingle() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("sv-post-int32", cfg); ptr->updateStat(true); - EXPECT_EQ(347084u, ptr->getStatus().getAllocated()); + EXPECT_EQ(339020u, ptr->getStatus().getAllocated()); EXPECT_EQ(101852u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<IntegerAttribute, AttributeVector::largeint_t, int32_t>(ptr, values); @@ -926,7 +924,7 @@ AttributeTest::testSingle() { AttributePtr ptr = createAttribute("sv-float", Config(BasicType::FLOAT, CollectionType::SINGLE)); ptr->updateStat(true); - EXPECT_EQ(12288u, ptr->getStatus().getAllocated()); + EXPECT_EQ(4224u, ptr->getStatus().getAllocated()); EXPECT_EQ(0u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<FloatingPointAttribute, double, float>(ptr, values); @@ -936,7 +934,7 @@ AttributeTest::testSingle() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("sv-post-float", cfg); ptr->updateStat(true); - EXPECT_EQ(347084u, ptr->getStatus().getAllocated()); + EXPECT_EQ(339020, ptr->getStatus().getAllocated()); EXPECT_EQ(101852u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<FloatingPointAttribute, double, float>(ptr, values); @@ -949,7 +947,7 @@ AttributeTest::testSingle() { AttributePtr ptr = createAttribute("sv-string", Config(BasicType::STRING, CollectionType::SINGLE)); ptr->updateStat(true); - EXPECT_EQ(133096u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); + EXPECT_EQ(117256u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); EXPECT_EQ(53240u + sizeof_large_string_entry, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<StringAttribute, string, string>(ptr, values); @@ -959,7 +957,7 @@ AttributeTest::testSingle() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("sv-fs-string", cfg); ptr->updateStat(true); - EXPECT_EQ(361464u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); + EXPECT_EQ(345624u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); EXPECT_EQ(105176u + sizeof_large_string_entry, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<StringAttribute, string, string>(ptr, values); @@ -1091,8 +1089,8 @@ AttributeTest::testArray() { AttributePtr ptr = createAttribute("a-int32", Config(BasicType::INT32, CollectionType::ARRAY)); ptr->updateStat(true); - EXPECT_EQ(528304u, ptr->getStatus().getAllocated()); - EXPECT_EQ(512576u, ptr->getStatus().getUsed()); + EXPECT_EQ(512056u, ptr->getStatus().getAllocated()); + EXPECT_EQ(504392u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values); } @@ -1101,8 +1099,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("flags", cfg); ptr->updateStat(true); - EXPECT_EQ(528304u, ptr->getStatus().getAllocated()); - EXPECT_EQ(512576u, ptr->getStatus().getUsed()); + EXPECT_EQ(512056u, ptr->getStatus().getAllocated()); + EXPECT_EQ(504392u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values); } @@ -1111,8 +1109,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("a-fs-int32", cfg); ptr->updateStat(true); - EXPECT_EQ(885036u, ptr->getStatus().getAllocated()); - EXPECT_EQ(614448u, ptr->getStatus().getUsed()); + EXPECT_EQ(868788u, ptr->getStatus().getAllocated()); + EXPECT_EQ(606264u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values); } @@ -1130,8 +1128,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("a-fs-float", cfg); ptr->updateStat(true); - EXPECT_EQ(885036u, ptr->getStatus().getAllocated()); - EXPECT_EQ(614448u, ptr->getStatus().getUsed()); + EXPECT_EQ(868788u, ptr->getStatus().getAllocated()); + EXPECT_EQ(606264u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<FloatingPointAttribute, double>(ptr, values); } @@ -1142,8 +1140,8 @@ AttributeTest::testArray() { AttributePtr ptr = createAttribute("a-string", Config(BasicType::STRING, CollectionType::ARRAY)); ptr->updateStat(true); - EXPECT_EQ(649112u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); - EXPECT_EQ(565816u + sizeof_large_string_entry, ptr->getStatus().getUsed()); + EXPECT_EQ(625088u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); + EXPECT_EQ(557632u + sizeof_large_string_entry, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<StringAttribute, string>(ptr, values); } @@ -1152,8 +1150,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("afs-string", cfg); ptr->updateStat(true); - EXPECT_EQ(899416u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); - EXPECT_EQ(617772u + sizeof_large_string_entry, ptr->getStatus().getUsed()); + EXPECT_EQ(875392u + sizeof_large_string_entry, ptr->getStatus().getAllocated()); + EXPECT_EQ(609588u + sizeof_large_string_entry, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<StringAttribute, string>(ptr, values); } |