diff options
3 files changed, 41 insertions, 30 deletions
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp index 2710c1bc0fd..115394f61c8 100644 --- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp +++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp @@ -17,11 +17,24 @@ using document::Document; using document::DocumentId; using document::DocumentType; using search::DocumentMetaData; +using storage::spi::Bucket; using storage::spi::BucketChecksum; +using storage::spi::BucketIdListResult; using storage::spi::BucketInfo; +using storage::spi::BucketInfoResult; +using storage::spi::Context; using storage::spi::ClusterState; +using storage::spi::CreateIteratorResult; using storage::spi::DocumentSelection; using storage::spi::GetResult; +using storage::spi::IteratorId; +using storage::spi::IterateResult; +using storage::spi::PartitionId; +using storage::spi::RemoveResult; +using storage::spi::Result; +using storage::spi::Selection; +using storage::spi::Timestamp; +using storage::spi::UpdateResult; using namespace proton; using namespace vespalib; diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp index 289f51ac195..00120012301 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp @@ -273,7 +273,7 @@ PersistenceEngine::initialize() } -PartitionStateListResult +PersistenceEngine::PartitionStateListResult PersistenceEngine::getPartitionStates() const { PartitionStateList list(1); @@ -388,7 +388,7 @@ PersistenceEngine::put(const Bucket& b, Timestamp t, const document::Document::S return latch.getResult(); } -RemoveResult +PersistenceEngine::RemoveResult PersistenceEngine::remove(const Bucket& b, Timestamp t, const DocumentId& did, Context&) { std::shared_lock<std::shared_timed_mutex> rguard(_rwMutex); @@ -412,7 +412,7 @@ PersistenceEngine::remove(const Bucket& b, Timestamp t, const DocumentId& did, C } -UpdateResult +PersistenceEngine::UpdateResult PersistenceEngine::update(const Bucket& b, Timestamp t, const DocumentUpdate::SP& upd, Context&) { if (!_writeFilter.acceptWriteOperation()) { @@ -446,7 +446,7 @@ PersistenceEngine::update(const Bucket& b, Timestamp t, const DocumentUpdate::SP } -GetResult +PersistenceEngine::GetResult PersistenceEngine::get(const Bucket& b, const document::FieldSet& fields, const DocumentId& did, @@ -478,7 +478,7 @@ PersistenceEngine::get(const Bucket& b, } -CreateIteratorResult +PersistenceEngine::CreateIteratorResult PersistenceEngine::createIterator(const Bucket &bucket, const document::FieldSet& fields, const Selection &selection, @@ -508,7 +508,7 @@ PersistenceEngine::createIterator(const Bucket &bucket, } -IterateResult +PersistenceEngine::IterateResult PersistenceEngine::iterate(IteratorId id, uint64_t maxByteSize, Context&) const { std::shared_lock<std::shared_timed_mutex> rguard(_rwMutex); @@ -688,7 +688,7 @@ PersistenceEngine::saveClusterState(const ClusterState &calc) } } -ClusterState::SP +PersistenceEngine::ClusterState::SP PersistenceEngine::savedClusterState(void) const { LockGuard guard(_lock); diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h index a651b85f705..ccd06a8eb0f 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h @@ -12,34 +12,32 @@ namespace proton { -using document::DocumentUpdate; -using storage::spi::Bucket; -using storage::spi::BucketIdListResult; -using storage::spi::BucketInfo; -using storage::spi::BucketInfoResult; -using storage::spi::ClusterState; -using storage::spi::Context; -using storage::spi::CreateIteratorResult; -using storage::spi::GetResult; -using storage::spi::IncludedVersions; -using storage::spi::IterateResult; -using storage::spi::IteratorId; -using storage::spi::MaintenanceLevel; -using storage::spi::PartitionId; -using storage::spi::PartitionStateListResult; -using storage::spi::RemoveResult; -using storage::spi::Result; -using storage::spi::Selection; -using storage::spi::Timestamp; -using storage::spi::TimestampList; -using storage::spi::UpdateResult; - class IPersistenceEngineOwner; class PersistenceEngine : public storage::spi::AbstractPersistenceProvider { private: typedef vespalib::Sequence<IPersistenceHandler *> PersistenceHandlerSequence; - + using DocumentUpdate = document::DocumentUpdate; + using Bucket = storage::spi::Bucket; + using BucketIdListResult = storage::spi::BucketIdListResult; + using BucketInfo = storage::spi::BucketInfo; + using BucketInfoResult = storage::spi::BucketInfoResult; + using ClusterState = storage::spi::ClusterState; + using Context = storage::spi::Context; + using CreateIteratorResult = storage::spi::CreateIteratorResult; + using GetResult = storage::spi::GetResult; + using IncludedVersions = storage::spi::IncludedVersions; + using IterateResult = storage::spi::IterateResult; + using IteratorId = storage::spi::IteratorId; + using MaintenanceLevel = storage::spi::MaintenanceLevel; + using PartitionId = storage::spi::PartitionId; + using PartitionStateListResult = storage::spi::PartitionStateListResult; + using RemoveResult = storage::spi::RemoveResult; + using Result = storage::spi::Result; + using Selection = storage::spi::Selection; + using Timestamp = storage::spi::Timestamp; + using TimestampList = storage::spi::TimestampList; + using UpdateResult = storage::spi::UpdateResult; class HandlerSnapshot { private: PersistenceHandlerSequence::UP _handlers; |