diff options
author | Geir Storli <geirst@verizonmedia.com> | 2020-06-19 16:05:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-19 16:05:20 +0200 |
commit | 860e94ad566f700937ce87e51b638c12e8a5833e (patch) | |
tree | 35df4dc505720c2807628dbc8eddb2b622e627d1 /searchcore | |
parent | f3955d3cd4d3f01c41f2d5d96e05666e6d0c827d (diff) | |
parent | c56ffa5e2735b6e3873aa18edc5e54a9128f3108 (diff) |
Merge pull request #13645 from vespa-engine/geirst/multi-threaded-hnsw-indexing-flag
Multi-threaded hnsw indexing flag
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/attribute/attribute_test.cpp | 8 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 91f580cd221..dabab649497 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -811,18 +811,18 @@ public: const vespalib::string dense_tensor = "tensor(x[2])"; AVConfig -get_tensor_config(bool allow_multi_threaded_indexing) +get_tensor_config(bool multi_threaded_indexing) { AVConfig cfg(AVBasicType::TENSOR); cfg.setTensorType(ValueType::from_spec(dense_tensor)); - cfg.set_hnsw_index_params(HnswIndexParams(4, 4, DistanceMetric::Euclidean, allow_multi_threaded_indexing)); + cfg.set_hnsw_index_params(HnswIndexParams(4, 4, DistanceMetric::Euclidean, multi_threaded_indexing)); return cfg; } std::shared_ptr<MockDenseTensorAttribute> -make_mock_tensor_attribute(const vespalib::string& name, bool allow_multi_threaded_indexing) +make_mock_tensor_attribute(const vespalib::string& name, bool multi_threaded_indexing) { - auto cfg = get_tensor_config(allow_multi_threaded_indexing); + auto cfg = get_tensor_config(multi_threaded_indexing); return std::make_shared<MockDenseTensorAttribute>(name, cfg); } diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp index 8f19d5c203b..9b54ae816e0 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp @@ -40,7 +40,7 @@ use_two_phase_put_for_attribute(const AttributeVector& attr) const auto& cfg = attr.getConfig(); if (cfg.basicType() == search::attribute::BasicType::Type::TENSOR && cfg.hnsw_index_params().has_value() && - cfg.hnsw_index_params().value().allow_multi_threaded_indexing()) + cfg.hnsw_index_params().value().multi_threaded_indexing()) { return true; } |