aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/memoryindex
diff options
context:
space:
mode:
Diffstat (limited to 'searchlib/src/tests/memoryindex')
-rw-r--r--searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp24
-rw-r--r--searchlib/src/tests/memoryindex/field_index/field_index_test.cpp16
-rw-r--r--searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp30
-rw-r--r--searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp8
-rw-r--r--searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp24
6 files changed, 55 insertions, 49 deletions
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())); };