diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2017-05-18 14:50:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-18 14:50:43 +0200 |
commit | fe79e56292015001e8e0399945bf0e1814cbc2c5 (patch) | |
tree | b2cd7b99185edced62af53e5f33b460b001a2f5e /searchcore/src/tests/proton/attribute/attribute_populator | |
parent | 7b799fbb39eafa69419840ecef0eaea9907b8a71 (diff) | |
parent | 42b7f83f2674c55ad98c1384c853c01159577ab3 (diff) |
Merge pull request #2443 from yahoo/geirst/init-handling-of-lid-space-compaction-in-doc-store
Geirst/init handling of lid space compaction in doc store
Diffstat (limited to 'searchcore/src/tests/proton/attribute/attribute_populator')
-rw-r--r-- | searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp index 4a3f0eb09b7..6855bdfb8c0 100644 --- a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp @@ -5,22 +5,25 @@ LOG_SETUP("attribute_populator_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/searchcore/proton/attribute/attributemanager.h> #include <vespa/searchcore/proton/attribute/attribute_populator.h> +#include <vespa/searchcore/proton/attribute/attributemanager.h> +#include <vespa/searchcore/proton/common/hw_info.h> #include <vespa/searchcore/proton/test/test.h> +#include <vespa/searchlib/common/foregroundtaskexecutor.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> +#include <vespa/searchlib/test/directory_handler.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/searchcore/proton/common/hw_info.h> -#include <vespa/searchlib/common/foregroundtaskexecutor.h> using namespace document; using namespace proton; using namespace search; using namespace search::index; -typedef search::attribute::Config AVConfig; -typedef search::attribute::BasicType AVBasicType; +using search::test::DirectoryHandler; + +using AVBasicType = search::attribute::BasicType; +using AVConfig = search::attribute::Config; const vespalib::string TEST_DIR = "testdir"; const uint64_t CREATE_SERIAL_NUM = 8u; @@ -53,7 +56,7 @@ struct DocContext struct Fixture { - test::DirectoryHandler _testDir; + DirectoryHandler _testDir; DummyFileHeaderContext _fileHeader; ForegroundTaskExecutor _attributeFieldWriter; HwInfo _hwInfo; |