diff options
Diffstat (limited to 'searchcore')
5 files changed, 11 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 0e6bd2c74fe..a643dda01c6 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -40,9 +40,11 @@ #include <vespa/searchlib/test/directory_handler.h> #include <vespa/searchlib/util/filekit.h> #include <vespa/vespalib/io/fileutil.h> +#include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcommon/attribute/iattributevector.h> +#include <vespa/searchlib/btree/btreeroot.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_test"); diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp index 3add3b727b9..9ab60f06f21 100644 --- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp +++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp @@ -16,6 +16,7 @@ #include <vespa/searchlib/test/mock_attribute_manager.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <unordered_set> #include <vespa/log/log.h> LOG_SETUP("document_iterator_test"); @@ -50,7 +51,6 @@ using storage::spi::Timestamp; using storage::spi::test::makeSpiBucket; using namespace proton; -using namespace search::index; const uint64_t largeNum = 10000000; diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp index abf595f87eb..7a82ad9a4a5 100644 --- a/searchcore/src/tests/proton/server/documentretriever_test.cpp +++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp @@ -31,7 +31,10 @@ #include <vespa/searchlib/attribute/integerbase.h> #include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/searchlib/attribute/stringbase.h> +#include <vespa/searchlib/predicate/predicate_index.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/util/stringfmt.h> + #include <vespa/log/log.h> LOG_SETUP("document_retriever_test"); diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp index dac0fbc2cc7..d8dc8b9df42 100644 --- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp @@ -17,8 +17,10 @@ #include <vespa/searchlib/common/base.h> #include <vespa/searchlib/tensor/tensor_attribute.h> #include <vespa/searchlib/attribute/reference_attribute.h> +#include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/searchlib/attribute/attributevector.hpp> #include <vespa/searchlib/attribute/changevector.hpp> +#include <vespa/vespalib/util/stringfmt.h> #include <sstream> #include <vespa/log/log.h> diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.h b/searchcore/src/vespa/searchcore/proton/common/attrupdate.h index 6012a02e804..cece6d2ceae 100644 --- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.h +++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.h @@ -4,13 +4,14 @@ #include <vespa/document/fieldvalue/fieldvalue.h> #include <vespa/document/update/documentupdate.h> #include <vespa/searchlib/attribute/attribute.h> -#include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/vespalib/util/exception.h> namespace search { +class PredicateAttribute; + namespace tensor { class TensorAttribute; } -namespace attribute { class ReferenceAttribute; } +namespace attribute {class ReferenceAttribute; } VESPA_DEFINE_EXCEPTION(UpdateException, vespalib::Exception); |