From 3948d63b4d7a64fb964f052df4dfcb87845bd364 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Mon, 3 Apr 2017 11:38:27 +0000 Subject: Use CollectionType defined in search::index::schema for search::fef::FieldInfo. This is the same as done with DataType. --- .../src/tests/features/beta/beta_features.cpp | 1 + .../element_completeness_test.cpp | 1 + .../element_similarity_feature_test.cpp | 1 + .../euclidean_distance/euclidean_distance_test.cpp | 1 + searchlib/src/tests/features/featurebenchmark.cpp | 2 + .../item_raw_score/item_raw_score_test.cpp | 1 + .../native_dot_product/native_dot_product_test.cpp | 1 + searchlib/src/tests/features/prod_features.cpp | 10 ++--- .../features/prod_features_attributematch.cpp | 11 +++-- .../tests/features/prod_features_fieldmatch.cpp | 2 +- .../features/prod_features_fieldtermmatch.cpp | 1 + .../src/tests/features/prod_features_framework.cpp | 1 + .../tests/features/raw_score/raw_score_test.cpp | 1 + .../tests/features/subqueries/subqueries_test.cpp | 1 + .../src/tests/features/tensor/tensor_test.cpp | 11 ++--- .../text_similarity_feature_test.cpp | 1 + .../src/tests/fef/parameter/parameter_test.cpp | 1 + searchlib/src/tests/nativerank/nativerank.cpp | 1 + .../features/element_similarity_feature.cpp | 5 ++- .../vespa/searchlib/features/fieldmatchfeature.cpp | 3 +- .../src/vespa/searchlib/features/matchfeature.cpp | 1 + .../searchlib/features/text_similarity_feature.cpp | 5 ++- searchlib/src/vespa/searchlib/fef/CMakeLists.txt | 1 - .../src/vespa/searchlib/fef/collection_type.cpp | 21 --------- .../src/vespa/searchlib/fef/collection_type.h | 51 ---------------------- searchlib/src/vespa/searchlib/fef/fef.h | 1 - searchlib/src/vespa/searchlib/fef/fieldinfo.h | 2 +- .../src/vespa/searchlib/fef/parametervalidator.cpp | 2 + searchlib/src/vespa/searchlib/fef/test/ftlib.cpp | 2 +- .../searchlib/fef/test/indexenvironmentbuilder.cpp | 2 +- .../searchlib/fef/test/indexenvironmentbuilder.h | 2 +- 31 files changed, 49 insertions(+), 98 deletions(-) delete mode 100644 searchlib/src/vespa/searchlib/fef/collection_type.cpp delete mode 100644 searchlib/src/vespa/searchlib/fef/collection_type.h (limited to 'searchlib') diff --git a/searchlib/src/tests/features/beta/beta_features.cpp b/searchlib/src/tests/features/beta/beta_features.cpp index 2d992ab82e1..30b88e8a3e0 100644 --- a/searchlib/src/tests/features/beta/beta_features.cpp +++ b/searchlib/src/tests/features/beta/beta_features.cpp @@ -41,6 +41,7 @@ LOG_SETUP("beta_features_test"); using namespace search::features; using namespace search::fef; using namespace search::fef::test; +using CollectionType = FieldInfo::CollectionType; //--------------------------------------------------------------------------------------------------------------------- // TermPositionList diff --git a/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp b/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp index 24d1625520d..956599c81f6 100644 --- a/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp +++ b/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp @@ -12,6 +12,7 @@ using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; std::vector featureNamesFoo() { std::vector f; diff --git a/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp b/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp index 181f2fb71f3..6405ddf784a 100644 --- a/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp +++ b/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp @@ -13,6 +13,7 @@ using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; const vespalib::string DEFAULT = "elementSimilarity(foo)"; const vespalib::string PROXIMITY = "elementSimilarity(foo).proximity"; diff --git a/searchlib/src/tests/features/euclidean_distance/euclidean_distance_test.cpp b/searchlib/src/tests/features/euclidean_distance/euclidean_distance_test.cpp index b947f1a71e2..00aa4ed7b20 100644 --- a/searchlib/src/tests/features/euclidean_distance/euclidean_distance_test.cpp +++ b/searchlib/src/tests/features/euclidean_distance/euclidean_distance_test.cpp @@ -27,6 +27,7 @@ typedef search::attribute::BasicType AVBT; typedef search::attribute::CollectionType AVCT; typedef search::AttributeVector::SP AttributePtr; typedef FtTestApp FTA; +using CollectionType = FieldInfo::CollectionType; struct SetupFixture { diff --git a/searchlib/src/tests/features/featurebenchmark.cpp b/searchlib/src/tests/features/featurebenchmark.cpp index a20ec88fef3..43bda497333 100644 --- a/searchlib/src/tests/features/featurebenchmark.cpp +++ b/searchlib/src/tests/features/featurebenchmark.cpp @@ -36,6 +36,8 @@ typedef search::attribute::CollectionType AVCT; typedef AttributeVector::SP AttributePtr; +using CollectionType = FieldInfo::CollectionType; + class Benchmark : public FtTestApp { public: typedef std::vector > KeyValueVector; diff --git a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp index fe093d41ba7..26af4149c04 100644 --- a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp +++ b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp @@ -14,6 +14,7 @@ using search::feature_t; using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; const vespalib::string featureName("itemRawScore(label)"); diff --git a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp index 87305cd1670..98722f40289 100644 --- a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp +++ b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp @@ -14,6 +14,7 @@ using search::feature_t; using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; const std::string featureName("nativeDotProduct(foo)"); diff --git a/searchlib/src/tests/features/prod_features.cpp b/searchlib/src/tests/features/prod_features.cpp index 3bdb1faa240..770473d5308 100644 --- a/searchlib/src/tests/features/prod_features.cpp +++ b/searchlib/src/tests/features/prod_features.cpp @@ -62,11 +62,11 @@ using search::StringAttribute; using search::WeightedSetStringExtAttribute; using search::attribute::WeightedEnumContent; -typedef AttributeVector::SP AttributePtr; - -typedef search::attribute::Config AVC; -typedef search::attribute::BasicType AVBT; -typedef search::attribute::CollectionType AVCT; +using AttributePtr = AttributeVector::SP; +using AVC = search::attribute::Config; +using AVBT = search::attribute::BasicType; +using AVCT = search::attribute::CollectionType; +using CollectionType = FieldInfo::CollectionType; const double EPS = 10e-6; diff --git a/searchlib/src/tests/features/prod_features_attributematch.cpp b/searchlib/src/tests/features/prod_features_attributematch.cpp index 7ccfd1dea1a..724b8171b4e 100644 --- a/searchlib/src/tests/features/prod_features_attributematch.cpp +++ b/searchlib/src/tests/features/prod_features_attributematch.cpp @@ -13,13 +13,12 @@ using namespace search::fef::test; using search::AttributeVector; using search::AttributeFactory; +using AttributePtr = AttributeVector::SP; -typedef AttributeVector::SP AttributePtr; - -typedef search::attribute::Config AVC; -typedef search::attribute::BasicType AVBT; -typedef search::attribute::CollectionType AVCT; - +using AVC = search::attribute::Config; +using AVBT = search::attribute::BasicType; +using AVCT = search::attribute::CollectionType; +using CollectionType = FieldInfo::CollectionType; void Test::testAttributeMatch() diff --git a/searchlib/src/tests/features/prod_features_fieldmatch.cpp b/searchlib/src/tests/features/prod_features_fieldmatch.cpp index e9bafdb1c78..f2fc7016751 100644 --- a/searchlib/src/tests/features/prod_features_fieldmatch.cpp +++ b/searchlib/src/tests/features/prod_features_fieldmatch.cpp @@ -12,8 +12,8 @@ LOG_SETUP(".prod_features_fieldmatch"); using namespace search::features; using namespace search::fef; using namespace search::fef::test; - using search::AttributeVector; +using CollectionType = FieldInfo::CollectionType; void Test::testFieldMatch() diff --git a/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp b/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp index 04caadd2029..886feffefc4 100644 --- a/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp +++ b/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp @@ -9,6 +9,7 @@ LOG_SETUP(".prod_features_fieldtermmatch"); using namespace search::features; using namespace search::fef; using namespace search::fef::test; +using CollectionType = FieldInfo::CollectionType; void Test::testFieldTermMatch() diff --git a/searchlib/src/tests/features/prod_features_framework.cpp b/searchlib/src/tests/features/prod_features_framework.cpp index 30a48ce61f4..19a048063c3 100644 --- a/searchlib/src/tests/features/prod_features_framework.cpp +++ b/searchlib/src/tests/features/prod_features_framework.cpp @@ -9,6 +9,7 @@ LOG_SETUP(".prod_features_framework"); using namespace search::features; using namespace search::fef; using namespace search::fef::test; +using CollectionType = FieldInfo::CollectionType; void Test::testFramework() diff --git a/searchlib/src/tests/features/raw_score/raw_score_test.cpp b/searchlib/src/tests/features/raw_score/raw_score_test.cpp index b98c60b7c50..ab7db84544f 100644 --- a/searchlib/src/tests/features/raw_score/raw_score_test.cpp +++ b/searchlib/src/tests/features/raw_score/raw_score_test.cpp @@ -13,6 +13,7 @@ using search::feature_t; using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; const std::string featureName("rawScore(foo)"); diff --git a/searchlib/src/tests/features/subqueries/subqueries_test.cpp b/searchlib/src/tests/features/subqueries/subqueries_test.cpp index 4ed3b833853..d60de9af4e0 100644 --- a/searchlib/src/tests/features/subqueries/subqueries_test.cpp +++ b/searchlib/src/tests/features/subqueries/subqueries_test.cpp @@ -13,6 +13,7 @@ using search::feature_t; using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; struct BlueprintFactoryFixture { BlueprintFactory factory; diff --git a/searchlib/src/tests/features/tensor/tensor_test.cpp b/searchlib/src/tests/features/tensor/tensor_test.cpp index a2477b1cc8e..8e6ddef3842 100644 --- a/searchlib/src/tests/features/tensor/tensor_test.cpp +++ b/searchlib/src/tests/features/tensor/tensor_test.cpp @@ -37,11 +37,12 @@ using vespalib::tensor::TensorCells; using vespalib::tensor::TensorDimensions; using vespalib::tensor::TensorFactory; -typedef search::attribute::Config AVC; -typedef search::attribute::BasicType AVBT; -typedef search::attribute::CollectionType AVCT; -typedef search::AttributeVector::SP AttributePtr; -typedef FtTestApp FTA; +using AVC = search::attribute::Config; +using AVBT = search::attribute::BasicType; +using AVCT = search::attribute::CollectionType; +using AttributePtr = search::AttributeVector::SP; +using FTA = FtTestApp; +using CollectionType = FieldInfo::CollectionType; namespace { diff --git a/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp b/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp index 6a6b9d0a48e..bf3336a8b33 100644 --- a/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp +++ b/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp @@ -13,6 +13,7 @@ using namespace search::fef; using namespace search::fef::test; using namespace search::features; +using CollectionType = FieldInfo::CollectionType; std::vector featureNamesFoo() { std::vector f; diff --git a/searchlib/src/tests/fef/parameter/parameter_test.cpp b/searchlib/src/tests/fef/parameter/parameter_test.cpp index 4d6741937d5..72b40308371 100644 --- a/searchlib/src/tests/fef/parameter/parameter_test.cpp +++ b/searchlib/src/tests/fef/parameter/parameter_test.cpp @@ -9,6 +9,7 @@ LOG_SETUP("parameter_test"); #include using namespace search::fef::test; +using CollectionType = search::fef::FieldInfo::CollectionType; namespace search { namespace fef { diff --git a/searchlib/src/tests/nativerank/nativerank.cpp b/searchlib/src/tests/nativerank/nativerank.cpp index 398ca52a190..713b271dd3c 100644 --- a/searchlib/src/tests/nativerank/nativerank.cpp +++ b/searchlib/src/tests/nativerank/nativerank.cpp @@ -18,6 +18,7 @@ LOG_SETUP("nativerank_test"); using namespace search::fef; using namespace search::fef::test; +using CollectionType = FieldInfo::CollectionType; const double EPS = 10e-4; diff --git a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp index 5eb1fc24859..ef4ac1b4e56 100644 --- a/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/element_similarity_feature.cpp @@ -8,6 +8,9 @@ LOG_SETUP(".features.elementsimilarity"); namespace search { + +using CollectionType = fef::FieldInfo::CollectionType; + namespace features { namespace { @@ -359,7 +362,7 @@ ElementSimilarityBlueprint::visitDumpFeatures(const fef::IIndexEnvironment &env, for (uint32_t i = 0; i < env.getNumFields(); ++i) { const fef::FieldInfo &field = *env.getField(i); if ((field.type() == fef::FieldType::INDEX) && - (field.collection() != fef::CollectionType::SINGLE) && + (field.collection() != CollectionType::SINGLE) && ( ! field.isFilter())) { fef::FeatureNameBuilder fnb; diff --git a/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp b/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp index a1450d419c3..3fd33589a66 100644 --- a/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/fieldmatchfeature.cpp @@ -16,6 +16,7 @@ LOG_SETUP(".features.fieldmatchfeature"); #include using namespace search::fef; +using CollectionType = FieldInfo::CollectionType; namespace search { namespace features { @@ -113,7 +114,7 @@ FieldMatchBlueprint::visitDumpFeatures(const IIndexEnvironment & env, for (uint32_t i = 0; i < env.getNumFields(); ++i) { const search::fef::FieldInfo * field = env.getField(i); if (field->type() == search::fef::FieldType::INDEX && - field->collection() == search::fef::CollectionType::SINGLE) + field->collection() == CollectionType::SINGLE) { FeatureNameBuilder fnb; fnb.baseName(getBaseName()).parameter(field->name()); diff --git a/searchlib/src/vespa/searchlib/features/matchfeature.cpp b/searchlib/src/vespa/searchlib/features/matchfeature.cpp index ca14e55232f..cb006c194d7 100644 --- a/searchlib/src/vespa/searchlib/features/matchfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/matchfeature.cpp @@ -13,6 +13,7 @@ LOG_SETUP(".features.matchfeature"); #include "utils.h" using namespace search::fef; +using CollectionType = FieldInfo::CollectionType; namespace search { namespace features { diff --git a/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp b/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp index 036aabfca59..8340019cb02 100644 --- a/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp +++ b/searchlib/src/vespa/searchlib/features/text_similarity_feature.cpp @@ -6,6 +6,9 @@ LOG_SETUP(".features.textsimilarity"); #include "text_similarity_feature.h" namespace search { + +using CollectionType = fef::FieldInfo::CollectionType; + namespace features { namespace { @@ -181,7 +184,7 @@ TextSimilarityBlueprint::visitDumpFeatures(const search::fef::IIndexEnvironment for (uint32_t i = 0; i < env.getNumFields(); ++i) { const search::fef::FieldInfo &field = *env.getField(i); if (field.type() == search::fef::FieldType::INDEX) { - if (!field.isFilter() && field.collection() == fef::CollectionType::SINGLE) { + if (!field.isFilter() && field.collection() == CollectionType::SINGLE) { search::fef::FeatureNameBuilder fnb; fnb.baseName(getBaseName()).parameter(field.name()); visitor.visitDumpFeature(fnb.output(score_output).buildName()); diff --git a/searchlib/src/vespa/searchlib/fef/CMakeLists.txt b/searchlib/src/vespa/searchlib/fef/CMakeLists.txt index 971fbd542e7..280d3befbf1 100644 --- a/searchlib/src/vespa/searchlib/fef/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/fef/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_add_library(searchlib_fef OBJECT blueprint.cpp blueprintfactory.cpp blueprintresolver.cpp - collection_type.cpp feature_type.cpp featureexecutor.cpp featurenamebuilder.cpp diff --git a/searchlib/src/vespa/searchlib/fef/collection_type.cpp b/searchlib/src/vespa/searchlib/fef/collection_type.cpp deleted file mode 100644 index c5b31a4bd0c..00000000000 --- a/searchlib/src/vespa/searchlib/fef/collection_type.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include -#include "collection_type.h" - -namespace search { -namespace fef { - -CollectionType::CollectionType(uint32_t value) - : _value(value) -{ -} - -const CollectionType CollectionType::SINGLE(1); - -const CollectionType CollectionType::ARRAY(2); - -const CollectionType CollectionType::WEIGHTEDSET(3); - -} // namespace fef -} // namespace search diff --git a/searchlib/src/vespa/searchlib/fef/collection_type.h b/searchlib/src/vespa/searchlib/fef/collection_type.h deleted file mode 100644 index 55c9a7a143c..00000000000 --- a/searchlib/src/vespa/searchlib/fef/collection_type.h +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#pragma once - -namespace search { -namespace fef { - -/** - * Typesafe enum used to indicate the collection type of a field. - **/ -class CollectionType -{ -private: - uint32_t _value; - - CollectionType(uint32_t value); -public: - /** - * Indicating that the field is single-value - **/ - static const CollectionType SINGLE; - - /** - * Indicating that the field is multi-value without element weights - **/ - static const CollectionType ARRAY; - - /** - * Indicating that the field is multi-value with element weights - **/ - static const CollectionType WEIGHTEDSET; - - /** - * Less than operator; needed to be handled as a value by the standard library. - **/ - bool operator<(const CollectionType &rhs) const { return (_value < rhs._value); } - - /** - * Check if two collection types are equal. - **/ - bool operator==(const CollectionType &rhs) const { return (_value == rhs._value); } - - /** - * Check if two collection types are not equal. - **/ - bool operator!=(const CollectionType &rhs) const { return (_value != rhs._value); } -}; - -} // namespace fef -} // namespace search - diff --git a/searchlib/src/vespa/searchlib/fef/fef.h b/searchlib/src/vespa/searchlib/fef/fef.h index 9e6f97d3be4..18e86f319db 100644 --- a/searchlib/src/vespa/searchlib/fef/fef.h +++ b/searchlib/src/vespa/searchlib/fef/fef.h @@ -16,7 +16,6 @@ #include "blueprint.h" #include "blueprintfactory.h" #include "blueprintresolver.h" -#include "collection_type.h" #include "featureexecutor.h" #include "featurenamebuilder.h" #include "featurenameparser.h" diff --git a/searchlib/src/vespa/searchlib/fef/fieldinfo.h b/searchlib/src/vespa/searchlib/fef/fieldinfo.h index ca6796a49d0..19b77f2ab32 100644 --- a/searchlib/src/vespa/searchlib/fef/fieldinfo.h +++ b/searchlib/src/vespa/searchlib/fef/fieldinfo.h @@ -4,7 +4,6 @@ #include #include "fieldtype.h" -#include "collection_type.h" #include namespace search { @@ -19,6 +18,7 @@ const uint32_t IllegalFieldId = 0xffffffff; class FieldInfo { public: + using CollectionType = search::index::schema::CollectionType; using DataType = search::index::schema::DataType; typedef vespalib::string string; private: diff --git a/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp b/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp index 8f6ea9db453..7e149d4b422 100644 --- a/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp +++ b/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp @@ -12,6 +12,8 @@ using vespalib::make_vespa_string; namespace search { namespace fef { +using CollectionType = FieldInfo::CollectionType; + namespace { bool checkCollectionType(ParameterCollection::Enum accept, CollectionType actual) { diff --git a/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp b/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp index 17e405bef7e..9df22f4c17f 100644 --- a/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp +++ b/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp @@ -352,7 +352,7 @@ FtTestApp::setupFieldMatch(FtFeatureTest & ft, const vespalib::string & indexNam const fieldmatch::Params * params, uint32_t totalTermWeight, feature_t totalSignificance, uint32_t docId) { - ft.getIndexEnv().getBuilder().addField(FieldType::INDEX, CollectionType::SINGLE, indexName); + ft.getIndexEnv().getBuilder().addField(FieldType::INDEX, FieldInfo::CollectionType::SINGLE, indexName); if (params != NULL) { Properties & p = ft.getIndexEnv().getProperties(); diff --git a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp index 4682dbfe00f..dbe3ea52078 100644 --- a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp +++ b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp @@ -14,7 +14,7 @@ IndexEnvironmentBuilder::IndexEnvironmentBuilder(IndexEnvironment &env) : IndexEnvironmentBuilder & IndexEnvironmentBuilder::addField(const FieldType &type, - const CollectionType &coll, + const FieldInfo::CollectionType &coll, const vespalib::string &name) { uint32_t idx = _env.getFields().size(); diff --git a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h index 15640eb7bfe..46cccc7eb6f 100644 --- a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h +++ b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h @@ -27,7 +27,7 @@ public: * @param name The name of the field. */ IndexEnvironmentBuilder &addField(const FieldType &type, - const CollectionType &coll, + const FieldInfo::CollectionType &coll, const vespalib::string &name); /** Returns a reference to the index environment of this. */ -- cgit v1.2.3