Merge pull request #18859 from vespa-engine/toregge/get-paged-setting-from-live-attribute-config

Get paged setting from live attribute config.

2 files changed, 11 insertions, 0 deletions

diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp
index 2ae28936476..c6876e95dc4 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp
@@ -43,6 +43,9 @@ assertDefaultAttribute(const AttributesConfig::Attribute &attribute,
     if (!EXPECT_FALSE(attribute.huge)) {
         return false;
     }
+    if (!EXPECT_FALSE(attribute.paged)) {
+        return false;
+    }
     if (!EXPECT_FALSE(attribute.enablebitvectors)) {
         return false;
     }
@@ -66,6 +69,9 @@ assertFastSearchAttribute(const AttributesConfig::Attribute &attribute,
     if (!EXPECT_FALSE(attribute.huge)) {
         return false;
     }
+    if (!EXPECT_FALSE(attribute.paged)) {
+        return false;
+    }
     if (!EXPECT_FALSE(attribute.enablebitvectors)) {
         return false;
     }
@@ -89,6 +95,9 @@ assertFastSearchAndMoreAttribute(const AttributesConfig::Attribute &attribute,
     if (!EXPECT_TRUE(attribute.huge)) {
         return false;
     }
+    if (!EXPECT_TRUE(attribute.paged)) {
+        return false;
+    }
     if (!EXPECT_TRUE(attribute.enablebitvectors)) {
         return false;
     }
@@ -233,6 +242,7 @@ setupFastSearchAndMoreAttribute(const vespalib::string name)
     attribute.name = name;
     attribute.fastsearch = true;
     attribute.huge = true;
+    attribute.paged = true;
     attribute.enablebitvectors = true;
     attribute.enableonlybitvector = true;
     return attribute;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp
index 7f6d47f4ae2..135854b9a2d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributesconfigscout.cpp
@@ -28,6 +28,7 @@ AttributesConfigScout::adjust(AttributesConfig::Attribute &attr,
     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;
     attr.distancemetric = liveAttr.distancemetric;