Async handling of gid/lid changes.

4 files changed, 27 insertions, 21 deletions

diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index ddf45d6a509..38d5b0d35b1 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -185,21 +185,21 @@ public:
     {
     }
 
-    virtual void notifyPutDone(document::GlobalId gid, uint32_t lid, SerialNum)  override {
+    void notifyPutDone(Context, document::GlobalId gid, uint32_t lid, SerialNum)  override {
         _changeGid = gid;
         _changeLid = lid;
         _gidToLid[gid] = lid;
         ++_changes;
     }
 
-    virtual void notifyRemove(document::GlobalId gid, SerialNum)  override {
+    void notifyRemove(Context, document::GlobalId gid, SerialNum)  override {
         _changeGid = gid;
         _changeLid = 0;
         _gidToLid[gid] = 0;
         ++_changes;
     }
 
-    virtual void notifyRemoveDone(document::GlobalId, SerialNum)  override {
+    void notifyRemoveDone(document::GlobalId, SerialNum)  override {
     }
 
     void assertChanges(document::GlobalId expGid, uint32_t expLid, uint32_t expChanges) {
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
index 1201bc4720b..0c69fbaed55 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
@@ -7,6 +7,7 @@
 #include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchcore/proton/reference/i_gid_to_lid_change_listener.h>
 #include <vespa/searchcore/proton/reference/gid_to_lid_change_handler.h>
+#include <vespa/searchlib/common/gatecallback.h>
 #include <map>
 #include <vespa/log/log.h>
 LOG_SETUP("gid_to_lid_change_handler_test");
@@ -100,12 +101,12 @@ public:
     {
         _stats.markCreatedListener();
     }
-    virtual ~MyListener() { _stats.markDestroyedListener(); }
-    virtual void notifyPutDone(GlobalId, uint32_t) override { _stats.notifyPutDone(); }
-    virtual void notifyRemove(GlobalId) override { _stats.notifyRemove(); }
-    virtual void notifyRegistered() override { _stats.markRegisteredListener(); }
-    virtual const vespalib::string &getName() const override { return _name; }
-    virtual const vespalib::string &getDocTypeName() const override { return _docTypeName; }
+    ~MyListener() override { _stats.markDestroyedListener(); }
+    void notifyPutDone(Context, GlobalId, uint32_t) override { _stats.notifyPutDone(); }
+    void notifyRemove(Context, GlobalId) override { _stats.notifyRemove(); }
+    void notifyRegistered() override { _stats.markRegisteredListener(); }
+    const vespalib::string &getName() const override { return _name; }
+    const vespalib::string &getDocTypeName() const override { return _docTypeName; }
 };
 
 struct Fixture
@@ -139,11 +140,15 @@ struct Fixture
     }
 
     void notifyPutDone(GlobalId gid, uint32_t lid, SerialNum serialNum) {
-        _handler->notifyPutDone(gid, lid, serialNum);
+        vespalib::Gate gate;
+        _handler->notifyPutDone(std::make_shared<search::GateCallback>(gate), gid, lid, serialNum);
+        gate.await();
     }
 
     void notifyRemove(GlobalId gid, SerialNum serialNum) {
-        _handler->notifyRemove(gid, serialNum);
+        vespalib::Gate gate;
+        _handler->notifyRemove(std::make_shared<search::GateCallback>(gate), gid, serialNum);
+        gate.await();
     }
 
     void notifyRemoveDone(GlobalId gid, SerialNum serialNum) {
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
index 2fb439ea530..e9363d66433 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
@@ -7,6 +7,7 @@
 #include <vespa/searchcore/proton/reference/gid_to_lid_change_listener.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper_factory.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper.h>
+#include <vespa/searchlib/common/gatecallback.h>
 #include <vespa/searchlib/test/mock_gid_to_lid_mapping.h>
 #include <map>
 #include <vespa/log/log.h>
@@ -95,7 +96,9 @@ struct Fixture
     }
 
     void notifyPutDone(const GlobalId &gid, uint32_t referencedDoc) {
-        _listener->notifyPutDone(gid, referencedDoc);
+        vespalib::Gate gate;
+        _listener->notifyPutDone(std::make_shared<search::GateCallback>(gate), gid, referencedDoc);
+        gate.await();
     }
 
     void notifyListenerRegistered() {
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/gid_to_lid_change_registrator_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/gid_to_lid_change_registrator_test.cpp
index d240c437ef2..6fcc57ce398 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/gid_to_lid_change_registrator_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/gid_to_lid_change_registrator_test.cpp
@@ -23,12 +23,12 @@ public:
           _name(name)
     {
     }
-    virtual ~MyListener() { }
-    virtual void notifyPutDone(document::GlobalId, uint32_t) override { }
-    virtual void notifyRemove(document::GlobalId) override { }
-    virtual void notifyRegistered() override { }
-    virtual const vespalib::string &getName() const override { return _name; }
-    virtual const vespalib::string &getDocTypeName() const override { return _docTypeName; }
+    ~MyListener() override { }
+    void notifyPutDone(Context, document::GlobalId, uint32_t) override { }
+    void notifyRemove(Context, document::GlobalId) override { }
+    void notifyRegistered() override { }
+    const vespalib::string &getName() const override { return _name; }
+    const vespalib::string &getDocTypeName() const override { return _docTypeName; }
 };
 
 
@@ -46,9 +46,7 @@ struct Fixture
     {
     }
 
-    ~Fixture()
-    {
-    }
+    ~Fixture() { }
 
     std::unique_ptr<GidToLidChangeRegistrator>
     getRegistrator(const vespalib::string &docTypeName) {