Reduce visibility and do not provide syncable when not necessary.

5 files changed, 16 insertions, 4 deletions

diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp
index 147161f7791..714d519cab3 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp
@@ -1,6 +1,7 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "bucketmover_common.h"
+#include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
 #include <vespa/vespalib/testkit/test_macros.h>
 
 using vespalib::IDestructorCallback;
@@ -81,4 +82,9 @@ assertEqual(const document::BucketId &bucket, const proton::test::Document &doc,
     return true;
 }
 
+void
+MySubDb::setBucketState(const BucketId &bucketId, bool active) {
+    _metaStore.setBucketState(bucketId, active);
+}
+
 }
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h
index ec4135484ab..e955f017d67 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.h
@@ -16,6 +16,9 @@
 #include <vespa/searchcore/proton/test/test.h>
 #include <vespa/document/test/make_bucket_space.h>
 
+namespace proton {
+    class DocumentMetaStore;
+}
 namespace proton::move::test {
 
 struct MyMoveOperationLimiter : public IMoveOperationLimiter {
@@ -97,7 +100,7 @@ struct MySubDb {
     using DocumentTypeRepo = document::DocumentTypeRepo;
     using DocumentVector = proton::test::DocumentVector;
     using UserDocuments = proton::test::UserDocuments;
-    DocumentMetaStore::SP                 _metaStoreSP;
+    std::shared_ptr<DocumentMetaStore>    _metaStoreSP;
     DocumentMetaStore                    &_metaStore;
     std::shared_ptr<MyDocumentRetriever>  _realRetriever;
     std::shared_ptr<IDocumentRetriever>   _retriever;
@@ -120,9 +123,7 @@ struct MySubDb {
         return _docs.getGidOrderDocs(userId);
     }
 
-    void setBucketState(const BucketId &bucketId, bool active) {
-        _metaStore.setBucketState(bucketId, active);
-    }
+    void setBucketState(const BucketId &bucketId, bool active);
 };
 
 struct MyCountJobRunner : public IMaintenanceJobRunner {
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
index 5556ed0d475..85f80293377 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
@@ -2,6 +2,7 @@
 
 #include "bucketmover_common.h"
 #include <vespa/searchcore/proton/server/bucketmovejob.h>
+#include <vespa/searchcore/proton/server/document_db_maintenance_config.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
index 3ee0a77eca7..99692ec53bd 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_v2_test.cpp
@@ -2,7 +2,10 @@
 
 #include "bucketmover_common.h"
 #include <vespa/searchcore/proton/server/bucketmovejobv2.h>
+#include <vespa/searchcore/proton/server/executor_thread_service.h>
+#include <vespa/searchcore/proton/server/document_db_maintenance_config.h>
 #include <vespa/persistence/dummyimpl/dummy_bucket_executor.h>
+#include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp
index ae504fef603..f49d806b6d4 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp
@@ -2,6 +2,7 @@
 
 #include "bucketmover_common.h"
 #include <vespa/searchcore/proton/server/documentbucketmover.h>
+#include <vespa/searchcore/proton/common/pendinglidtracker.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>