summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-05-05 12:04:54 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-05-05 12:04:54 +0000
commit11c7ca4c164bec4c0afbc2fec70b61ff8755ea7d (patch)
treefaa37b1e76f99be8fec2e92b666e45a60877865d
parent3951cf1ed16f56674a28f4efbb7973bfbe4e7c6c (diff)
Update comments.
-rw-r--r--searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp2
-rw-r--r--storage/src/vespa/storage/persistence/persistencethread.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
index 20c32e0048a..91ccac6fce1 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
@@ -412,7 +412,7 @@ PersistenceEngine::updateAsync(const Bucket& b, Timestamp t, DocumentUpdate::SP
}
IPersistenceHandler * handler = getHandler(rguard, b.getBucketSpace(), docType);
- if ( handler == nullptr) {
+ if (handler == nullptr) {
return onComplete->onComplete(std::make_unique<UpdateResult>(Result::ErrorType::PERMANENT_ERROR, make_string("No handler for document type '%s'", docType.toString().c_str())));
}
auto transportContext = std::make_unique<AsyncTranportContext>(1, std::move(onComplete));
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index a77eea1073e..c53367c16f6 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -213,6 +213,7 @@ PersistenceThread::handleRemove(api::RemoveCommand& cmd, MessageTracker::UP trac
metrics.notFound.inc();
}
} else {
+ // Note that the &cmd capture is OK since its lifetime is guaranteed by the tracker
auto task = makeResultTask([&metrics, &cmd, tracker = std::move(trackerUP)](spi::Result::UP responseUP) {
const spi::RemoveResult & response = dynamic_cast<const spi::RemoveResult &>(*responseUP);
if (tracker->checkForError(response)) {
@@ -250,6 +251,7 @@ PersistenceThread::handleUpdate(api::UpdateCommand& cmd, MessageTracker::UP trac
tracker.setReply(std::move(reply));
}
} else {
+ // Note that the &cmd capture is OK since its lifetime is guaranteed by the tracker
auto task = makeResultTask([&cmd, tracker = std::move(trackerUP)](spi::Result::UP responseUP) {
const spi::UpdateResult & response = dynamic_cast<const spi::UpdateResult &>(*responseUP);
if (tracker->checkForError(response)) {