diff options
Diffstat (limited to 'searchlib')
17 files changed, 101 insertions, 93 deletions
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index c8b3db42340..e8f43a6037d 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -169,7 +169,6 @@ vespa_define_module( src/tests/groupingengine src/tests/hitcollector src/tests/index/field_length_calculator - src/tests/index/string_field_builder src/tests/indexmetainfo src/tests/ld-library-path src/tests/memoryindex/compact_words_store @@ -225,6 +224,7 @@ vespa_define_module( src/tests/tensor/tensor_buffer_operations src/tests/tensor/tensor_buffer_store src/tests/tensor/tensor_buffer_type_mapper + src/tests/test/string_field_builder src/tests/transactionlog src/tests/transactionlogstress src/tests/true diff --git a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt index 367f71783f9..6b9cc1b495a 100644 --- a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt +++ b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(searchlib_fusion_test_app TEST SOURCES fusion_test.cpp DEPENDS - searchlib + searchlib_test GTest::GTest AFTER searchlib_vespa-index-inspect_app diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp index b478c8f3ddd..54d34c849a0 100644 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp +++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp @@ -12,9 +12,9 @@ #include <vespa/searchlib/diskindex/zcposoccrandread.h> #include <vespa/searchlib/fef/fieldpositionsiterator.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> -#include <vespa/searchlib/index/empty_doc_builder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> -#include <vespa/searchlib/index/string_field_builder.h> +#include <vespa/searchlib/test/doc_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/searchlib/index/schemautil.h> #include <vespa/searchlib/memoryindex/document_inverter.h> #include <vespa/searchlib/memoryindex/document_inverter_context.h> @@ -52,6 +52,8 @@ using search::common::FileHeaderContext; using search::index::schema::CollectionType; using search::index::schema::DataType; using search::index::test::MockFieldLengthInspector; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; using vespalib::SequencedTaskExecutor; using namespace index; @@ -119,7 +121,7 @@ toString(FieldPositionsIterator posItr, bool hasElements = false, bool hasWeight } std::unique_ptr<Document> -make_doc10(EmptyDocBuilder &b) +make_doc10(DocBuilder &b) { auto doc = b.make_document("id:ns:searchdocument::10"); StringFieldBuilder sfb(b); @@ -154,7 +156,7 @@ make_schema(bool interleaved_features) return schema; } -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType make_add_fields() { return [](auto& header) { using namespace document::config_builder; @@ -342,7 +344,7 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire addField("f2").addField("f3"). addField("f4")); FieldIndexCollection fic(schema, MockFieldLengthInspector()); - EmptyDocBuilder b(make_add_fields()); + DocBuilder b(make_add_fields()); StringFieldBuilder sfb(b); auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2); auto pushThreads = SequencedTaskExecutor::create(push_executor, 2); @@ -486,7 +488,7 @@ FusionTest::make_simple_index(const vespalib::string &dump_dir, const IFieldLeng FieldIndexCollection fic(_schema, field_length_inspector); uint32_t numDocs = 20; uint32_t numWords = 1000; - EmptyDocBuilder b(make_add_fields()); + DocBuilder b(make_add_fields()); auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2); auto pushThreads = SequencedTaskExecutor::create(push_executor, 2); DocumentInverterContext inv_context(_schema, *invertThreads, *pushThreads, fic); diff --git a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp index 83746b611fb..85b8fc64304 100644 --- a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp +++ b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp @@ -5,9 +5,9 @@ #include <vespa/document/fieldvalue/document.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/document/repo/configbuilder.h> -#include <vespa/searchlib/index/empty_doc_builder.h> #include <vespa/searchlib/index/field_length_calculator.h> -#include <vespa/searchlib/index/string_field_builder.h> +#include <vespa/searchlib/test/doc_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/searchlib/memoryindex/document_inverter_context.h> #include <vespa/searchlib/memoryindex/field_index_remover.h> #include <vespa/searchlib/memoryindex/field_inverter.h> @@ -24,18 +24,18 @@ namespace search::memoryindex { using document::Document; -using index::EmptyDocBuilder; using index::FieldLengthCalculator; using index::Schema; -using index::StringFieldBuilder; using index::schema::CollectionType; using index::schema::DataType; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; using vespalib::SequencedTaskExecutor; using vespalib::ISequencedTaskExecutor; namespace { -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType make_add_fields() { return [](auto& header) { using namespace document::config_builder; @@ -48,7 +48,7 @@ make_add_fields() } Document::UP -makeDoc10(EmptyDocBuilder &b) +makeDoc10(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::10"); @@ -57,7 +57,7 @@ makeDoc10(EmptyDocBuilder &b) } Document::UP -makeDoc11(EmptyDocBuilder &b) +makeDoc11(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::11"); @@ -67,7 +67,7 @@ makeDoc11(EmptyDocBuilder &b) } Document::UP -makeDoc12(EmptyDocBuilder &b) +makeDoc12(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::12"); @@ -76,7 +76,7 @@ makeDoc12(EmptyDocBuilder &b) } Document::UP -makeDoc13(EmptyDocBuilder &b) +makeDoc13(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::13"); @@ -85,7 +85,7 @@ makeDoc13(EmptyDocBuilder &b) } Document::UP -makeDoc14(EmptyDocBuilder &b) +makeDoc14(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::14"); @@ -94,7 +94,7 @@ makeDoc14(EmptyDocBuilder &b) } Document::UP -makeDoc15(EmptyDocBuilder &b) +makeDoc15(DocBuilder &b) { return b.make_document("id:ns:searchdocument::15"); } @@ -106,7 +106,7 @@ VESPA_THREAD_STACK_TAG(push_executor) struct DocumentInverterTest : public ::testing::Test { Schema _schema; - EmptyDocBuilder _b; + DocBuilder _b; std::unique_ptr<ISequencedTaskExecutor> _invertThreads; std::unique_ptr<ISequencedTaskExecutor> _pushThreads; WordStore _word_store; 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 c13ef66a01a..1e6cb61d3f4 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -13,10 +13,8 @@ #include <vespa/searchlib/diskindex/zcposoccrandread.h> #include <vespa/searchlib/fef/fieldpositionsiterator.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> -#include <vespa/searchlib/index/empty_doc_builder.h> #include <vespa/searchlib/index/docidandfeatures.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> -#include <vespa/searchlib/index/string_field_builder.h> #include <vespa/searchlib/memoryindex/document_inverter.h> #include <vespa/searchlib/memoryindex/document_inverter_context.h> #include <vespa/searchlib/memoryindex/field_index_collection.h> @@ -24,6 +22,8 @@ #include <vespa/searchlib/memoryindex/ordered_field_index_inserter.h> #include <vespa/searchlib/memoryindex/posting_iterator.h> #include <vespa/searchlib/queryeval/iterators.h> +#include <vespa/searchlib/test/doc_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/searchlib/test/index/mock_field_length_inspector.h> #include <vespa/searchlib/test/memoryindex/wrap_inserter.h> #include <vespa/vespalib/btree/btreenodeallocator.hpp> @@ -56,6 +56,8 @@ using queryeval::SearchIterator; using search::index::schema::CollectionType; using search::index::schema::DataType; using search::index::test::MockFieldLengthInspector; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; using vespalib::GenerationHandler; using vespalib::ISequencedTaskExecutor; using vespalib::SequencedTaskExecutor; @@ -518,7 +520,7 @@ make_single_field_schema() return result; } -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType make_single_add_fields() { return [](auto& header) { header.addField("f0", document::DataType::T_STRING); }; @@ -725,7 +727,7 @@ make_multi_field_schema() return result; } -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType make_multi_field_add_fields() { return [](auto& header) { using namespace document::config_builder; @@ -938,13 +940,13 @@ class InverterTest : public ::testing::Test { public: Schema _schema; FieldIndexCollection _fic; - EmptyDocBuilder _b; + DocBuilder _b; std::unique_ptr<ISequencedTaskExecutor> _invertThreads; std::unique_ptr<ISequencedTaskExecutor> _pushThreads; DocumentInverterContext _inv_context; DocumentInverter _inv; - InverterTest(const Schema& schema, EmptyDocBuilder::AddFieldsType add_fields) + InverterTest(const Schema& schema, DocBuilder::AddFieldsType add_fields) : _schema(schema), _fic(_schema, MockFieldLengthInspector()), _b(add_fields), @@ -1173,7 +1175,7 @@ make_uri_schema() return result; } -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType make_uri_add_fields() { return [](auto& header) { using namespace document::config_builder; diff --git a/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp b/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp index ef28d8d57a4..db97846dc30 100644 --- a/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp +++ b/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp @@ -6,9 +6,9 @@ #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/searchlib/index/empty_doc_builder.h> #include <vespa/searchlib/index/field_length_calculator.h> -#include <vespa/searchlib/index/string_field_builder.h> +#include <vespa/searchlib/test/doc_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/searchlib/memoryindex/field_index_remover.h> #include <vespa/searchlib/memoryindex/field_inverter.h> #include <vespa/searchlib/memoryindex/word_store.h> @@ -22,11 +22,11 @@ namespace search { using document::ArrayFieldValue; using document::Document; using document::WeightedSetFieldValue; -using index::EmptyDocBuilder; using index::Schema; -using index::StringFieldBuilder; using index::schema::CollectionType; using index::schema::DataType; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; using namespace index; @@ -35,7 +35,7 @@ namespace memoryindex { namespace { Document::UP -makeDoc10(EmptyDocBuilder &b) +makeDoc10(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::10"); @@ -44,7 +44,7 @@ makeDoc10(EmptyDocBuilder &b) } Document::UP -makeDoc11(EmptyDocBuilder &b) +makeDoc11(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::11"); @@ -54,7 +54,7 @@ makeDoc11(EmptyDocBuilder &b) } Document::UP -makeDoc12(EmptyDocBuilder &b) +makeDoc12(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::12"); @@ -63,7 +63,7 @@ makeDoc12(EmptyDocBuilder &b) } Document::UP -makeDoc13(EmptyDocBuilder &b) +makeDoc13(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::13"); @@ -72,7 +72,7 @@ makeDoc13(EmptyDocBuilder &b) } Document::UP -makeDoc14(EmptyDocBuilder &b) +makeDoc14(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::14"); @@ -81,13 +81,13 @@ makeDoc14(EmptyDocBuilder &b) } Document::UP -makeDoc15(EmptyDocBuilder &b) +makeDoc15(DocBuilder &b) { return b.make_document("id:ns:searchdocument::15"); } Document::UP -makeDoc16(EmptyDocBuilder &b) +makeDoc16(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::16"); @@ -96,7 +96,7 @@ makeDoc16(EmptyDocBuilder &b) } Document::UP -makeDoc17(EmptyDocBuilder &b) +makeDoc17(DocBuilder &b) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::17"); @@ -115,7 +115,7 @@ makeDoc17(EmptyDocBuilder &b) vespalib::string corruptWord = "corruptWord"; Document::UP -makeCorruptDocument(EmptyDocBuilder &b, size_t wordOffset) +makeCorruptDocument(DocBuilder &b, size_t wordOffset) { StringFieldBuilder sfb(b); auto doc = b.make_document("id:ns:searchdocument::18"); @@ -141,7 +141,7 @@ makeCorruptDocument(EmptyDocBuilder &b, size_t wordOffset) struct FieldInverterTest : public ::testing::Test { Schema _schema; - EmptyDocBuilder _b; + DocBuilder _b; WordStore _word_store; FieldIndexRemover _remover; test::OrderedFieldIndexInserterBackend _inserter_backend; @@ -158,7 +158,7 @@ struct FieldInverterTest : public ::testing::Test { return schema; } - static EmptyDocBuilder::AddFieldsType + static DocBuilder::AddFieldsType make_add_fields() { return [](auto& header) { using namespace document::config_builder; diff --git a/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt b/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt index e5915cca6f3..0a771d98b90 100644 --- a/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt +++ b/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(searchlib_memory_index_test_app TEST SOURCES memory_index_test.cpp DEPENDS - searchlib + searchlib_test GTest::GTest ) vespa_add_test(NAME searchlib_memory_index_test_app COMMAND searchlib_memory_index_test_app) diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp index 1730e34adb5..b5b8e0c7a7c 100644 --- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp +++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp @@ -7,9 +7,9 @@ #include <vespa/searchlib/fef/matchdata.h> #include <vespa/searchlib/fef/matchdatalayout.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> -#include <vespa/searchlib/index/empty_doc_builder.h> #include <vespa/searchlib/index/i_field_length_inspector.h> -#include <vespa/searchlib/index/string_field_builder.h> +#include <vespa/searchlib/test/doc_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/searchlib/memoryindex/memory_index.h> #include <vespa/searchlib/query/tree/simplequery.h> #include <vespa/searchlib/queryeval/booleanmatchiteratorwrapper.h> @@ -36,6 +36,8 @@ using vespalib::makeLambdaTask; using search::query::Node; using search::query::SimplePhrase; using search::query::SimpleStringTerm; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; using vespalib::ISequencedTaskExecutor; using vespalib::SequencedTaskExecutor; using namespace search::fef; @@ -80,7 +82,7 @@ struct Index { std::unique_ptr<ISequencedTaskExecutor> _invertThreads; std::unique_ptr<ISequencedTaskExecutor> _pushThreads; MemoryIndex index; - EmptyDocBuilder builder; + DocBuilder builder; StringFieldBuilder sfb; std::unique_ptr<Document> builder_doc; uint32_t docid; diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp index a8369f355ff..b3892d5d69a 100644 --- a/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp +++ b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp @@ -10,13 +10,13 @@ #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/fixedtyperepo.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/searchlib/index/empty_doc_builder.h> #include <vespa/searchlib/index/field_length_calculator.h> #include <vespa/searchlib/index/schema_index_fields.h> -#include <vespa/searchlib/index/string_field_builder.h> #include <vespa/searchlib/memoryindex/field_index_remover.h> #include <vespa/searchlib/memoryindex/field_inverter.h> #include <vespa/searchlib/memoryindex/word_store.h> +#include <vespa/searchlib/test/doc_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/searchlib/test/memoryindex/ordered_field_index_inserter.h> #include <vespa/searchlib/test/memoryindex/ordered_field_index_inserter_backend.h> #include <vespa/vespalib/gtest/gtest.h> @@ -30,6 +30,8 @@ using document::UrlDataType; using document::WeightedSetFieldValue; using index::schema::CollectionType; using index::schema::DataType; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; using namespace index; @@ -40,7 +42,7 @@ namespace { const vespalib::string url = "url"; Document::UP -makeDoc10Single(EmptyDocBuilder &b) +makeDoc10Single(DocBuilder &b) { auto doc = b.make_document("id:ns:searchdocument::10"); auto url_value = b.make_struct("url"); @@ -58,7 +60,7 @@ makeDoc10Single(EmptyDocBuilder &b) } Document::UP -makeDoc10Array(EmptyDocBuilder &b) +makeDoc10Array(DocBuilder &b) { auto doc = b.make_document("id:ns:searchdocument::10"); StringFieldBuilder sfb(b); @@ -84,7 +86,7 @@ makeDoc10Array(EmptyDocBuilder &b) } Document::UP -makeDoc10WeightedSet(EmptyDocBuilder &b) +makeDoc10WeightedSet(DocBuilder &b) { auto doc = b.make_document("id:ns:searchdocument::10"); StringFieldBuilder sfb(b); @@ -112,7 +114,7 @@ makeDoc10WeightedSet(EmptyDocBuilder &b) } Document::UP -makeDoc10Empty(EmptyDocBuilder &b) +makeDoc10Empty(DocBuilder &b) { return b.make_document("id:ns:searchdocument::10"); } @@ -121,7 +123,7 @@ makeDoc10Empty(EmptyDocBuilder &b) struct UrlFieldInverterTest : public ::testing::Test { Schema _schema; - EmptyDocBuilder _b; + DocBuilder _b; WordStore _word_store; FieldIndexRemover _remover; test::OrderedFieldIndexInserterBackend _inserter_backend; @@ -138,7 +140,7 @@ struct UrlFieldInverterTest : public ::testing::Test { } UrlFieldInverterTest(Schema::CollectionType collectionType, - EmptyDocBuilder::AddFieldsType add_fields) + DocBuilder::AddFieldsType add_fields) : _schema(makeSchema(collectionType)), _b(add_fields), _word_store(), @@ -193,16 +195,16 @@ struct UrlFieldInverterTest : public ::testing::Test { UrlFieldInverterTest::~UrlFieldInverterTest() = default; -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType add_single_url = [](auto& header) { header.addField("url", UrlDataType::getInstance().getId()); }; -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType add_array_url = [](auto& header) { using namespace document::config_builder; header.addField("url", Array(UrlDataType::getInstance().getId())); }; -EmptyDocBuilder::AddFieldsType +DocBuilder::AddFieldsType add_wset_url = [](auto& header) { using namespace document::config_builder; header.addField("url", Wset(UrlDataType::getInstance().getId())); }; diff --git a/searchlib/src/tests/index/string_field_builder/CMakeLists.txt b/searchlib/src/tests/test/string_field_builder/CMakeLists.txt index f8774eae5ca..6cd9c5e36f1 100644 --- a/searchlib/src/tests/index/string_field_builder/CMakeLists.txt +++ b/searchlib/src/tests/test/string_field_builder/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(searchlib_string_field_builder_test_app TEST SOURCES string_field_builder_test.cpp DEPENDS - searchlib + searchlib_test GTest::GTest ) vespa_add_test(NAME searchlib_string_field_builder_test_app COMMAND searchlib_string_field_builder_test_app) diff --git a/searchlib/src/tests/index/string_field_builder/string_field_builder_test.cpp b/searchlib/src/tests/test/string_field_builder/string_field_builder_test.cpp index 8c2b641f724..9d886e6cde7 100644 --- a/searchlib/src/tests/index/string_field_builder/string_field_builder_test.cpp +++ b/searchlib/src/tests/test/string_field_builder/string_field_builder_test.cpp @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchlib/index/string_field_builder.h> +#include <vespa/searchlib/test/string_field_builder.h> #include <vespa/document/annotation/annotation.h> #include <vespa/document/annotation/span.h> #include <vespa/document/annotation/spanlist.h> #include <vespa/document/annotation/spantree.h> #include <vespa/document/datatype/annotationtype.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> -#include <vespa/searchlib/index/empty_doc_builder.h> +#include <vespa/searchlib/test/doc_builder.h> #include <vespa/vespalib/gtest/gtest.h> #include <cassert> #include <iostream> @@ -18,8 +18,8 @@ using document::Span; using document::SpanNode; using document::SpanTree; using document::StringFieldValue; -using search::index::EmptyDocBuilder; -using search::index::StringFieldBuilder; +using search::test::DocBuilder; +using search::test::StringFieldBuilder; namespace { @@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& os, const MyAnnotation& ann) { class StringFieldBuilderTest : public testing::Test { protected: - EmptyDocBuilder edb; + DocBuilder db; StringFieldBuilder sfb; StringFieldBuilderTest(); ~StringFieldBuilderTest(); @@ -80,8 +80,8 @@ protected: StringFieldBuilderTest::StringFieldBuilderTest() : testing::Test(), - edb(), - sfb(edb) + db(), + sfb(db) { } diff --git a/searchlib/src/vespa/searchlib/index/CMakeLists.txt b/searchlib/src/vespa/searchlib/index/CMakeLists.txt index afeb020598b..0bf912a8a11 100644 --- a/searchlib/src/vespa/searchlib/index/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/index/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_add_library(searchlib_searchlib_index OBJECT dictionaryfile.cpp docidandfeatures.cpp dummyfileheadercontext.cpp - empty_doc_builder.cpp indexbuilder.cpp postinglisthandle.cpp postinglistcounts.cpp @@ -13,7 +12,6 @@ vespa_add_library(searchlib_searchlib_index OBJECT postinglistparams.cpp schemautil.cpp schema_index_fields.cpp - string_field_builder.cpp uri_field.cpp DEPENDS ) diff --git a/searchlib/src/vespa/searchlib/test/CMakeLists.txt b/searchlib/src/vespa/searchlib/test/CMakeLists.txt index ed884a46217..2eb207d0d43 100644 --- a/searchlib/src/vespa/searchlib/test/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/test/CMakeLists.txt @@ -2,12 +2,14 @@ vespa_add_library(searchlib_test SOURCES document_weight_attribute_helper.cpp + doc_builder.cpp imported_attribute_fixture.cpp initrange.cpp make_attribute_map_lookup_node.cpp mock_attribute_context.cpp mock_attribute_manager.cpp searchiteratorverifier.cpp + string_field_builder.cpp $<TARGET_OBJECTS:searchlib_test_fakedata> $<TARGET_OBJECTS:searchlib_searchlib_test_diskindex> $<TARGET_OBJECTS:searchlib_test_gtest_migration> diff --git a/searchlib/src/vespa/searchlib/index/empty_doc_builder.cpp b/searchlib/src/vespa/searchlib/test/doc_builder.cpp index 32d4caeec4f..2312bf1d6bf 100644 --- a/searchlib/src/vespa/searchlib/index/empty_doc_builder.cpp +++ b/searchlib/src/vespa/searchlib/test/doc_builder.cpp @@ -1,6 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "empty_doc_builder.h" +#include "doc_builder.h" #include <vespa/document/datatype/documenttype.h> #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/document.h> @@ -22,12 +22,12 @@ using document::MapFieldValue; using document::StructFieldValue; using document::WeightedSetFieldValue; -namespace search::index { +namespace search::test { namespace { DocumenttypesConfig -get_document_types_config(EmptyDocBuilder::AddFieldsType add_fields) +get_document_types_config(DocBuilder::AddFieldsType add_fields) { using namespace document::config_builder; DocumenttypesConfigBuilderHelper builder; @@ -41,23 +41,23 @@ get_document_types_config(EmptyDocBuilder::AddFieldsType add_fields) } -EmptyDocBuilder::EmptyDocBuilder() - : EmptyDocBuilder([](auto&) noexcept {}) +DocBuilder::DocBuilder() + : DocBuilder([](auto&) noexcept {}) { } -EmptyDocBuilder::EmptyDocBuilder(AddFieldsType add_fields) +DocBuilder::DocBuilder(AddFieldsType add_fields) : _document_types_config(std::make_shared<const DocumenttypesConfig>(get_document_types_config(add_fields))), _repo(DocumentTypeRepoFactory::make(*_document_types_config)), _document_type(_repo->getDocumentType("searchdocument")) { } -EmptyDocBuilder::~EmptyDocBuilder() = default; +DocBuilder::~DocBuilder() = default; std::unique_ptr<Document> -EmptyDocBuilder::make_document(vespalib::string document_id) +DocBuilder::make_document(vespalib::string document_id) { auto doc = std::make_unique<Document>(get_document_type(), DocumentId(document_id)); doc->setRepo(get_repo()); @@ -65,7 +65,7 @@ EmptyDocBuilder::make_document(vespalib::string document_id) } const DataType& -EmptyDocBuilder::get_data_type(const vespalib::string &name) const +DocBuilder::get_data_type(const vespalib::string &name) const { const DataType *type = _repo->getDataType(*_document_type, name); assert(type); @@ -73,7 +73,7 @@ EmptyDocBuilder::get_data_type(const vespalib::string &name) const } ArrayFieldValue -EmptyDocBuilder::make_array(vespalib::stringref field_name) +DocBuilder::make_array(vespalib::stringref field_name) { auto& field = _document_type->getField(field_name); auto& field_type = field.getDataType(); @@ -81,7 +81,7 @@ EmptyDocBuilder::make_array(vespalib::stringref field_name) return {field_type}; } MapFieldValue -EmptyDocBuilder::make_map(vespalib::stringref field_name) +DocBuilder::make_map(vespalib::stringref field_name) { auto& field = _document_type->getField(field_name); auto& field_type = field.getDataType(); @@ -91,7 +91,7 @@ EmptyDocBuilder::make_map(vespalib::stringref field_name) } WeightedSetFieldValue -EmptyDocBuilder::make_wset(vespalib::stringref field_name) +DocBuilder::make_wset(vespalib::stringref field_name) { auto& field = _document_type->getField(field_name); auto& field_type = field.getDataType(); @@ -100,7 +100,7 @@ EmptyDocBuilder::make_wset(vespalib::stringref field_name) } StructFieldValue -EmptyDocBuilder::make_struct(vespalib::stringref field_name) +DocBuilder::make_struct(vespalib::stringref field_name) { auto& field = _document_type->getField(field_name); auto& field_type = field.getDataType(); @@ -109,7 +109,7 @@ EmptyDocBuilder::make_struct(vespalib::stringref field_name) } StructFieldValue -EmptyDocBuilder::make_url() +DocBuilder::make_url() { return {get_data_type("url")}; } diff --git a/searchlib/src/vespa/searchlib/index/empty_doc_builder.h b/searchlib/src/vespa/searchlib/test/doc_builder.h index 57803993aa3..75dbc30a0fb 100644 --- a/searchlib/src/vespa/searchlib/index/empty_doc_builder.h +++ b/searchlib/src/vespa/searchlib/test/doc_builder.h @@ -20,21 +20,21 @@ class WeightedSetFieldValue; namespace document::config::internal { class InternalDocumenttypesType; } namespace document::config_builder { struct Struct; } -namespace search::index { +namespace search::test { /* * Class used to make empty search documents. */ -class EmptyDocBuilder { +class DocBuilder { using DocumenttypesConfig = const document::config::internal::InternalDocumenttypesType; std::shared_ptr<const DocumenttypesConfig> _document_types_config; std::shared_ptr<const document::DocumentTypeRepo> _repo; const document::DocumentType* _document_type; public: using AddFieldsType = std::function<void(document::config_builder::Struct&)>; - EmptyDocBuilder(); - explicit EmptyDocBuilder(AddFieldsType add_fields); - ~EmptyDocBuilder(); + DocBuilder(); + explicit DocBuilder(AddFieldsType add_fields); + ~DocBuilder(); const document::DocumentTypeRepo& get_repo() const noexcept { return *_repo; } std::shared_ptr<const document::DocumentTypeRepo> get_repo_sp() const noexcept { return _repo; } const document::DocumentType& get_document_type() const noexcept { return *_document_type; } diff --git a/searchlib/src/vespa/searchlib/index/string_field_builder.cpp b/searchlib/src/vespa/searchlib/test/string_field_builder.cpp index 3212a021535..1510a306875 100644 --- a/searchlib/src/vespa/searchlib/index/string_field_builder.cpp +++ b/searchlib/src/vespa/searchlib/test/string_field_builder.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "string_field_builder.h" -#include "empty_doc_builder.h" +#include "doc_builder.h" #include <vespa/document/annotation/annotation.h> #include <vespa/document/annotation/span.h> #include <vespa/document/annotation/spanlist.h> @@ -23,7 +23,7 @@ using document::SpanTree; using vespalib::Utf8Reader; using vespalib::Utf8Writer; -namespace search::index { +namespace search::test { namespace { @@ -31,14 +31,14 @@ const vespalib::string SPANTREE_NAME("linguistics"); } -StringFieldBuilder::StringFieldBuilder(const EmptyDocBuilder& empty_doc_builder) +StringFieldBuilder::StringFieldBuilder(const DocBuilder& doc_builder) : _value(), _span_start(0u), _span_list(nullptr), _span_tree(), _last_span(nullptr), _url_mode(false), - _repo(empty_doc_builder.get_repo(), empty_doc_builder.get_document_type()) + _repo(doc_builder.get_repo(), doc_builder.get_document_type()) { } diff --git a/searchlib/src/vespa/searchlib/index/string_field_builder.h b/searchlib/src/vespa/searchlib/test/string_field_builder.h index 1987cbbcf74..94c2bfc2fe8 100644 --- a/searchlib/src/vespa/searchlib/index/string_field_builder.h +++ b/searchlib/src/vespa/searchlib/test/string_field_builder.h @@ -13,9 +13,9 @@ class SpanTree; class StringFieldValue; } -namespace search::index { +namespace search::test { -class EmptyDocBuilder; +class DocBuilder; /* * Helper class to build annotated string field. @@ -31,7 +31,7 @@ class StringFieldBuilder { void start_annotate(); void add_span(); public: - StringFieldBuilder(const EmptyDocBuilder& empty_doc_builder); + StringFieldBuilder(const DocBuilder& doc_builder); ~StringFieldBuilder(); StringFieldBuilder& url_mode(bool url_mode_) noexcept { _url_mode = url_mode_; return *this; } StringFieldBuilder& token(const vespalib::string& val, bool is_word); |