diff options
Diffstat (limited to 'searchlib/src')
8 files changed, 8 insertions, 33 deletions
diff --git a/searchlib/src/tests/attribute/attribute_operation/attribute_operation_test.cpp b/searchlib/src/tests/attribute/attribute_operation/attribute_operation_test.cpp index bdd5682acb6..c7b8cd0427b 100644 --- a/searchlib/src/tests/attribute/attribute_operation/attribute_operation_test.cpp +++ b/searchlib/src/tests/attribute/attribute_operation/attribute_operation_test.cpp @@ -2,7 +2,7 @@ #include <vespa/searchlib/attribute/attribute_operation.h> #include <vespa/searchlib/attribute/attributefactory.h> -#include <vespa/searchlib/attribute/singlenumericattribute.h> +#include <vespa/searchlib/attribute/attribute.h> #include <vespa/searchlib/common/bitvector.h> #include <vespa/vespalib/testkit/testapp.h> diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp index 6f5902ed7b8..af1fcea2e21 100644 --- a/searchlib/src/tests/attribute/attribute_test.cpp +++ b/searchlib/src/tests/attribute/attribute_test.cpp @@ -15,7 +15,6 @@ #include <vespa/searchlib/attribute/multinumericattribute.h> #include <vespa/searchlib/attribute/multistringattribute.h> #include <vespa/searchlib/attribute/predicate_attribute.h> -#include <vespa/searchlib/attribute/singlenumericattribute.h> #include <vespa/searchlib/attribute/singlenumericpostattribute.h> #include <vespa/searchlib/attribute/singlestringattribute.h> #include <vespa/searchlib/attribute/multivalueattribute.hpp> diff --git a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp index eef0274f50a..fc87e07a4e9 100644 --- a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp +++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp @@ -4,12 +4,6 @@ #include <vespa/searchlib/attribute/attribute.h> #include <vespa/searchlib/attribute/attributeguard.h> #include <vespa/searchlib/attribute/attributefactory.h> -#include <vespa/searchlib/attribute/singlenumericattribute.h> -#include <vespa/searchlib/attribute/multinumericattribute.h> -#include <vespa/searchlib/attribute/singlestringattribute.h> -#include <vespa/searchlib/attribute/multistringattribute.h> -#include <vespa/searchlib/attribute/attrvector.h> -#include <vespa/searchlib/attribute/attributevector.hpp> #include <vespa/fastos/thread.h> #include <vespa/fastos/app.h> #include <iostream> @@ -25,14 +19,15 @@ using std::shared_ptr; typedef std::vector<uint32_t> NumVector; typedef std::vector<vespalib::string> StringVector; -typedef AttributeVector::SP AttributePtr; -typedef AttributeVector::DocId DocId; typedef search::attribute::Config AttrConfig; using search::attribute::BasicType; using search::attribute::CollectionType; namespace search { +using AttributePtr = AttributeVector::SP; +using DocId = AttributeVector::DocId; + class AttributeBenchmark : public FastOS_Application { private: diff --git a/searchlib/src/tests/attribute/document_weight_iterator/document_weight_iterator_test.cpp b/searchlib/src/tests/attribute/document_weight_iterator/document_weight_iterator_test.cpp index 224b3bd127f..715df028e8d 100644 --- a/searchlib/src/tests/attribute/document_weight_iterator/document_weight_iterator_test.cpp +++ b/searchlib/src/tests/attribute/document_weight_iterator/document_weight_iterator_test.cpp @@ -5,16 +5,8 @@ #include <vespa/searchlib/attribute/attributeguard.h> #include <vespa/searchlib/attribute/attribute_read_guard.h> #include <vespa/searchlib/attribute/attributememorysavetarget.h> -#include <vespa/searchlib/attribute/attributevector.h> -#include <vespa/searchlib/attribute/attrvector.h> #include <vespa/searchlib/attribute/i_document_weight_attribute.h> #include <vespa/searchlib/attribute/iattributemanager.h> -#include <vespa/searchlib/attribute/multinumericattribute.h> -#include <vespa/searchlib/attribute/multinumericpostattribute.hpp> -#include <vespa/searchlib/attribute/multistringattribute.h> -#include <vespa/searchlib/attribute/multistringpostattribute.hpp> -#include <vespa/searchlib/attribute/singlenumericattribute.h> -#include <vespa/searchlib/attribute/singlestringattribute.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/query/tree/location.h> #include <vespa/searchlib/query/tree/simplequery.h> diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp index 079195a3a9a..6eb13ea8f7d 100644 --- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp +++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp @@ -9,9 +9,6 @@ #include <vespa/searchlib/attribute/attributememoryfilebufferwriter.h> #include <vespa/searchlib/attribute/attributememorysavetarget.h> #include <vespa/searchlib/attribute/attributesaver.h> -#include <vespa/searchlib/attribute/multinumericattribute.h> -#include <vespa/searchlib/attribute/singlenumericattribute.h> -#include <vespa/searchlib/attribute/singlestringattribute.h> #include <vespa/searchlib/queryeval/executeinfo.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> diff --git a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp index 60017b2318f..ec72b348943 100644 --- a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp @@ -8,9 +8,7 @@ #include <vespa/searchlib/attribute/attribute_read_guard.h> #include <vespa/searchlib/attribute/attributecontext.h> #include <vespa/searchlib/attribute/attributefactory.h> -#include <vespa/searchlib/attribute/attributevector.h> -#include <vespa/searchlib/attribute/extendableattributes.h> -#include <vespa/searchlib/attribute/singlenumericattribute.h> +#include <vespa/searchlib/attribute/attribute.h> #include <vespa/searchlib/fef/matchdata.h> #include <vespa/searchlib/query/tree/location.h> #include <vespa/searchlib/query/tree/point.h> @@ -20,7 +18,6 @@ #include <vespa/searchlib/queryeval/leaf_blueprints.h> #include <vespa/searchlib/queryeval/nearest_neighbor_blueprint.h> #include <vespa/searchlib/tensor/dense_tensor_attribute.h> -#include <vespa/searchlib/attribute/singlenumericpostattribute.hpp> #include <vespa/vespalib/gtest/gtest.h> #include <vespa/log/log.h> @@ -29,7 +26,6 @@ LOG_SETUP("attributeblueprint_test"); using search::AttributeGuard; using search::AttributeVector; using search::IAttributeManager; -using search::SingleStringExtAttribute; using search::attribute::IAttributeContext; using search::fef::MatchData; using search::fef::TermFieldMatchData; diff --git a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp index 5171db3ef04..11da9701b92 100644 --- a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp +++ b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.cpp @@ -5,8 +5,7 @@ #include <vespa/searchlib/attribute/searchcontextelementiterator.h> #include <vespa/searchlib/attribute/flagattribute.h> #include <vespa/searchlib/attribute/singleboolattribute.h> -#include <vespa/searchlib/attribute/singlenumericattribute.h> -#include <vespa/searchlib/attribute/singlestringattribute.h> +#include <vespa/searchlib/attribute/stringbase.h> #include <vespa/searchlib/common/bitvectoriterator.h> #include <vespa/searchlib/fef/matchdata.h> #include <vespa/searchlib/fef/termfieldmatchdataarray.h> @@ -19,6 +18,7 @@ #include <vespa/searchlib/test/searchiteratorverifier.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/compress.h> +#include <vespa/vespalib/util/stringfmt.h> #include <vespa/log/log.h> LOG_SETUP("searchcontext_test"); diff --git a/searchlib/src/tests/common/location_iterator/location_iterator_test.cpp b/searchlib/src/tests/common/location_iterator/location_iterator_test.cpp index 84b81fccf7c..683735b1dc0 100644 --- a/searchlib/src/tests/common/location_iterator/location_iterator_test.cpp +++ b/searchlib/src/tests/common/location_iterator/location_iterator_test.cpp @@ -2,13 +2,9 @@ #include <vespa/searchlib/attribute/attributefactory.h> #include <vespa/searchlib/attribute/attributeguard.h> -#include <vespa/searchlib/attribute/attribute.h> #include <vespa/searchlib/attribute/attributevector.h> -#include <vespa/searchlib/attribute/attrvector.h> #include <vespa/searchlib/attribute/iattributemanager.h> -#include <vespa/searchlib/attribute/multinumericattribute.h> -#include <vespa/searchlib/attribute/multinumericpostattribute.hpp> -#include <vespa/searchlib/attribute/singlenumericattribute.h> +#include <vespa/searchlib/attribute/integerbase.h> #include <vespa/searchlib/common/geo_location.h> #include <vespa/searchlib/common/location.h> #include <vespa/searchlib/common/locationiterators.h> |