Merge pull request #19776 from vespa-engine/balder/notifyRemove-2-notifyRemoves

notifyRemove -> notifyRemoves

9 files changed, 9 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 8d3f9d3c387..14a74e3be8e 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -187,7 +187,7 @@ public:
         ++_changes;
     }
 
-    void notifyRemove(IDestructorCallbackSP, const std::vector<document::GlobalId> & gids, SerialNum) override {
+    void notifyRemoves(IDestructorCallbackSP, const std::vector<document::GlobalId> & gids, SerialNum) override {
         for (const auto & gid : gids) {
             _changeGid = gid;
             _changeLid = 0;
diff --git a/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.cpp b/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.cpp
index bca3e075fdd..a2552d1deea 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.cpp
@@ -15,7 +15,7 @@ DummyGidToLidChangeHandler::notifyPut(IDestructorCallbackSP, GlobalId, uint32_t,
 }
 
 void
-DummyGidToLidChangeHandler::notifyRemove(IDestructorCallbackSP, const std::vector<GlobalId> &, SerialNum)
+DummyGidToLidChangeHandler::notifyRemoves(IDestructorCallbackSP, const std::vector<GlobalId> &, SerialNum)
 {
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h
index fd986ea8309..d2b9e33ef95 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h
@@ -23,7 +23,7 @@ public:
     ~DummyGidToLidChangeHandler() override;
 
     void notifyPut(IDestructorCallbackSP context, GlobalId gid, uint32_t lid, SerialNum serial_num) override;
-    void notifyRemove(IDestructorCallbackSP context, const std::vector<GlobalId> & gid, SerialNum serialNum) override;
+    void notifyRemoves(IDestructorCallbackSP context, const std::vector<GlobalId> & gid, SerialNum serialNum) override;
     void addListener(std::unique_ptr<IGidToLidChangeListener> listener) override;
     void removeListeners(const vespalib::string &docTypeName, const std::set<vespalib::string> &keepNames) override;
     std::unique_ptr<IPendingGidToLidChanges> grab_pending_changes() override;
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp
index 0639bee704b..36451091d1c 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp
@@ -71,7 +71,7 @@ GidToLidChangeHandler::notifyPutDone(IDestructorCallbackSP context, GlobalId gid
 }
 
 void
-GidToLidChangeHandler::notifyRemove(IDestructorCallbackSP context, const std::vector<GlobalId> & gids, SerialNum serialNum)
+GidToLidChangeHandler::notifyRemoves(IDestructorCallbackSP context, const std::vector<GlobalId> & gids, SerialNum serialNum)
 {
     lock_guard guard(_lock);
     _pending_changes.reserve(_pending_changes.size() + gids.size());
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h
index 5567f120b38..68a4bf3fb3d 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.h
@@ -54,7 +54,7 @@ public:
 
     void notifyPut(IDestructorCallbackSP context, GlobalId gid, uint32_t lid, SerialNum serial_num) override;
     void notifyPutDone(IDestructorCallbackSP context, GlobalId gid, uint32_t lid, SerialNum serialNum);
-    void notifyRemove(IDestructorCallbackSP context, const std::vector<GlobalId> & gids, SerialNum serialNum) override;
+    void notifyRemoves(IDestructorCallbackSP context, const std::vector<GlobalId> & gids, SerialNum serialNum) override;
     void notifyRemoveDone(GlobalId gid, SerialNum serialNum);
     std::unique_ptr<IPendingGidToLidChanges> grab_pending_changes() override;
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.cpp b/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.cpp
index 96fc3525c2c..ced1d010818 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.cpp
@@ -10,7 +10,7 @@ void
 IGidToLidChangeHandler::notifyRemove(IDestructorCallbackSP context, GlobalId gid, SerialNum serialNum) {
     std::vector<GlobalId> gids;
     gids.push_back(gid);
-    notifyRemove(std::move(context), gids, serialNum);
+    notifyRemoves(std::move(context), gids, serialNum);
 }
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h
index 7b8f6267e6e..7d5cbad36d1 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h
@@ -47,7 +47,7 @@ public:
      * Notify removal of gid. Passed on to listeners at once.
      */
     void notifyRemove(IDestructorCallbackSP context, GlobalId gid, SerialNum serialNum);
-    virtual void notifyRemove(IDestructorCallbackSP context, const std::vector<GlobalId> & gids, SerialNum serialNum) = 0;
+    virtual void notifyRemoves(IDestructorCallbackSP context, const std::vector<GlobalId> & gids, SerialNum serialNum) = 0;
     virtual std::unique_ptr<IPendingGidToLidChanges> grab_pending_changes() = 0;
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index fe634accf5a..078017ea301 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -637,7 +637,7 @@ StoreOnlyFeedView::removeDocuments(const RemoveDocumentsOperation &op, bool remo
     if (useDMS) {
         vespalib::Gate gate;
         std::vector<document::GlobalId> gidsToRemove = getGidsToRemove(_metaStore, lidsToRemove);
-        _gidToLidChangeHandler.notifyRemove(std::make_shared<vespalib::GateCallback>(gate), gidsToRemove, serialNum);
+        _gidToLidChangeHandler.notifyRemoves(std::make_shared<vespalib::GateCallback>(gate), gidsToRemove, serialNum);
         gate.await();
         _metaStore.removeBatch(lidsToRemove, ctx->getDocIdLimit());
         _metaStore.commit(CommitParam(serialNum));
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h
index d66470735a6..5931defbe7e 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h
@@ -44,7 +44,7 @@ public:
     }
 
     void notifyPut(IDestructorCallbackSP, document::GlobalId, uint32_t, SerialNum)  override { }
-    void notifyRemove(IDestructorCallbackSP, const std::vector<document::GlobalId> &, SerialNum)  override { }
+    void notifyRemoves(IDestructorCallbackSP, const std::vector<document::GlobalId> &, SerialNum)  override { }
     std::unique_ptr<IPendingGidToLidChanges> grab_pending_changes() override { return {}; }
 
     void assertAdds(const std::vector<AddEntry> &expAdds)