Propagate API changes to GidToLidChangeListener and ReferenceAttribute:

Split put and remove notifications into separate methods.

1 files changed, 66 insertions, 56 deletions

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 c9fe214947c..587f58cf8d9 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
@@ -31,7 +31,8 @@ vespalib::string doc1("id:test:music::1");
 class ListenerStats {
     using lock_guard = std::lock_guard<std::mutex>;
     std::mutex _lock;
-    uint32_t  _changes;
+    uint32_t  _putChanges;
+    uint32_t  _removeChanges;
     uint32_t  _createdListeners;
     uint32_t  _registeredListeners;
     uint32_t  _destroyedListeners;
@@ -39,7 +40,8 @@ class ListenerStats {
 public:
     ListenerStats()
         : _lock(),
-          _changes(0u),
+          _putChanges(0u),
+          _removeChanges(0u),
           _createdListeners(0u),
           _registeredListeners(0u),
           _destroyedListeners(0u)
@@ -51,9 +53,13 @@ public:
         EXPECT_EQUAL(_createdListeners, _destroyedListeners);
     }
 
-    void notifyGidToLidChange() {
+    void notifyPut() {
         lock_guard guard(_lock);
-        ++_changes;
+        ++_putChanges;
+    }
+    void notifyRemove() {
+        lock_guard guard(_lock);
+        ++_removeChanges;
     }
     void markCreatedListener()    { lock_guard guard(_lock); ++_createdListeners; }
     void markRegisteredListener() { lock_guard guard(_lock); ++_registeredListeners; }
@@ -63,15 +69,18 @@ public:
     uint32_t getRegisteredListeners() const { return _registeredListeners; }
     uint32_t getDestroyedListeners() const { return _destroyedListeners; }
 
-    void assertCounts(uint32_t expCreatedListeners,
-                      uint32_t expRegisteredListeners,
-                      uint32_t expDestroyedListeners,
-                      uint32_t expChanges)
+    void assertListeners(uint32_t expCreatedListeners,
+                         uint32_t expRegisteredListeners,
+                         uint32_t expDestroyedListeners)
     {
         EXPECT_EQUAL(expCreatedListeners, getCreatedListeners());
         EXPECT_EQUAL(expRegisteredListeners, getRegisteredListeners());
         EXPECT_EQUAL(expDestroyedListeners, getDestroyedListeners());
-        EXPECT_EQUAL(expChanges, _changes);
+    }
+    void assertChanges(uint32_t expPutChanges, uint32_t expRemoveChanges)
+    {
+        EXPECT_EQUAL(expPutChanges, _putChanges);
+        EXPECT_EQUAL(expRemoveChanges, _removeChanges);
     }
 };
 
@@ -92,7 +101,8 @@ public:
         _stats.markCreatedListener();
     }
     virtual ~MyListener() { _stats.markDestroyedListener(); }
-    virtual void notifyGidToLidChange(GlobalId, uint32_t) override { _stats.notifyGidToLidChange(); }
+    virtual void notifyPut(GlobalId, uint32_t) override { _stats.notifyPut(); }
+    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; }
@@ -151,13 +161,13 @@ TEST_F("Test that we can register a listener", Fixture)
 {
     auto &stats = f.addStats();
     auto listener = std::make_unique<MyListener>(stats, "test", "testdoc");
-    TEST_DO(stats.assertCounts(1, 0, 0, 0));
+    TEST_DO(stats.assertListeners(1, 0, 0));
     f.addListener(std::move(listener));
-    TEST_DO(stats.assertCounts(1, 1, 0, 0));
+    TEST_DO(stats.assertListeners(1, 1, 0));
     f.notifyPut(toGid(doc1), 10, 10);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(1, 0));
     f.removeListeners("testdoc", {});
-    TEST_DO(stats.assertCounts(1, 1, 1, 1));
+    TEST_DO(stats.assertListeners(1, 1, 1));
 }
 
 TEST_F("Test that we can register multiple listeners", Fixture)
@@ -168,92 +178,92 @@ TEST_F("Test that we can register multiple listeners", Fixture)
     auto listener1 = std::make_unique<MyListener>(stats1, "test1", "testdoc");
     auto listener2 = std::make_unique<MyListener>(stats2, "test2", "testdoc");
     auto listener3 = std::make_unique<MyListener>(stats3, "test3", "testdoc2");
-    TEST_DO(stats1.assertCounts(1, 0, 0, 0));
-    TEST_DO(stats2.assertCounts(1, 0, 0, 0));
-    TEST_DO(stats3.assertCounts(1, 0, 0, 0));
+    TEST_DO(stats1.assertListeners(1, 0, 0));
+    TEST_DO(stats2.assertListeners(1, 0, 0));
+    TEST_DO(stats3.assertListeners(1, 0, 0));
     f.addListener(std::move(listener1));
     f.addListener(std::move(listener2));
     f.addListener(std::move(listener3));
-    TEST_DO(stats1.assertCounts(1, 1, 0, 0));
-    TEST_DO(stats2.assertCounts(1, 1, 0, 0));
-    TEST_DO(stats3.assertCounts(1, 1, 0, 0));
+    TEST_DO(stats1.assertListeners(1, 1, 0));
+    TEST_DO(stats2.assertListeners(1, 1, 0));
+    TEST_DO(stats3.assertListeners(1, 1, 0));
     f.notifyPut(toGid(doc1), 10, 10);
