From 2e3992b92ef179005fb39f094bf9558c3703766b Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Fri, 21 Oct 2022 10:45:10 +0200 Subject: Change signature for search::test::SchemaBuilder::build() member function. --- searchlib/src/tests/diskindex/fusion/fusion_test.cpp | 2 +- .../document_inverter/document_inverter_test.cpp | 2 +- .../src/tests/memoryindex/field_index/field_index_test.cpp | 4 ++-- .../memoryindex/field_inverter/field_inverter_test.cpp | 2 +- .../tests/memoryindex/memory_index/memory_index_test.cpp | 2 +- .../src/tests/test/schema_builder/schema_builder_test.cpp | 14 +++++++------- searchlib/src/vespa/searchlib/test/schema_builder.cpp | 4 ++-- searchlib/src/vespa/searchlib/test/schema_builder.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'searchlib/src') diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp index 735dd7e3c14..5e0111cbe8c 100644 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp +++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp @@ -154,7 +154,7 @@ Schema make_schema(bool interleaved_features) { DocBuilder db(make_add_fields()); - return *SchemaBuilder(db).add_all_indexes(interleaved_features).build(); + return SchemaBuilder(db).add_all_indexes(interleaved_features).build(); } void 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 4862218045f..3f8b59e85c0 100644 --- a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp +++ b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp @@ -119,7 +119,7 @@ struct DocumentInverterTest : public ::testing::Test { DocumentInverterTest() : _b(make_add_fields()), - _schema(*SchemaBuilder(_b).add_all_indexes().build()), + _schema(SchemaBuilder(_b).add_all_indexes().build()), _invertThreads(SequencedTaskExecutor::create(invert_executor, 1)), _pushThreads(SequencedTaskExecutor::create(push_executor, 1)), _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 6e0c9be0c97..4a86c3fdee9 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -515,7 +515,7 @@ Schema make_all_index_schema(DocBuilder::AddFieldsType add_fields) { DocBuilder db(add_fields); - return *SchemaBuilder(db).add_all_indexes().build(); + return SchemaBuilder(db).add_all_indexes().build(); } DocBuilder::AddFieldsType @@ -935,7 +935,7 @@ public: InverterTest(DocBuilder::AddFieldsType add_fields) : _b(add_fields), - _schema(*SchemaBuilder(_b).add_all_indexes().build()), + _schema(SchemaBuilder(_b).add_all_indexes().build()), _fic(_schema, MockFieldLengthInspector()), _invertThreads(SequencedTaskExecutor::create(invert_executor, 2)), _pushThreads(SequencedTaskExecutor::create(push_executor, 2)), 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 c75d581a055..373ad9ad2c5 100644 --- a/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp +++ b/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp @@ -164,7 +164,7 @@ struct FieldInverterTest : public ::testing::Test { FieldInverterTest() : _b(make_add_fields()), - _schema(*SchemaBuilder(_b).add_all_indexes().build()), + _schema(SchemaBuilder(_b).add_all_indexes().build()), _word_store(), _remover(_word_store), _inserter_backend(), 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 536c9314134..df91dffb3d4 100644 --- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp +++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp @@ -76,7 +76,7 @@ struct MySetup : public IFieldLengthInspector { Schema make_all_index_schema() const { DocBuilder db([this](auto& header) { add_fields(header); }); - return *SchemaBuilder(db).add_all_indexes().build(); + return SchemaBuilder(db).add_all_indexes().build(); } }; diff --git a/searchlib/src/tests/test/schema_builder/schema_builder_test.cpp b/searchlib/src/tests/test/schema_builder/schema_builder_test.cpp index 32d1c3d6041..955e90d5c62 100644 --- a/searchlib/src/tests/test/schema_builder/schema_builder_test.cpp +++ b/searchlib/src/tests/test/schema_builder/schema_builder_test.cpp @@ -38,7 +38,7 @@ auto add_all_fields = [](auto& header) class SchemaBuilderTest : public testing::Test { protected: - std::unique_ptr schema; + Schema schema; SchemaBuilderTest(); ~SchemaBuilderTest(); @@ -58,9 +58,9 @@ SchemaBuilderTest::~SchemaBuilderTest() = default; void SchemaBuilderTest::assert_index(vespalib::stringref name, search::index::schema::DataType exp_dt, CollectionType exp_ct) { - auto field_id = schema->getIndexFieldId(name); + auto field_id = schema.getIndexFieldId(name); ASSERT_NE(Schema::UNKNOWN_FIELD_ID, field_id); - auto& field = schema->getIndexField(field_id); + auto& field = schema.getIndexField(field_id); EXPECT_EQ(exp_dt, field.getDataType()); EXPECT_EQ(exp_ct, field.getCollectionType()); } @@ -69,7 +69,7 @@ void SchemaBuilderTest::assert_all_indexes() { using DataType = search::index::schema::DataType; - EXPECT_EQ(25u, schema->getNumIndexFields()); // string and url*, 1 + 3 * 8 + EXPECT_EQ(25u, schema.getNumIndexFields()); // string and url*, 1 + 3 * 8 assert_index("string", DataType::STRING, CollectionType::SINGLE); assert_index("url", DataType::STRING, CollectionType::SINGLE); assert_index("url.scheme", DataType::STRING, CollectionType::SINGLE); @@ -80,9 +80,9 @@ SchemaBuilderTest::assert_all_indexes() void SchemaBuilderTest::assert_attribute(vespalib::stringref name, search::index::schema::DataType exp_dt, CollectionType exp_ct, const vespalib::string exp_tensor_spec) { - auto field_id = schema->getAttributeFieldId(name); + auto field_id = schema.getAttributeFieldId(name); ASSERT_NE(Schema::UNKNOWN_FIELD_ID, field_id); - auto& field = schema->getAttributeField(field_id); + auto& field = schema.getAttributeField(field_id); EXPECT_EQ(exp_dt, field.getDataType()); EXPECT_EQ(exp_ct, field.getCollectionType()); EXPECT_EQ(exp_tensor_spec, field.get_tensor_spec()); @@ -92,7 +92,7 @@ void SchemaBuilderTest::assert_all_attributes() { using DataType = search::index::schema::DataType; - EXPECT_EQ(11u, schema->getNumAttributeFields()); // all but url*, 14 - 3 + EXPECT_EQ(11u, schema.getNumAttributeFields()); // all but url*, 14 - 3 assert_attribute("int8", DataType::INT8, CollectionType::SINGLE); assert_attribute("int16", DataType::INT16, CollectionType::SINGLE); assert_attribute("int32", DataType::INT32, CollectionType::SINGLE); diff --git a/searchlib/src/vespa/searchlib/test/schema_builder.cpp b/searchlib/src/vespa/searchlib/test/schema_builder.cpp index fb3a356da48..dc030ccfeb6 100644 --- a/searchlib/src/vespa/searchlib/test/schema_builder.cpp +++ b/searchlib/src/vespa/searchlib/test/schema_builder.cpp @@ -166,10 +166,10 @@ SchemaBuilder::add_all_attributes() return *this; } -std::unique_ptr +search::index::Schema SchemaBuilder::build() { - return std::move(_schema); + return std::move(*_schema); } } diff --git a/searchlib/src/vespa/searchlib/test/schema_builder.h b/searchlib/src/vespa/searchlib/test/schema_builder.h index 8b48de61e7b..274f6e04955 100644 --- a/searchlib/src/vespa/searchlib/test/schema_builder.h +++ b/searchlib/src/vespa/searchlib/test/schema_builder.h @@ -27,7 +27,7 @@ public: SchemaBuilder& add_all_indexes(std::optional interleaved_features = std::nullopt); SchemaBuilder& add_attributes(std::vector field_names); SchemaBuilder& add_all_attributes(); - std::unique_ptr build(); + search::index::Schema build(); }; } -- cgit v1.2.3