Unify og getNumActiveDocs and hide some implementations.

5 files changed, 7 insertions, 3 deletions

diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
index a9a75a1fc7a..45ec3824c11 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
 #include <vespa/searchcore/proton/bucketdb/bucketdbhandler.h>
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/feedoperation/operations.h>
 #include <vespa/searchcore/proton/initializer/task_runner.h>
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp
index 42e85f2909f..1d8585666b8 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp
@@ -2,6 +2,7 @@
 
 #include "bucketmover_common.h"
 #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/vespalib/testkit/test_macros.h>
 
 using vespalib::IDestructorCallback;
@@ -58,8 +59,7 @@ void
 MySubDb::insertDocs(const UserDocuments &docs_) {
     for (const auto & entry : docs_) {
         const auto & bucketDocs = entry.second;
-        for (size_t i = 0; i < bucketDocs.getDocs().size(); ++i) {
-            const auto & testDoc = bucketDocs.getDocs()[i];
+        for (const auto & testDoc : bucketDocs.getDocs()) {
             _metaStore.put(testDoc.getGid(), testDoc.getBucket(),
                            testDoc.getTimestamp(), testDoc.getDocSize(), testDoc.getLid(), 0u);
             _realRetriever->_docs.push_back(testDoc.getDoc());
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
index 2db34e45140..84ce40589a3 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
@@ -4,6 +4,7 @@
 #include <vespa/searchcore/proton/server/bucketmovejob.h>
 #include <vespa/searchcore/proton/server/executor_thread_service.h>
 #include <vespa/searchcore/proton/server/document_db_maintenance_config.h>
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/persistence/dummyimpl/dummy_bucket_executor.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/vespalib/util/lambdatask.h>
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp
index 8d0d11295cd..b65beb5d231 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentmover_test.cpp
@@ -3,6 +3,7 @@
 #include "bucketmover_common.h"
 #include <vespa/searchcore/proton/server/documentbucketmover.h>
 #include <vespa/searchcore/proton/common/pendinglidtracker.h>
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>
@@ -18,7 +19,7 @@ struct MySubDbTwoBuckets : public MySubDb
                       std::shared_ptr<bucketdb::BucketDBOwner> bucketDB,
                       uint32_t subDbId,
                       SubDbType subDbType)
-        : MySubDb(builder.getRepo(), bucketDB, subDbId, subDbType)
+        : MySubDb(builder.getRepo(), std::move(bucketDB), subDbId, subDbType)
     {
         builder.createDocs(1, 1, 6);
         builder.createDocs(2, 6, 9);
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index f9518cb1b5e..e89d5eef078 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -12,6 +12,7 @@
 #include <vespa/eval/eval/tensor_spec.h>
 #include <vespa/eval/eval/value.h>
 #include <vespa/searchcore/proton/bucketdb/bucketdbhandler.h>
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/searchcore/proton/test/bucketfactory.h>
 #include <vespa/searchcore/proton/common/feedtoken.h>
 #include <vespa/searchcore/proton/feedoperation/moveoperation.h>