summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-10-22 11:18:20 +0200
committerGitHub <noreply@github.com>2021-10-22 11:18:20 +0200
commit4dfa0661972e0b42135727598658795995f34131 (patch)
treea4d2273f498c5752945bae950d029fa6cf39f944
parentb95cd673648e3cddc28debd38eefde9f5661291c (diff)
parent513835278bf79f2f60222d3b77ff35fe22ee6bda (diff)
Merge pull request #19698 from vespa-engine/toregge/add-noexcept-specifier-to-operation-complete-callback
Add noexcept specifier to operation complete callback.
-rw-r--r--persistence/src/vespa/persistence/spi/catchresult.cpp2
-rw-r--r--persistence/src/vespa/persistence/spi/catchresult.h2
-rw-r--r--persistence/src/vespa/persistence/spi/operationcomplete.h2
-rw-r--r--searchcore/src/vespa/searchcore/bmcluster/spi_bm_feed_handler.cpp4
-rw-r--r--storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.cpp2
-rw-r--r--storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.h2
-rw-r--r--storage/src/vespa/storage/persistence/asynchandler.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/persistence/src/vespa/persistence/spi/catchresult.cpp b/persistence/src/vespa/persistence/spi/catchresult.cpp
index 3dbe8cfdf7e..366e439cc2d 100644
--- a/persistence/src/vespa/persistence/spi/catchresult.cpp
+++ b/persistence/src/vespa/persistence/spi/catchresult.cpp
@@ -13,7 +13,7 @@ CatchResult::CatchResult()
CatchResult::~CatchResult() = default;
void
-CatchResult::onComplete(std::unique_ptr<Result> result) {
+CatchResult::onComplete(std::unique_ptr<Result> result) noexcept {
_promisedResult.set_value(std::move(result));
}
void
diff --git a/persistence/src/vespa/persistence/spi/catchresult.h b/persistence/src/vespa/persistence/spi/catchresult.h
index 80d4f863971..02c626ea23e 100644
--- a/persistence/src/vespa/persistence/spi/catchresult.h
+++ b/persistence/src/vespa/persistence/spi/catchresult.h
@@ -12,7 +12,7 @@ public:
std::future<std::unique_ptr<Result>> future_result() {
return _promisedResult.get_future();
}
- void onComplete(std::unique_ptr<Result> result) override;
+ void onComplete(std::unique_ptr<Result> result) noexcept override;
void addResultHandler(const ResultHandler * resultHandler) override;
private:
std::promise<std::unique_ptr<Result>> _promisedResult;
diff --git a/persistence/src/vespa/persistence/spi/operationcomplete.h b/persistence/src/vespa/persistence/spi/operationcomplete.h
index fd6b846b2a4..fd4d5714cbc 100644
--- a/persistence/src/vespa/persistence/spi/operationcomplete.h
+++ b/persistence/src/vespa/persistence/spi/operationcomplete.h
@@ -23,7 +23,7 @@ class OperationComplete
public:
using UP = std::unique_ptr<OperationComplete>;
virtual ~OperationComplete() = default;
- virtual void onComplete(std::unique_ptr<Result> result) = 0;
+ virtual void onComplete(std::unique_ptr<Result> result) noexcept = 0;
virtual void addResultHandler(const ResultHandler * resultHandler) = 0;
};
diff --git a/searchcore/src/vespa/searchcore/bmcluster/spi_bm_feed_handler.cpp b/searchcore/src/vespa/searchcore/bmcluster/spi_bm_feed_handler.cpp
index 8ad120e7d05..eccae8fe8ab 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/spi_bm_feed_handler.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/spi_bm_feed_handler.cpp
@@ -39,7 +39,7 @@ class MyOperationComplete : public storage::spi::OperationComplete
public:
MyOperationComplete(PersistenceProvider* provider, std::atomic<uint32_t> &errors, const Bucket& bucket, PendingTracker& tracker);
~MyOperationComplete() override;
- void onComplete(std::unique_ptr<storage::spi::Result> result) override;
+ void onComplete(std::unique_ptr<storage::spi::Result> result) noexcept override;
void addResultHandler(const storage::spi::ResultHandler* resultHandler) override;
};
@@ -58,7 +58,7 @@ MyOperationComplete::~MyOperationComplete()
}
void
-MyOperationComplete::onComplete(std::unique_ptr<storage::spi::Result> result)
+MyOperationComplete::onComplete(std::unique_ptr<storage::spi::Result> result) noexcept
{
if (result->hasError()) {
++_errors;
diff --git a/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.cpp b/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.cpp
index 1fbe155b16d..2dc5989e857 100644
--- a/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.cpp
+++ b/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.cpp
@@ -20,7 +20,7 @@ ApplyBucketDiffEntryComplete::ApplyBucketDiffEntryComplete(std::shared_ptr<Apply
ApplyBucketDiffEntryComplete::~ApplyBucketDiffEntryComplete() = default;
void
-ApplyBucketDiffEntryComplete::onComplete(std::unique_ptr<spi::Result> result)
+ApplyBucketDiffEntryComplete::onComplete(std::unique_ptr<spi::Result> result) noexcept
{
if (_result_handler != nullptr) {
_result_handler->handle(*result);
diff --git a/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.h b/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.h
index dd2346d9dee..1037318aec6 100644
--- a/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.h
+++ b/storage/src/vespa/storage/persistence/apply_bucket_diff_entry_complete.h
@@ -27,7 +27,7 @@ class ApplyBucketDiffEntryComplete : public spi::OperationComplete
public:
ApplyBucketDiffEntryComplete(std::shared_ptr<ApplyBucketDiffState> state, document::DocumentId doc_id, const char *op, const framework::Clock& clock, metrics::DoubleAverageMetric& latency_metric);
~ApplyBucketDiffEntryComplete();
- void onComplete(std::unique_ptr<spi::Result> result) override;
+ void onComplete(std::unique_ptr<spi::Result> result) noexcept override;
void addResultHandler(const spi::ResultHandler* resultHandler) override;
};
diff --git a/storage/src/vespa/storage/persistence/asynchandler.cpp b/storage/src/vespa/storage/persistence/asynchandler.cpp
index d150f5600e5..47b5e4f5f27 100644
--- a/storage/src/vespa/storage/persistence/asynchandler.cpp
+++ b/storage/src/vespa/storage/persistence/asynchandler.cpp
@@ -78,7 +78,7 @@ public:
_executorId(executor.getExecutorId(bucketId.getId()))
{
}
- void onComplete(spi::Result::UP result) override {
+ void onComplete(spi::Result::UP result) noexcept override {
_task->setResult(std::move(result));
_executor.executeTask(_executorId, std::move(_task));
}