From e31395537ca809fef7f8831633b9c3ce947d4009 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 19 Nov 2021 15:04:04 +0000
Subject: GC method no longer necessary due to commit pattern

---
 .../searchcore/proton/initializer/task_runner.h    |  1 -
 .../vespa/searchcore/proton/server/documentdb.cpp  | 28 ----------------------
 .../vespa/searchcore/proton/server/documentdb.h    | 12 ----------
 3 files changed, 41 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h
index 758281794b0..bc0d09e5cd4 100644
--- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h
+++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h
@@ -41,7 +41,6 @@ class TaskRunner {
         }
         void setDone() { execute(std::move(_doneTask)); }
         const InitializerTask::SP &rootTask() { return _rootTask; }
-        void schedulePoll();
     };
     void getReadyTasks(const InitializerTask::SP task, TaskList &readyTasks, TaskSet &checked);
     void setTaskRunning(InitializerTask &task);
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 427d435aae7..5e46166b227 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -517,30 +517,6 @@ DocumentDB::applyConfig(DocumentDBConfig::SP configSnapshot, SerialNum serialNum
     }
 }
 
-
-void
-DocumentDB::performDropFeedView(IFeedView::SP feedView)
-{
-    // Delays when feed view is dropped.
-    assert(_writeService.master().isCurrentThread());
-    _writeService.attributeFieldWriter().sync_all();
-    _writeService.summary().sync();
-
-    // Feed view is kept alive in the closure's shared ptr.
-    _writeService.index().execute(makeLambdaTask([this, feedView] () { performDropFeedView2(feedView); }));
-}
-
-
-void
-DocumentDB::performDropFeedView2(IFeedView::SP feedView) {
-    // Delays when feed view is dropped.
-    assert(_writeService.index().isCurrentThread());
-    _writeService.indexFieldInverter().sync_all();
-    _writeService.indexFieldWriter().sync_all();
-    masterExecute([feedView]() { (void) feedView; });
-}
-
-
 void
 DocumentDB::tearDownReferences()
 {
@@ -922,10 +898,6 @@ DocumentDB::syncFeedView()
     _feedHandler->setActiveFeedView(newFeedView.get());
     _subDBs.createRetrievers();
     _subDBs.maintenanceSync(_maintenanceController);
-
-    // Ensure that old feed view is referenced until all index executor tasks
-    // depending on it has completed.
-    performDropFeedView(oldFeedView);
 }
 
 bool
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index 6b855cd40a8..391c11df276 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -159,18 +159,6 @@ private:
     void enterRedoReprocessState() override;
     void enterApplyLiveConfigState();
 
-    /**
-     * Drop old field view in a controlled manner.  The feed view will
-     * be kept alive until the index executor is done with all current
-     * tasks.
-     *
-     * Called by executor thread.
-     *
-     * @param feedView  shared pointer to feed view to be dropped.
-     */
-    void performDropFeedView(IFeedView::SP feedView);
-    void performDropFeedView2(IFeedView::SP feedView);
-
     /**
      * Implements IFeedHandlerOwner
      */
-- 
cgit v1.2.3