Revert "Wire in the BucketExecutor."

2 files changed, 3 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
index af8086941fd..926530c228e 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
@@ -46,27 +46,23 @@ JobTestBase::init(uint32_t allowedLidBloat,
 {
     _handler = std::make_unique<MyHandler>(maxOutstandingMoveOps != MAX_OUTSTANDING_MOVE_OPS, useBucketDB());
     DocumentDBLidSpaceCompactionConfig compactCfg(interval, allowedLidBloat, allowedLidBloatFactor,
-                                                  REMOVE_BATCH_BLOCK_RATE, REMOVE_BLOCK_RATE, false, useBucketDB());
+                                                  REMOVE_BATCH_BLOCK_RATE, REMOVE_BLOCK_RATE, false);
     BlockableMaintenanceJobConfig blockableCfg(resourceLimitFactor, maxOutstandingMoveOps);
 
     if (useBucketDB()) {
-        _singleExecutor = std::make_unique<vespalib::ThreadStackExecutor>(1, 0x10000);
-        _master = std::make_unique<proton::ExecutorThreadService> (*_singleExecutor);
         _bucketExecutor = std::make_unique<storage::spi::dummy::DummyBucketExecutor>(4);
-        _job = std::make_unique<lidspace::CompactionJob>(compactCfg, *_handler, _storer, *_master, *_bucketExecutor,
-                                                         _diskMemUsageNotifier, blockableCfg, _clusterStateHandler, nodeRetired,
+        _job = std::make_unique<lidspace::CompactionJob>(compactCfg, *_handler, _storer, *_bucketExecutor, _diskMemUsageNotifier,
+                                                         blockableCfg, _clusterStateHandler, nodeRetired,
                                                          document::BucketSpace::placeHolder());
     } else {
         _job = std::make_unique<LidSpaceCompactionJob>(compactCfg, *_handler, _storer, _frozenHandler, _diskMemUsageNotifier,
                                                        blockableCfg, _clusterStateHandler, nodeRetired);
     }
 }
-
 void
 JobTestBase::sync() const {
     if (_bucketExecutor) {
         _bucketExecutor->sync();
-        _master->sync();
     }
 }
 
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
index c81f8c8d387..637314e2879 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h
@@ -7,8 +7,6 @@
 
 struct JobTestBase : public ::testing::TestWithParam<bool> {
     std::unique_ptr<storage::spi::BucketExecutor> _bucketExecutor;
-    std::unique_ptr<vespalib::SyncableThreadExecutor> _singleExecutor;
-    std::unique_ptr<searchcorespi::index::IThreadService> _master;
     std::unique_ptr<MyHandler> _handler;
     MyStorer _storer;
     MyFrozenBucketHandler _frozenHandler;