-    TEST_DO(stats1.assertCounts(1, 1, 0, 1));
-    TEST_DO(stats2.assertCounts(1, 1, 0, 1));
-    TEST_DO(stats3.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats1.assertChanges(1, 0));
+    TEST_DO(stats2.assertChanges(1, 0));
+    TEST_DO(stats3.assertChanges(1, 0));
     f.removeListeners("testdoc", {"test1"});
-    TEST_DO(stats1.assertCounts(1, 1, 0, 1));
-    TEST_DO(stats2.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats3.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats1.assertListeners(1, 1, 0));
+    TEST_DO(stats2.assertListeners(1, 1, 1));
+    TEST_DO(stats3.assertListeners(1, 1, 0));
     f.removeListeners("testdoc", {});
-    TEST_DO(stats1.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats2.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats3.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats1.assertListeners(1, 1, 1));
+    TEST_DO(stats2.assertListeners(1, 1, 1));
+    TEST_DO(stats3.assertListeners(1, 1, 0));
     f.removeListeners("testdoc2", {"test3"});
-    TEST_DO(stats1.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats2.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats3.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats1.assertListeners(1, 1, 1));
+    TEST_DO(stats2.assertListeners(1, 1, 1));
+    TEST_DO(stats3.assertListeners(1, 1, 0));
     f.removeListeners("testdoc2", {"foo"});
-    TEST_DO(stats1.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats2.assertCounts(1, 1, 1, 1));
-    TEST_DO(stats3.assertCounts(1, 1, 1, 1));
+    TEST_DO(stats1.assertListeners(1, 1, 1));
+    TEST_DO(stats2.assertListeners(1, 1, 1));
+    TEST_DO(stats3.assertListeners(1, 1, 1));
 }
 
 TEST_F("Test that we keep old listener when registering duplicate", Fixture)
 {
     auto &stats = f.addStats();
     auto listener = std::make_unique<MyListener>(stats, "test1", "testdoc");
-    TEST_DO(stats.assertCounts(1, 0, 0, 0));
+    TEST_DO(stats.assertListeners(1, 0, 0));
     f.addListener(std::move(listener));
-    TEST_DO(stats.assertCounts(1, 1, 0, 0));
+    TEST_DO(stats.assertListeners(1, 1, 0));
     listener = std::make_unique<MyListener>(stats, "test1", "testdoc");
-    TEST_DO(stats.assertCounts(2, 1, 0, 0));
+    TEST_DO(stats.assertListeners(2, 1, 0));
     f.addListener(std::move(listener));
-    TEST_DO(stats.assertCounts(2, 1, 1, 0));
+    TEST_DO(stats.assertListeners(2, 1, 1));
 }
 
 TEST_F("Test that put is ignored if we have a pending remove", Fixture)
 {
     auto &stats = f.addStats();
     auto listener = std::make_unique<MyListener>(stats, "test", "testdoc");
-    TEST_DO(stats.assertCounts(1, 0, 0, 0));
+    TEST_DO(stats.assertListeners(1, 0, 0));
     f.addListener(std::move(listener));
-    TEST_DO(stats.assertCounts(1, 1, 0, 0));
+    TEST_DO(stats.assertListeners(1, 1, 0));
     f.notifyRemove(toGid(doc1), 20);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyPut(toGid(doc1), 10, 10);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyRemoveDone(toGid(doc1), 20);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyPut(toGid(doc1), 11, 30);
-    TEST_DO(stats.assertCounts(1, 1, 0, 2));
+    TEST_DO(stats.assertChanges(1, 1));
     f.removeListeners("testdoc", {});
-    TEST_DO(stats.assertCounts(1, 1, 1, 2));
+    TEST_DO(stats.assertListeners(1, 1, 1));
 }
 
 TEST_F("Test that pending removes are merged", Fixture)
 {
     auto &stats = f.addStats();
     auto listener = std::make_unique<MyListener>(stats, "test", "testdoc");
-    TEST_DO(stats.assertCounts(1, 0, 0, 0));
+    TEST_DO(stats.assertListeners(1, 0, 0));
     f.addListener(std::move(listener));
-    TEST_DO(stats.assertCounts(1, 1, 0, 0));
+    TEST_DO(stats.assertListeners(1, 1, 0));
     f.notifyRemove(toGid(doc1), 20);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyRemove(toGid(doc1), 40);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyPut(toGid(doc1), 10, 10);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyRemoveDone(toGid(doc1), 20);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyPut(toGid(doc1), 11, 30);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyRemoveDone(toGid(doc1), 40);
-    TEST_DO(stats.assertCounts(1, 1, 0, 1));
+    TEST_DO(stats.assertChanges(0, 1));
     f.notifyPut(toGid(doc1), 12, 50);
-    TEST_DO(stats.assertCounts(1, 1, 0, 2));
+    TEST_DO(stats.assertChanges(1, 1));
     f.removeListeners("testdoc", {});
-    TEST_DO(stats.assertCounts(1, 1, 1, 2));
+    TEST_DO(stats.assertListeners(1, 1, 1));
 }
 
 }