diff options
author | Geir Storli <geirst@yahoo-inc.com> | 2017-05-08 12:01:40 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahoo-inc.com> | 2017-05-12 14:01:23 +0000 |
commit | 01a1839b9209f2ce4e2f707a75e2e73ede20c671 (patch) | |
tree | 919d30091363b971f5beb19e4ae073ea2b6ea15e /searchcore/src/tests/proton/attribute/attribute_test.cpp | |
parent | b0ea3ea8a5d65ca8e8298e50bebc984882e8f767 (diff) |
Move DirectoryHandler from searchcore to searchlib.
Diffstat (limited to 'searchcore/src/tests/proton/attribute/attribute_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/attribute/attribute_test.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 173d8dd2a2a..880e5330f25 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -32,7 +32,7 @@ LOG_SETUP("attribute_test"); #include <vespa/searchlib/predicate/predicate_hash.h> #include <vespa/searchlib/common/foregroundtaskexecutor.h> #include <vespa/searchlib/common/sequencedtaskexecutorobserver.h> -#include <vespa/searchcore/proton/test/directory_handler.h> +#include <vespa/searchlib/test/directory_handler.h> #include <vespa/eval/tensor/tensor.h> #include <vespa/eval/tensor/types.h> #include <vespa/eval/tensor/default_tensor.h> @@ -50,12 +50,14 @@ using namespace search::index; using namespace search; using namespace vespa::config::search; +using proton::test::AttributeUtils; using search::TuneFileAttributes; using search::index::DummyFileHeaderContext; using search::index::schema::CollectionType; using search::predicate::PredicateHash; using search::predicate::PredicateIndex; using search::tensor::TensorAttribute; +using search::test::DirectoryHandler; using std::string; using vespalib::eval::ValueType; using vespalib::tensor::Tensor; @@ -88,13 +90,13 @@ const AVConfig INT32_ARRAY = unregister(AVConfig(AVBasicType::INT32, AVCollectio void fillAttribute(const AttributeVector::SP &attr, uint32_t numDocs, int64_t value, uint64_t lastSyncToken) { - test::AttributeUtils::fillAttribute(attr, numDocs, value, lastSyncToken); + AttributeUtils::fillAttribute(attr, numDocs, value, lastSyncToken); } void fillAttribute(const AttributeVector::SP &attr, uint32_t from, uint32_t to, int64_t value, uint64_t lastSyncToken) { - test::AttributeUtils::fillAttribute(attr, from, to, value, lastSyncToken); + AttributeUtils::fillAttribute(attr, from, to, value, lastSyncToken); } const std::shared_ptr<IDestructorCallback> emptyCallback; @@ -102,7 +104,7 @@ const std::shared_ptr<IDestructorCallback> emptyCallback; struct Fixture { - test::DirectoryHandler _dirHandler; + DirectoryHandler _dirHandler; DummyFileHeaderContext _fileHeaderContext; ForegroundTaskExecutor _attributeFieldWriterReal; SequencedTaskExecutorObserver _attributeFieldWriter; @@ -518,7 +520,7 @@ const FilterAttributeManager::AttributeSet ACCEPTED_ATTRIBUTES = {"a2"}; struct FilterFixture { - test::DirectoryHandler _dirHandler; + DirectoryHandler _dirHandler; DummyFileHeaderContext _fileHeaderContext; ForegroundTaskExecutor _attributeFieldWriter; HwInfo _hwInfo; |