summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-06-03 11:16:07 +0000
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:28 +0200
commitbac717c8785376988f866ea1f819d4d287382a26 (patch)
tree2906a9a8f6467daba6ff3d1272c5e8bd6096f26d /searchcore
parentff4a41bcdb1b8f2bbc009203a7c7088a7e7e5dca (diff)
Remove 'attribute: huge' from config def file and C++ code.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/common/cachedselect_test.cpp2
-rw-r--r--searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp10
-rw-r--r--searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp1
3 files changed, 1 insertions, 12 deletions
diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp
index 2fd798cd8fd..64c95c36350 100644
--- a/searchcore/src/tests/proton/common/cachedselect_test.cpp
+++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp
@@ -190,7 +190,7 @@ public:
MyIntAv(const string &name)
: SvIntAttr(name, Config(BasicType::INT32,
CollectionType::SINGLE,
- true, false)),
+ true)),
_gets(0)
{
}
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp
index 4350ebc0ee2..b8579d66c5f 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp
@@ -40,9 +40,6 @@ assertDefaultAttribute(const AttributesConfig::Attribute &attribute,
if (!EXPECT_FALSE(attribute.fastsearch)) {
return false;
}
- if (!EXPECT_FALSE(attribute.huge)) {
- return false;
- }
if (!EXPECT_FALSE(attribute.paged)) {
return false;
}
@@ -66,9 +63,6 @@ assertFastSearchAttribute(const AttributesConfig::Attribute &attribute,
if (!EXPECT_TRUE(attribute.fastsearch)) {
return false;
}
- if (!EXPECT_FALSE(attribute.huge)) {
- return false;
- }
if (!EXPECT_FALSE(attribute.paged)) {
return false;
}
@@ -92,9 +86,6 @@ assertFastSearchAndMoreAttribute(const AttributesConfig::Attribute &attribute,
if (!EXPECT_TRUE(attribute.fastsearch)) {
return false;
}
- if (!EXPECT_TRUE(attribute.huge)) {
- return false;
- }
if (!EXPECT_TRUE(attribute.paged)) {
return false;
}
@@ -241,7 +232,6 @@ setupFastSearchAndMoreAttribute(const vespalib::string name)
AttributesConfig::Attribute attribute;
attribute.name = name;
attribute.fastsearch = true;
- attribute.huge = true;
attribute.paged = true;
attribute.enablebitvectors = true;
attribute.enableonlybitvector = true;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp
index e21230a1d58..e5a087e1bf2 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp
@@ -28,7 +28,6 @@ AttributesConfigScout::adjust(AttributesConfig::Attribute &attr,
attr.enablebitvectors = liveAttr.enablebitvectors;
attr.enableonlybitvector = liveAttr.enableonlybitvector;
attr.fastsearch = liveAttr.fastsearch;
- attr.huge = liveAttr.huge;
attr.paged = liveAttr.paged;
// Note: Predicate attributes only handle changes for the dense-posting-list-threshold config.
attr.densepostinglistthreshold = liveAttr.densepostinglistthreshold;