Rename search::DocIdIterator to search::ArrayIterator.

8 files changed, 16 insertions, 18 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
index 6ec78daecd1..68cd5e9502d 100644
--- a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
@@ -3,6 +3,7 @@ vespa_add_library(searchlib_attribute OBJECT
     SOURCES
     address_space_components.cpp
     address_space_usage.cpp
+    array_iterator.cpp
     attribute.cpp
     attribute_blueprint_factory.cpp
     attribute_header.cpp
@@ -42,7 +43,6 @@ vespa_add_library(searchlib_attribute OBJECT
     direct_weighted_set_blueprint.cpp
     distance_metric_utils.cpp
     diversity.cpp
-    dociditerator.cpp
     document_weight_or_filter_search.cpp
     empty_search_context.cpp
     enum_store_compaction_spec.cpp
diff --git a/searchlib/src/vespa/searchlib/attribute/dociditerator.cpp b/searchlib/src/vespa/searchlib/attribute/array_iterator.cpp
index cf1ff298b97..0a6107d67dc 100644
--- a/searchlib/src/vespa/searchlib/attribute/dociditerator.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/array_iterator.cpp
@@ -1,6 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "dociditerator.h"
+#include "array_iterator.h"
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/dociditerator.h b/searchlib/src/vespa/searchlib/attribute/array_iterator.h
index 929650a024e..b1db2fdd428 100644
--- a/searchlib/src/vespa/searchlib/attribute/dociditerator.h
+++ b/searchlib/src/vespa/searchlib/attribute/array_iterator.h
@@ -9,19 +9,17 @@
 namespace search {
 
 /**
- * Inner attribute iterator used for temporary posting lists (range
- * searches).
+ * Inner attribute iterator used for temporary posting lists (range searches).
  */
-
 template <typename P>
-class DocIdIterator
+class ArrayIterator
 {
 public:
-    DocIdIterator() : _cur(nullptr), _end(nullptr), _begin(nullptr) { }
+    ArrayIterator() : _cur(nullptr), _end(nullptr), _begin(nullptr) { }
 
     const P * operator->() const { return _cur; }
 
-    DocIdIterator & operator++() {
+    ArrayIterator & operator++() {
         ++_cur;
         return *this;
     }
@@ -49,7 +47,7 @@ public:
         _cur = std::lower_bound<const P *, P>(_begin, _end, keyWrap);
     }
 
-    void swap(DocIdIterator &rhs) {
+    void swap(ArrayIterator &rhs) {
         std::swap(_cur, rhs._cur);
         std::swap(_end, rhs._end);
         std::swap(_begin, rhs._begin);
@@ -62,7 +60,7 @@ protected:
 
 template <>
 inline int32_t
-DocIdIterator<AttributePosting>::getData() const
+ArrayIterator<AttributePosting>::getData() const
 {
     return 1;   // default weight 1 for single value attributes
 }
@@ -74,11 +72,11 @@ DocIdIterator<AttributePosting>::getData() const
  */
 
 template <typename P>
-class DocIdMinMaxIterator : public DocIdIterator<P>
+class DocIdMinMaxIterator : public ArrayIterator<P>
 {
 public:
     DocIdMinMaxIterator()
-        : DocIdIterator<P>()
+        : ArrayIterator<P>()
     { }
     inline vespalib::btree::MinMaxAggregated getAggregated() const { return vespalib::btree::MinMaxAggregated(1, 1); }
 };
diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.h b/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
index 584666cfdc5..9b00e9c13ce 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "dociditerator.h"
+#include "array_iterator.h"
 #include "postinglisttraits.h"
 #include <vespa/searchlib/queryeval/searchiterator.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp b/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp
index 22a1f219040..feac1a966d5 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp
@@ -115,7 +115,7 @@ namespace {
 template <typename> struct is_tree_iterator;
 
 template <typename P>
-struct is_tree_iterator<DocIdIterator<P>> {
+struct is_tree_iterator<ArrayIterator<P>> {
     static constexpr bool value = false;
 };
 
diff --git a/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp b/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp
index 80732b5813c..b49ec1bfc9e 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/imported_search_context.cpp
@@ -128,7 +128,7 @@ ImportedSearchContext::createIterator(fef::TermFieldMatchData* matchData, bool s
             return SearchIterator::UP(new EmptySearch());
         } else {
             using Posting = vespalib::btree::BTreeKeyData<uint32_t, int32_t>;
-            using DocIt = DocIdIterator<Posting>;
+            using DocIt = ArrayIterator<Posting>;
             DocIt postings;
             auto array = _merger.getArray();
             postings.set(&array[0], &array[array.size()]);
diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h
index e2be0d69434..41fdff96790 100644
--- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "dociditerator.h"
+#include "array_iterator.h"
 #include "enumattribute.h"
 #include "ipostinglistattributebase.h"
 #include "numericbase.h"
diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp
index 27ef06565a6..4436ea203ce 100644
--- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "postinglistsearchcontext.h"
-#include "dociditerator.h"
+#include "array_iterator.h"
 #include "attributeiterators.h"
 #include "diversity.h"
 #include "postingstore.hpp"
@@ -156,7 +156,7 @@ createPostingIterator(fef::TermFieldMatchData *matchData, bool strict)
     if (_merger.hasArray() || _merger.hasBitVector()) { // synthetic results are available
         if (!_merger.emptyArray()) {
             assert(_merger.hasArray());
-            using DocIt = DocIdIterator<Posting>;
+            using DocIt = ArrayIterator<Posting>;
             DocIt postings;
             vespalib::ConstArrayRef<Posting> array = _merger.getArray();
             postings.set(&array[0], &array[array.size()]);