diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-24 11:17:01 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-24 13:05:22 +0000 |
commit | 23940966c79d9977e3d7ba4939037f90058a5b50 (patch) | |
tree | 82a1928fef6a5076eb7a8a861bb4ff0cc646bf28 /storage/src/tests/persistence/filestorage | |
parent | 1545c0208a32e96db1bf17237b465757e7eab617 (diff) |
Remove load type from MergeStatus and Mergehandler.
Diffstat (limited to 'storage/src/tests/persistence/filestorage')
-rw-r--r-- | storage/src/tests/persistence/filestorage/mergeblockingtest.cpp | 2 | ||||
-rw-r--r-- | storage/src/tests/persistence/filestorage/operationabortingtest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp index 35aee60d30f..8b38083b33d 100644 --- a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp +++ b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp @@ -2,7 +2,7 @@ #include <vespa/document/test/make_document_bucket.h> #include <vespa/storage/persistence/messages.h> -#include <tests/persistence/common/persistenceproviderwrapper.h> +#include <vespa/storageapi/message/bucket.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <tests/persistence/common/filestortestfixture.h> #include <vector> diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp index 0582aa5c6b3..95e2d8e2c43 100644 --- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp +++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/storage/persistence/messages.h> +#include <vespa/storageapi/message/bucket.h> #include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <tests/persistence/common/filestortestfixture.h> @@ -9,7 +10,6 @@ #include <vespa/vespalib/util/thread.h> #include <vespa/vespalib/stllike/hash_set_insert.hpp> #include <vespa/vespalib/gtest/gtest.h> -#include <vespa/vespalib/util/time.h> #include <thread> #include <vespa/log/log.h> |