Remove full sync of threading service in IndexMaintainer.

3 files changed, 2 insertions, 9 deletions

diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
index c0623aec9df..fdb2de8fb59 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
@@ -54,8 +54,7 @@ DocumentInverter::DocumentInverter(DocumentInverterContext& context)
 
 DocumentInverter::~DocumentInverter()
 {
-    _context.get_invert_threads().sync_all();
-    _context.get_push_threads().sync_all();
+    wait_for_zero_ref_count();
 }
 
 void
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp
index a9d935aee3b..330320d5047 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp
@@ -72,11 +72,7 @@ MemoryIndex::MemoryIndex(const Schema& schema,
 {
 }
 
-MemoryIndex::~MemoryIndex()
-{
-    _invertThreads.sync_all();
-    _pushThreads.sync_all();
-}
+MemoryIndex::~MemoryIndex() = default;
 
 void
 MemoryIndex::insertDocument(uint32_t docId, const document::Document &doc, OnWriteDoneType on_write_done)
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memory_index.h b/searchlib/src/vespa/searchlib/memoryindex/memory_index.h
index 6953aee7875..dc1b5d8060d 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memory_index.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/memory_index.h
@@ -121,8 +121,6 @@ public:
      * Commits the inserts and removes since the last commit, making them searchable.
      *
      * When commit is completed, 'on_write_done' goes out of scope, scheduling completion callback.
-     *
-     * Callers can call pushThreads.sync() to wait for push completion.
      */
     void commit(OnWriteDoneType on_write_done);