GC unused code and replace sync_all_executors in test.

2 files changed, 6 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index b2acc8703f3..646b244f191 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -377,18 +377,12 @@ struct FeedViewComparer
     void expect_equal_index_adapter() {
         EXPECT_EQUAL(_old->getIndexWriter().get(), _new->getIndexWriter().get());
     }
-    void expect_equal_attribute_writer() {
-        EXPECT_EQUAL(_old->getAttributeWriter().get(), _new->getAttributeWriter().get());
-    }
     void expect_not_equal_attribute_writer() {
         EXPECT_NOT_EQUAL(_old->getAttributeWriter().get(), _new->getAttributeWriter().get());
     }
     void expect_equal_summary_adapter() {
         EXPECT_EQUAL(_old->getSummaryAdapter().get(), _new->getSummaryAdapter().get());
     }
-    void expect_equal_schema() {
-        EXPECT_EQUAL(_old->getSchema().get(), _new->getSchema().get());
-    }
     void expect_not_equal_schema() {
         EXPECT_NOT_EQUAL(_old->getSchema().get(), _new->getSchema().get());
     }
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index eba87447f86..ade471317e8 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -14,6 +14,7 @@
 #include <vespa/searchcore/proton/test/mock_summary_adapter.h>
 #include <vespa/searchcore/proton/test/thread_utils.h>
 #include <vespa/searchlib/index/docbuilder.h>
+#include <vespa/vespalib/util/destructor_callbacks.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/log/log.h>
@@ -245,8 +246,11 @@ struct FixtureBase {
     }
 
     void force_commit() {
-        runInMaster([this] () { static_cast<IFeedView&>(*feedview).forceCommit(serial_num); });
-        writeService.sync_all_executors();
+        vespalib::Gate gate;
+        runInMaster([this, &gate] () {
+            feedview->forceCommit(search::CommitParam(serial_num), std::make_shared<vespalib::GateCallback>(gate));
+        });
+        gate.await();
     }
 };