aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-08-12 13:41:15 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-08-12 13:41:15 +0000
commit3efc9cfdde773167f3a8385dc7ccf9b7235d3acb (patch)
tree0a0cae7eb7c0053d83ed5c5bbc0edd0200a3d0ab /searchlib
parent76a6060a8d840f4babc6ad613b6dd9d13f6d9e8d (diff)
swappable -> paged
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp6
-rw-r--r--searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/attribute/configconverter.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
index c6e6ac2f8ba..877b5b9e427 100644
--- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
+++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
@@ -238,9 +238,9 @@ TEST("require that config can be converted")
}
{
CACA a;
- EXPECT_TRUE(!CC::convert(a).swappable());
- a.swappable = true;
- EXPECT_TRUE(CC::convert(a).swappable());
+ EXPECT_TRUE(!CC::convert(a).paged());
+ a.paged = true;
+ EXPECT_TRUE(CC::convert(a).paged());
}
{ // tensor
CACA a;
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
index 56233722f69..605fcb538d6 100644
--- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
+++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
@@ -335,7 +335,7 @@ struct Fixture {
_denseTensors = true;
}
if (_traits.use_mmap_file_allocator) {
- _cfg.setSwappable(true);
+ _cfg.setPaged(true);
}
if (_traits.use_mock_index) {
_index_factory = std::make_unique<MockNearestNeighborIndexFactory>();
@@ -1010,7 +1010,7 @@ TEST_F("NN blueprint handles strong filter triggering brute force search", Neare
EXPECT_FALSE(bp->may_approximate());
}
-TEST("Dense tensor attribute with swappable flag uses mmap file allocator")
+TEST("Dense tensor attribute with paged flag uses mmap file allocator")
{
vespalib::string basedir("mmap-file-allocator-factory-dir");
vespalib::alloc::MmapFileAllocatorFactory::instance().setup(basedir);
diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
index d4b37dc5c9d..625502ee32b 100644
--- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
@@ -108,7 +108,7 @@ ConfigConverter::convert(const AttributesConfig::Attribute & cfg)
retval.setIsFilter(cfg.enableonlybitvector);
retval.setFastAccess(cfg.fastaccess);
retval.setMutable(cfg.ismutable);
- retval.setSwappable(cfg.swappable);
+ retval.setPaged(cfg.paged);
predicateParams.setArity(cfg.arity);
predicateParams.setBounds(cfg.lowerbound, cfg.upperbound);
predicateParams.setDensePostingListThreshold(cfg.densepostinglistthreshold);
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
index 8cc4acefd0f..d0943b372be 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
@@ -125,7 +125,7 @@ DenseTensorAttribute::memory_usage() const
DenseTensorAttribute::DenseTensorAttribute(vespalib::stringref baseFileName, const Config& cfg,
const NearestNeighborIndexFactory& index_factory)
: TensorAttribute(baseFileName, cfg, _denseTensorStore),
- _denseTensorStore(cfg.tensorType(), make_memory_allocator(getName(), cfg.swappable())),
+ _denseTensorStore(cfg.tensorType(), make_memory_allocator(getName(), cfg.paged())),
_index()
{
if (cfg.hnsw_index_params().has_value()) {