summaryrefslogtreecommitdiffstats
path: root/searchlib/src
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2020-07-06 13:11:00 +0000
committerGeir Storli <geirst@verizonmedia.com>2020-07-06 13:11:00 +0000
commit7c281a8611298f6af6a2b600e79b163b6731b921 (patch)
treecaaa2efbe567b756cc779b06a145ac7101c51609 /searchlib/src
parent9d986b0573f8f21ccf00c2296de92c7e8cf99be7 (diff)
Make indexing to hnsw index multi-threaded as default.
Diffstat (limited to 'searchlib/src')
-rw-r--r--searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
index 1191a7aa2e2..721e7e1c805 100644
--- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
+++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
@@ -295,6 +295,16 @@ AttributeManagerTest::testConfigConvert()
auto out = ConfigConverter::convert(a);
EXPECT_TRUE(out.distance_metric() == DistanceMetric::InnerProduct);
}
+ { // hnsw index default params (enabled)
+ CACA a;
+ a.index.hnsw.enabled = true;
+ auto out = ConfigConverter::convert(a);
+ EXPECT_TRUE(out.hnsw_index_params().has_value());
+ const auto& params = out.hnsw_index_params().value();
+ EXPECT_EQUAL(16u, params.max_links_per_node());
+ EXPECT_EQUAL(200u, params.neighbors_to_explore_at_insert());
+ EXPECT_TRUE(params.multi_threaded_indexing());
+ }
{ // hnsw index params (enabled)
auto dm_in = AttributesConfig::Attribute::Distancemetric::ANGULAR;
auto dm_out = DistanceMetric::Angular;
@@ -303,16 +313,15 @@ AttributeManagerTest::testConfigConvert()
a.index.hnsw.enabled = true;
a.index.hnsw.maxlinkspernode = 32;
a.index.hnsw.neighborstoexploreatinsert = 300;
- a.index.hnsw.multithreadedindexing = true;
+ a.index.hnsw.multithreadedindexing = false;
auto out = ConfigConverter::convert(a);
EXPECT_TRUE(out.hnsw_index_params().has_value());
const auto& params = out.hnsw_index_params().value();
EXPECT_EQUAL(32u, params.max_links_per_node());
EXPECT_EQUAL(300u, params.neighbors_to_explore_at_insert());
EXPECT_TRUE(params.distance_metric() == dm_out);
- EXPECT_TRUE(params.multi_threaded_indexing());
+ EXPECT_FALSE(params.multi_threaded_indexing());
}
-
{ // hnsw index params (disabled)
CACA a;
a.index.hnsw.enabled = false;