diff options
-rw-r--r-- | searchlib/src/tests/diskindex/fusion/fusion_test.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/tests/memoryindex/field_index/field_index_test.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp (renamed from searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp) | 6 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/memoryindex/posting_iterator.h (renamed from searchlib/src/vespa/searchlib/memoryindex/postingiterator.h) | 0 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp | 8 |
7 files changed, 11 insertions, 11 deletions
diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp index 31776fc8efd..24146e516a0 100644 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp +++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp @@ -14,7 +14,7 @@ #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/memoryindex/document_inverter.h> #include <vespa/searchlib/memoryindex/field_index_collection.h> -#include <vespa/searchlib/memoryindex/postingiterator.h> +#include <vespa/searchlib/memoryindex/posting_iterator.h> #include <vespa/searchlib/util/filekit.h> #include <vespa/vespalib/testkit/testapp.h> diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp index 12a0fee1b06..3a635756ec7 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -14,7 +14,7 @@ #include <vespa/searchlib/memoryindex/field_index_collection.h> #include <vespa/searchlib/memoryindex/field_inverter.h> #include <vespa/searchlib/memoryindex/ordered_field_index_inserter.h> -#include <vespa/searchlib/memoryindex/postingiterator.h> +#include <vespa/searchlib/memoryindex/posting_iterator.h> #include <vespa/searchlib/test/searchiteratorverifier.h> #include <vespa/vespalib/testkit/testapp.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt index 8b26700896f..707948f5eb6 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt @@ -10,7 +10,7 @@ vespa_add_library(searchlib_memoryindex OBJECT field_inverter.cpp memory_index.cpp ordered_field_index_inserter.cpp - postingiterator.cpp + posting_iterator.cpp urlfieldinverter.cpp wordstore.cpp DEPENDS diff --git a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp index 15e7e7698a7..3ff2d553a96 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp @@ -3,7 +3,7 @@ #include "document_inverter.h" #include "field_index_collection.h" #include "memory_index.h" -#include "postingiterator.h" +#include "posting_iterator.h" #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/searchlib/btree/btreenodeallocator.hpp> diff --git a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp b/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp index ca56299f906..4c29ec321e3 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp @@ -1,14 +1,14 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "postingiterator.h" +#include "posting_iterator.h" +#include <vespa/searchlib/btree/btreeiterator.hpp> #include <vespa/searchlib/btree/btreenode.hpp> #include <vespa/searchlib/btree/btreenodeallocator.hpp> #include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> #include <vespa/searchlib/btree/btreeroot.hpp> #include <vespa/log/log.h> -LOG_SETUP(".searchlib.memoryindex.postingiterator"); +LOG_SETUP(".searchlib.memoryindex.posting_iterator"); namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.h b/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.h index de337ef49f3..de337ef49f3 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.h +++ b/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.h diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp index 2d7a9abbf79..9cbbd136148 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp @@ -2,13 +2,13 @@ #include "fakememtreeocc.h" #include "fpfactory.h" -#include <vespa/searchlib/queryeval/iterators.h> -#include <vespa/searchlib/btree/btreeroot.hpp> #include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> #include <vespa/searchlib/btree/btreenode.hpp> +#include <vespa/searchlib/btree/btreenodeallocator.hpp> #include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/memoryindex/postingiterator.h> +#include <vespa/searchlib/btree/btreeroot.hpp> +#include <vespa/searchlib/memoryindex/posting_iterator.h> +#include <vespa/searchlib/queryeval/iterators.h> #include <vespa/searchlib/util/postingpriorityqueue.h> #include <vespa/log/log.h> |