Merge pull request #29459 from vespa-engine/geirst/direct-multi-term-blueprint

Rename DirectWeightedSetBlueprint to DirectMultiTermBlueprint.

5 files changed, 21 insertions, 21 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
index 4735b3d7158..76389311eaa 100644
--- a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
@@ -40,7 +40,7 @@ vespa_add_library(searchlib_attribute OBJECT
     defines.cpp
     dfa_fuzzy_matcher.cpp
     dfa_string_comparator.cpp
-    direct_weighted_set_blueprint.cpp
+    direct_multi_term_blueprint.cpp
     distance_metric_utils.cpp
     diversity.cpp
     document_weight_or_filter_search.cpp
diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
index 7cb69590d73..8c56fc081fc 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
@@ -4,7 +4,7 @@
 #include "attribute_blueprint_params.h"
 #include "attribute_object_visitor.h"
 #include "attribute_weighted_set_blueprint.h"
-#include "direct_weighted_set_blueprint.h"
+#include "direct_multi_term_blueprint.h"
 #include "document_weight_or_filter_search.h"
 #include "i_direct_posting_store.h"
 #include "iterator_pack.h"
@@ -686,7 +686,7 @@ public:
             setResult(std::move(ws));
         } else {
             if (_dww != nullptr) {
-                auto *bp = new attribute::DirectWeightedSetBlueprint<queryeval::WeightedSetTermSearch>(_field, _attr, *_dww, n.getNumTerms());
+                auto *bp = new attribute::DirectMultiTermBlueprint<queryeval::WeightedSetTermSearch>(_field, _attr, *_dww, n.getNumTerms());
                 createDirectWeightedSet(bp, n);
             } else {
                 auto *bp = new WeightedSetTermBlueprint(_field);
@@ -697,7 +697,7 @@ public:
 
     void visit(query::DotProduct &n) override {
         if (_dww != nullptr) {
-            auto *bp = new attribute::DirectWeightedSetBlueprint<queryeval::DotProductSearch>(_field, _attr, *_dww, n.getNumTerms());
+            auto *bp = new attribute::DirectMultiTermBlueprint<queryeval::DotProductSearch>(_field, _attr, *_dww, n.getNumTerms());
             createDirectWeightedSet(bp, n);
         } else {
             auto *bp = new DotProductBlueprint(_field);
diff --git a/searchlib/src/vespa/searchlib/attribute/direct_weighted_set_blueprint.cpp b/searchlib/src/vespa/searchlib/attribute/direct_multi_term_blueprint.cpp
index 01b683f3b6d..77aef7c49b2 100644
--- a/searchlib/src/vespa/searchlib/attribute/direct_weighted_set_blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/direct_multi_term_blueprint.cpp
@@ -1,14 +1,14 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "direct_weighted_set_blueprint.h"
-#include "direct_weighted_set_blueprint.hpp"
+#include "direct_multi_term_blueprint.h"
+#include "direct_multi_term_blueprint.hpp"
 #include <vespa/searchlib/queryeval/dot_product_search.h>
 #include <vespa/searchlib/queryeval/weighted_set_term_search.h>
 
 namespace search::attribute {
 
-template class DirectWeightedSetBlueprint<queryeval::WeightedSetTermSearch>;
-template class DirectWeightedSetBlueprint<queryeval::DotProductSearch>;
+template class DirectMultiTermBlueprint<queryeval::WeightedSetTermSearch>;
+template class DirectMultiTermBlueprint<queryeval::DotProductSearch>;
 
 }
 
diff --git a/searchlib/src/vespa/searchlib/attribute/direct_weighted_set_blueprint.h b/searchlib/src/vespa/searchlib/attribute/direct_multi_term_blueprint.h
index 30bdfc24998..4540c1f4937 100644
--- a/searchlib/src/vespa/searchlib/attribute/direct_weighted_set_blueprint.h
+++ b/searchlib/src/vespa/searchlib/attribute/direct_multi_term_blueprint.h
@@ -16,13 +16,13 @@ namespace search::queryeval { class SearchIterator; }
 namespace search::attribute {
 
 /**
- * Blueprint used for WeightedSetTerm or DotProduct over a multi-value attribute
- * which supports the IDirectPostingStore interface.
+ * Blueprint used for multi-term query operators as InTerm, WeightedSetTerm or DotProduct
+ * over a multi-value attribute which supports the IDocidWithWeightPostingStore interface.
  *
  * This allows access to low-level posting lists, which speeds up query execution.
  */
 template <typename SearchType>
-class DirectWeightedSetBlueprint : public queryeval::ComplexLeafBlueprint
+class DirectMultiTermBlueprint : public queryeval::ComplexLeafBlueprint
 {
 private:
     std::vector<int32_t>                           _weights;
@@ -32,8 +32,8 @@ private:
     vespalib::datastore::EntryRef                  _dictionary_snapshot;
 
 public:
-    DirectWeightedSetBlueprint(const queryeval::FieldSpec &field, const IAttributeVector &iattr, const IDocidWithWeightPostingStore &attr, size_t size_hint);
-    ~DirectWeightedSetBlueprint() override;
+    DirectMultiTermBlueprint(const queryeval::FieldSpec &field, const IAttributeVector &iattr, const IDocidWithWeightPostingStore &attr, size_t size_hint);
+    ~DirectMultiTermBlueprint() override;
 
     void addTerm(const IDirectPostingStore::LookupKey & key, int32_t weight, HitEstimate & estimate) {
         IDirectPostingStore::LookupResult result = _attr.lookup(key, _dictionary_snapshot);
diff --git a/searchlib/src/vespa/searchlib/attribute/direct_weighted_set_blueprint.hpp b/searchlib/src/vespa/searchlib/attribute/direct_multi_term_blueprint.hpp
index 4e754780d54..1526d00f57e 100644
--- a/searchlib/src/vespa/searchlib/attribute/direct_weighted_set_blueprint.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/direct_multi_term_blueprint.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "direct_weighted_set_blueprint.h"
+#include "direct_multi_term_blueprint.h"
 #include "document_weight_or_filter_search.h"
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
 #include <vespa/searchlib/queryeval/emptysearch.h>
@@ -11,10 +11,10 @@
 namespace search::attribute {
 
 template <typename SearchType>
-DirectWeightedSetBlueprint<SearchType>::DirectWeightedSetBlueprint(const queryeval::FieldSpec &field,
-                                                                   const IAttributeVector &iattr,
-                                                                   const IDocidWithWeightPostingStore &attr,
-                                                                   size_t size_hint)
+DirectMultiTermBlueprint<SearchType>::DirectMultiTermBlueprint(const queryeval::FieldSpec &field,
+                                                               const IAttributeVector &iattr,
+                                                               const IDocidWithWeightPostingStore &attr,
+                                                               size_t size_hint)
     : ComplexLeafBlueprint(field),
       _weights(),
       _terms(),
@@ -28,11 +28,11 @@ DirectWeightedSetBlueprint<SearchType>::DirectWeightedSetBlueprint(const queryev
 }
 
 template <typename SearchType>
-DirectWeightedSetBlueprint<SearchType>::~DirectWeightedSetBlueprint() = default;
+DirectMultiTermBlueprint<SearchType>::~DirectMultiTermBlueprint() = default;
 
 template <typename SearchType>
 std::unique_ptr<queryeval::SearchIterator>
-DirectWeightedSetBlueprint<SearchType>::createLeafSearch(const fef::TermFieldMatchDataArray &tfmda, bool) const
+DirectMultiTermBlueprint<SearchType>::createLeafSearch(const fef::TermFieldMatchDataArray &tfmda, bool) const
 {
     assert(tfmda.size() == 1);
     assert(getState().numFields() == 1);
@@ -54,7 +54,7 @@ DirectWeightedSetBlueprint<SearchType>::createLeafSearch(const fef::TermFieldMat
 
 template <typename SearchType>
 std::unique_ptr<queryeval::SearchIterator>
-DirectWeightedSetBlueprint<SearchType>::createFilterSearch(bool, FilterConstraint) const
+DirectMultiTermBlueprint<SearchType>::createFilterSearch(bool, FilterConstraint) const
 {
     std::vector<DocidWithWeightIterator> iterators;
     iterators.reserve(_terms.size());