Revert "- Implement async put"

2 files changed, 3 insertions, 17 deletions

diff --git a/persistence/src/vespa/persistence/spi/operationcomplete.h b/persistence/src/vespa/persistence/spi/operationcomplete.h
index 18a3c250e24..fa386e274f2 100644
--- a/persistence/src/vespa/persistence/spi/operationcomplete.h
+++ b/persistence/src/vespa/persistence/spi/operationcomplete.h
@@ -8,12 +8,6 @@ namespace storage::spi {
 
 class Result;
 
-class ResultHandler {
-public:
-    virtual ~ResultHandler() = default;
-    virtual void handle(const Result &) const = 0;
-};
-
 /**
  * This is the callback interface when using the async operations
  * in the persistence provider.
@@ -24,7 +18,6 @@ public:
     using UP = std::unique_ptr<OperationComplete>;
     virtual ~OperationComplete() = default;
     virtual void onComplete(std::unique_ptr<Result> result) = 0;
-    virtual void addResultHandler(const ResultHandler * resultHandler) = 0;
 };
 
 }
\ No newline at end of file
diff --git a/persistence/src/vespa/persistence/spi/persistenceprovider.cpp b/persistence/src/vespa/persistence/spi/persistenceprovider.cpp
index b6569d9561c..c60ac615644 100644
--- a/persistence/src/vespa/persistence/spi/persistenceprovider.cpp
+++ b/persistence/src/vespa/persistence/spi/persistenceprovider.cpp
@@ -2,7 +2,6 @@
 
 #include "persistenceprovider.h"
 #include <future>
-#include <cassert>
 
 namespace storage::spi {
 
@@ -10,20 +9,14 @@ PersistenceProvider::~PersistenceProvider() = default;
 
 class CatchResult : public OperationComplete {
 public:
-    CatchResult() : _promisedResult(), _resulthandler(nullptr) {}
     std::future<Result::UP> future_result() {
-        return _promisedResult.get_future();
+        return promisedResult.get_future();
     }
     void onComplete(Result::UP result) override {
-        _promisedResult.set_value(std::move(result));
-    }
-    void addResultHandler(const ResultHandler * resultHandler) override {
-        assert(_resulthandler == nullptr);
-        _resulthandler = resultHandler;
+        promisedResult.set_value(std::move(result));
     }
 private:
-    std::promise<Result::UP>  _promisedResult;
-    const ResultHandler      *_resulthandler;
+    std::promise<Result::UP> promisedResult;
 };
 
 Result