From 6ff71b24b14ee1156afaecd5e9f9e767e99f0194 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@oath.com>
Date: Tue, 5 Sep 2017 14:31:53 +0000
Subject: Use gid to lid change handler interface directly.

---
 .../proton/server/searchable_feed_view.cpp         | 19 -------------------
 .../proton/server/searchable_feed_view.h           |  4 ----
 .../searchcore/proton/server/storeonlyfeedview.cpp | 22 +++++++---------------
 .../searchcore/proton/server/storeonlyfeedview.h   |  4 ----
 4 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
index 82cd7de3d49..14556c86c18 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
@@ -7,7 +7,6 @@
 #include <vespa/searchcore/proton/common/feedtoken.h>
 #include <vespa/searchcore/proton/metrics/feed_metrics.h>
 #include <vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h>
-#include <vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/vespalib/util/closuretask.h>
 #include <vespa/vespalib/util/exceptions.h>
@@ -258,22 +257,4 @@ SearchableFeedView::forceCommit(SerialNum serialNum, OnForceCommitDoneType onCom
     _writeService.index().execute(makeLambdaTask([=]() { performIndexForceCommit(serialNum, onCommitDone); }));
 }
 
-void
-SearchableFeedView::notifyPutGidToLidChange(const document::GlobalId &gid, uint32_t lid, SerialNum serialNum)
-{
-    _gidToLidChangeHandler.notifyPut(gid, lid, serialNum);
-}
-
-void
-SearchableFeedView::notifyRemoveGidToLidChange(const document::GlobalId &gid, SerialNum serialNum)
-{
-    _gidToLidChangeHandler.notifyRemove(gid, serialNum);
-}
-
-void
-SearchableFeedView::notifyRemoveDoneGidToLidChange(const document::GlobalId &gid, SerialNum serialNum)
-{
-    _gidToLidChangeHandler.notifyRemoveDone(gid, serialNum);
-}
-
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h
index 5863cd615af..f7e76018f5a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.h
@@ -81,10 +81,6 @@ private:
     void performIndexForceCommit(SerialNum serialNum, OnForceCommitDoneType onCommitDone);
     void forceCommit(SerialNum serialNum, OnForceCommitDoneType onCommitDone) override;
 
-    virtual void notifyPutGidToLidChange(const document::GlobalId &gid, uint32_t lid, SerialNum serialNum) override;
-    virtual void notifyRemoveGidToLidChange(const document::GlobalId &gid, SerialNum serialNum) override;
-    virtual void notifyRemoveDoneGidToLidChange(const document::GlobalId &gid, SerialNum serialNum) override;
-
 public:
     SearchableFeedView(const StoreOnlyFeedView::Context &storeOnlyCtx, const PersistentParams &params,
                        const FastAccessFeedView::Context &fastUpdateCtx, Context ctx);
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index d5618aa5944..62e01db28e0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -12,6 +12,7 @@
 #include <vespa/searchcore/proton/common/feedtoken.h>
 #include <vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h>
 #include <vespa/searchcore/proton/metrics/feed_metrics.h>
+#include <vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h>
 #include <vespa/searchlib/common/scheduletaskcallback.h>
 #include <vespa/vespalib/util/exceptions.h>
 
@@ -612,17 +613,17 @@ StoreOnlyFeedView::adjustMetaStore(const DocumentOperation &op, const DocumentId
                 op.getLid() != op.getPrevLid())
             {
                 moveMetaData(_metaStore, docId, op);
-                notifyPutGidToLidChange(docId.getGlobalId(), op.getLid(), serialNum);
+                _gidToLidChangeHandler.notifyPut(docId.getGlobalId(), op.getLid(), serialNum);
             } else {
                 putMetaData(_metaStore, docId, op, _params._subDbType == SubDbType::REMOVED);
                 if (op.getDbDocumentId() != op.getPrevDbDocumentId()) {
-                    notifyPutGidToLidChange(docId.getGlobalId(), op.getLid(), serialNum);
+                    _gidToLidChangeHandler.notifyPut(docId.getGlobalId(), op.getLid(), serialNum);
                 }
             }
         } else if (op.getValidPrevDbdId(_params._subDbId)) {
             removeMetaData(_metaStore, docId, op, _params._subDbType == SubDbType::REMOVED);
-            notifyRemoveGidToLidChange(docId.getGlobalId(), serialNum);
-            notifyRemoveDoneGidToLidChange(docId.getGlobalId(), serialNum);
+            _gidToLidChangeHandler.notifyRemove(docId.getGlobalId(), serialNum);
+            _gidToLidChangeHandler.notifyRemoveDone(docId.getGlobalId(), serialNum);
         }
         _metaStore.commit(serialNum, serialNum);
     }
@@ -653,8 +654,8 @@ StoreOnlyFeedView::removeDocuments(const RemoveDocumentsOperation &op, bool remo
         std::vector<document::GlobalId> gidsToRemove(getGidsToRemove(_metaStore, lidsToRemove));
         _metaStore.removeBatch(lidsToRemove, ctx->getDocIdLimit());
         for (const auto &gid : gidsToRemove) {
-            notifyRemoveGidToLidChange(gid, serialNum);
-            notifyRemoveDoneGidToLidChange(gid, serialNum);
+            _gidToLidChangeHandler.notifyRemove(gid, serialNum);
+            _gidToLidChangeHandler.notifyRemoveDone(gid, serialNum);
         }
         _metaStore.commit(serialNum, serialNum);
         explicitReuseLids = _lidReuseDelayer.delayReuse(lidsToRemove);
@@ -808,13 +809,4 @@ StoreOnlyFeedView::getDocumentMetaStorePtr() const
     return &_documentMetaStoreContext->get();
 }
 
-void
-StoreOnlyFeedView::notifyPutGidToLidChange(const document::GlobalId &, uint32_t, SerialNum) {}
-
-void
-StoreOnlyFeedView::notifyRemoveGidToLidChange(const document::GlobalId &, SerialNum) {}
-
-void
-StoreOnlyFeedView::notifyRemoveDoneGidToLidChange(const document::GlobalId &, SerialNum) {}
-
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
index 8339b7d41a5..23dbdd5491a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h
@@ -184,10 +184,6 @@ private:
     // Ack token early if visibility delay is nonzero
     void considerEarlyAck(FeedTokenUP &token, FeedOperation::Type opType);
 
-    virtual void notifyPutGidToLidChange(const document::GlobalId &gid, uint32_t lid, SerialNum serialNum);
-    virtual void notifyRemoveGidToLidChange(const document::GlobalId &gid, SerialNum serialNum);
-    virtual void notifyRemoveDoneGidToLidChange(const document::GlobalId &gid, SerialNum serialNum);
-
     void makeUpdatedDocument(SerialNum serialNum, Lid lid, DocumentUpdate::SP upd,
             OnOperationDoneType onWriteDone,PromisedDoc promisedDoc, PromisedStream promisedStream);
 
-- 
cgit v1.2.3