Merge pull request #29935 from vespa-engine/geirst/multi-term-hash-filter

Rename MultiTermFilter to MultiTermHashFilter.

3 files changed, 13 insertions, 13 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp
index 99d3ba3f7aa..01148c11c9c 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "attribute_weighted_set_blueprint.h"
-#include "multi_term_filter.hpp"
+#include "multi_term_hash_filter.hpp"
 #include <vespa/searchcommon/attribute/i_search_context.h>
 #include <vespa/searchlib/common/bitvector.h>
 #include <vespa/searchlib/fef/matchdatalayout.h>
@@ -73,7 +73,7 @@ make_multi_term_filter(fef::TermFieldMatchData& tfmd,
                        const std::vector<int32_t>& weights,
                        const std::vector<ISearchContext*>& contexts)
 {
-    using FilterType = attribute::MultiTermFilter<WrapperType>;
+    using FilterType = attribute::MultiTermHashFilter<WrapperType>;
     typename FilterType::TokenMap tokens;
     WrapperType wrapper(attr);
     for (size_t i = 0; i < contexts.size(); ++i) {
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_term_filter.h b/searchlib/src/vespa/searchlib/attribute/multi_term_hash_filter.h
index adbf37d2dcd..9c3ea258fdc 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_term_filter.h
+++ b/searchlib/src/vespa/searchlib/attribute/multi_term_hash_filter.h
@@ -18,7 +18,7 @@ namespace search::attribute {
  * @tparam WrapperType Type that wraps an attribute vector and provides access to the attribute value for a given docid.
  */
 template <typename WrapperType>
-class MultiTermFilter final : public queryeval::SearchIterator
+class MultiTermHashFilter final : public queryeval::SearchIterator
 {
 public:
     using Key = typename WrapperType::TokenT;
@@ -31,9 +31,9 @@ private:
     int32_t _weight;
 
 public:
-    MultiTermFilter(fef::TermFieldMatchData& tfmd,
-                    WrapperType attr,
-                    TokenMap&& map);
+    MultiTermHashFilter(fef::TermFieldMatchData& tfmd,
+                        WrapperType attr,
+                        TokenMap&& map);
 
     void and_hits_into(BitVector& result, uint32_t begin_id) override;
     void doSeek(uint32_t docId) override;
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_term_filter.hpp b/searchlib/src/vespa/searchlib/attribute/multi_term_hash_filter.hpp
index dc572aedbff..96d5b3ac1f3 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_term_filter.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multi_term_hash_filter.hpp
@@ -2,16 +2,16 @@
 
 #pragma once
 
-#include "multi_term_filter.h"
+#include "multi_term_hash_filter.h"
 #include <vespa/searchlib/common/bitvector.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
 
 namespace search::attribute {
 
 template <typename WrapperType>
-MultiTermFilter<WrapperType>::MultiTermFilter(fef::TermFieldMatchData& tfmd,
-                                              WrapperType attr,
-                                              TokenMap&& map)
+MultiTermHashFilter<WrapperType>::MultiTermHashFilter(fef::TermFieldMatchData& tfmd,
+                                                      WrapperType attr,
+                                                      TokenMap&& map)
     : _tfmd(tfmd),
       _attr(attr),
       _map(std::move(map)),
@@ -21,7 +21,7 @@ MultiTermFilter<WrapperType>::MultiTermFilter(fef::TermFieldMatchData& tfmd,
 
 template <typename WrapperType>
 void
-MultiTermFilter<WrapperType>::and_hits_into(BitVector& result, uint32_t begin_id)
+MultiTermHashFilter<WrapperType>::and_hits_into(BitVector& result, uint32_t begin_id)
 {
     auto end = _map.end();
     result.foreach_truebit([&, end](uint32_t key) { if ( _map.find(_attr.getToken(key)) == end) { result.clearBit(key); }}, begin_id);
@@ -29,7 +29,7 @@ MultiTermFilter<WrapperType>::and_hits_into(BitVector& result, uint32_t begin_id
 
 template <typename WrapperType>
 void
-MultiTermFilter<WrapperType>::doSeek(uint32_t docId)
+MultiTermHashFilter<WrapperType>::doSeek(uint32_t docId)
 {
     auto pos = _map.find(_attr.getToken(docId));
     if (pos != _map.end()) {
@@ -40,7 +40,7 @@ MultiTermFilter<WrapperType>::doSeek(uint32_t docId)
 
 template <typename WrapperType>
 void
-MultiTermFilter<WrapperType>::doUnpack(uint32_t docId)
+MultiTermHashFilter<WrapperType>::doUnpack(uint32_t docId)
 {
     _tfmd.reset(docId);
     fef::TermFieldMatchDataPosition pos;