summaryrefslogtreecommitdiffstats
path: root/persistence
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-04-30 13:31:15 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-04-30 13:31:15 +0000
commit704b6635543a6e0b1489f6371de865383575c6e3 (patch)
tree133c64d579995c9e0f083e96e23e4f6351c78f71 /persistence
parente3da8487f35e6ff4ea65f27ba6f3e1bcb89d32a2 (diff)
Add class comments and resolve PR comments.
Diffstat (limited to 'persistence')
-rw-r--r--persistence/src/vespa/persistence/spi/operationcomplete.h3
-rw-r--r--persistence/src/vespa/persistence/spi/persistenceprovider.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/persistence/src/vespa/persistence/spi/operationcomplete.h b/persistence/src/vespa/persistence/spi/operationcomplete.h
index 1a548e613dd..fa386e274f2 100644
--- a/persistence/src/vespa/persistence/spi/operationcomplete.h
+++ b/persistence/src/vespa/persistence/spi/operationcomplete.h
@@ -1,4 +1,5 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.#pragma once
+
#pragma once
#include <memory>
diff --git a/persistence/src/vespa/persistence/spi/persistenceprovider.cpp b/persistence/src/vespa/persistence/spi/persistenceprovider.cpp
index 02fb1bb4719..c60ac615644 100644
--- a/persistence/src/vespa/persistence/spi/persistenceprovider.cpp
+++ b/persistence/src/vespa/persistence/spi/persistenceprovider.cpp
@@ -9,7 +9,7 @@ PersistenceProvider::~PersistenceProvider() = default;
class CatchResult : public OperationComplete {
public:
- std::future<Result::UP> waitResult() {
+ std::future<Result::UP> future_result() {
return promisedResult.get_future();
}
void onComplete(Result::UP result) override {
@@ -18,13 +18,15 @@ public:
private:
std::promise<Result::UP> promisedResult;
};
+
Result
PersistenceProvider::put(const Bucket& bucket, Timestamp timestamp, DocumentSP doc, Context& context) {
auto catcher = std::make_unique<CatchResult>();
- auto future = catcher->waitResult();
+ auto future = catcher->future_result();
putAsync(bucket, timestamp, std::move(doc), context, std::move(catcher));
return *future.get();
}
+
void
PersistenceProvider::putAsync(const Bucket &bucket, Timestamp timestamp, DocumentSP doc, Context &context,
OperationComplete::UP onComplete) {