diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-04-11 08:56:46 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-04-11 08:56:46 +0000 |
commit | 61907066d7ee2b1f438f9e8c7c6020a352b467c9 (patch) | |
tree | bab86b01f78781d4c75fd625eb7f8e0f9904980f | |
parent | bcf3638e212f8c2babb0e5a647c619a15171d467 (diff) |
Rename documentinverter* -> document_inverter*.
13 files changed, 19 insertions, 19 deletions
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index 9948c389a27..32067b9ae2b 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -15,7 +15,7 @@ #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/memoryindex/compact_document_words_store.h> -#include <vespa/searchlib/memoryindex/documentinverter.h> +#include <vespa/searchlib/memoryindex/document_inverter.h> #include <vespa/searchlib/memoryindex/field_index_collection.h> #include <vespa/searchlib/memoryindex/fieldinverter.h> #include <vespa/searchlib/queryeval/isourceselector.h> diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index bf5046d25cb..d9c71d31830 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -175,7 +175,7 @@ vespa_define_module( src/tests/ld-library-path src/tests/memoryindex/compact_document_words_store src/tests/memoryindex/datastore - src/tests/memoryindex/documentinverter + src/tests/memoryindex/document_inverter src/tests/memoryindex/field_index src/tests/memoryindex/field_index_remover src/tests/memoryindex/fieldinverter diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp index fb6535c4a70..31776fc8efd 100644 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp +++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp @@ -12,7 +12,7 @@ #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> -#include <vespa/searchlib/memoryindex/documentinverter.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/util/filekit.h> diff --git a/searchlib/src/tests/memoryindex/document_inverter/.gitignore b/searchlib/src/tests/memoryindex/document_inverter/.gitignore new file mode 100644 index 00000000000..6245bb146e7 --- /dev/null +++ b/searchlib/src/tests/memoryindex/document_inverter/.gitignore @@ -0,0 +1 @@ +searchlib_document_inverter_test_app diff --git a/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt new file mode 100644 index 00000000000..1058a19d0ce --- /dev/null +++ b/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(searchlib_document_inverter_test_app TEST + SOURCES + document_inverter_test.cpp + DEPENDS + searchlib_test + searchlib +) +vespa_add_test(NAME searchlib_document_inverter_test_app COMMAND searchlib_document_inverter_test_app) diff --git a/searchlib/src/tests/memoryindex/documentinverter/documentinverter_test.cpp b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp index bea4794cf3c..63baa72c065 100644 --- a/searchlib/src/tests/memoryindex/documentinverter/documentinverter_test.cpp +++ b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp @@ -3,7 +3,7 @@ #include <vespa/searchlib/index/docbuilder.h> -#include <vespa/searchlib/memoryindex/documentinverter.h> +#include <vespa/searchlib/memoryindex/document_inverter.h> #include <vespa/searchlib/memoryindex/fieldinverter.h> #include <vespa/searchlib/test/memoryindex/ordered_field_index_inserter.h> #include <vespa/searchlib/common/sequencedtaskexecutor.h> diff --git a/searchlib/src/tests/memoryindex/documentinverter/.gitignore b/searchlib/src/tests/memoryindex/documentinverter/.gitignore deleted file mode 100644 index 1e9666b2d63..00000000000 --- a/searchlib/src/tests/memoryindex/documentinverter/.gitignore +++ /dev/null @@ -1 +0,0 @@ -searchlib_documentinverter_test_app diff --git a/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt deleted file mode 100644 index c7760e9f12f..00000000000 --- a/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_documentinverter_test_app TEST - SOURCES - documentinverter_test.cpp - DEPENDS - searchlib_test - searchlib -) -vespa_add_test(NAME searchlib_documentinverter_test_app COMMAND searchlib_documentinverter_test_app) 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 1d4c39b3097..6396828b46d 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -10,7 +10,7 @@ #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> -#include <vespa/searchlib/memoryindex/documentinverter.h> +#include <vespa/searchlib/memoryindex/document_inverter.h> #include <vespa/searchlib/memoryindex/field_index_collection.h> #include <vespa/searchlib/memoryindex/fieldinverter.h> #include <vespa/searchlib/memoryindex/ordered_field_index_inserter.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt index 32e0ed42281..7460fc1befe 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_library(searchlib_memoryindex OBJECT SOURCES compact_document_words_store.cpp - documentinverter.cpp + document_inverter.cpp featurestore.cpp field_index.cpp field_index_collection.cpp diff --git a/searchlib/src/vespa/searchlib/memoryindex/documentinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp index 5eaa51d43ab..f87e25ddcad 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/documentinverter.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp @@ -1,6 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "documentinverter.h" +#include "document_inverter.h" #include "field_index_collection.h" #include "fieldinverter.h" #include "ordered_field_index_inserter.h" @@ -16,7 +16,7 @@ #include <stdexcept> #include <vespa/log/log.h> -LOG_SETUP(".memoryindex.documentinverter"); +LOG_SETUP(".memoryindex.document_inverter"); namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/memoryindex/documentinverter.h b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.h index 5c2d9cc84ed..5c2d9cc84ed 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/documentinverter.h +++ b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.h diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp b/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp index 3c3f17a2357..0bb36585e4f 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp @@ -1,6 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "documentinverter.h" +#include "document_inverter.h" #include "field_index_collection.h" #include "memoryindex.h" #include "postingiterator.h" |