Since we schedule the last chunk for commit in triggerSyncNow, we can assert that we will be fully synced on the next pull when it happens in the singleCommitter thread.

That allows for further simplification.

1 files changed, 8 insertions, 1 deletions

diff --git a/vespalib/src/vespa/vespalib/util/destructor_callbacks.h b/vespalib/src/vespa/vespalib/util/destructor_callbacks.h
index 7fc15e0185e..7452d72ea44 100644
--- a/vespalib/src/vespa/vespalib/util/destructor_callbacks.h
+++ b/vespalib/src/vespa/vespalib/util/destructor_callbacks.h
@@ -44,10 +44,17 @@ private:
 
 template<class FunctionType>
 std::shared_ptr<IDestructorCallback>
-makeLambdaCallback(FunctionType &&function) {
+makeSharedLambdaCallback(FunctionType &&function) {
     return std::make_shared<LambdaCallback<std::decay_t<FunctionType>>>
             (std::forward<FunctionType>(function));
 }
 
+template<class FunctionType>
+std::unique_ptr<IDestructorCallback>
+makeUniqueLambdaCallback(FunctionType &&function) {
+    return std::make_unique<LambdaCallback<std::decay_t<FunctionType>>>
+            (std::forward<FunctionType>(function));
+}
+
 
 }