Use multiple threads for mbus invoke

21 files changed, 38 insertions, 46 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 9eddef36436..b14eb9051d0 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
@@ -23,7 +23,7 @@
 #include <vespa/searchcore/proton/test/thread_utils.h>
 #include <vespa/searchcorespi/plugin/iindexmanagerfactory.h>
 #include <vespa/searchlib/common/idestructorcallback.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/io/fileutil.h>
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index bb43aa6c63d..1ccbff6e6cf 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -50,7 +50,7 @@ using search::IDestructorCallback;
 using search::SerialNum;
 using search::index::schema::CollectionType;
 using search::index::schema::DataType;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using search::transactionlog::TransLogServer;
 using storage::spi::PartitionId;
 using storage::spi::RemoveResult;
diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
index 5109d994f61..d56340be2b2 100644
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
@@ -7,9 +7,9 @@ LOG_SETUP("lidreusedelayer_test");
 #include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/searchcore/proton/test/thread_utils.h>
 #include <vespa/searchcore/proton/test/threading_service_observer.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 84198fb9b42..e8afd738e84 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -43,7 +43,7 @@ using search::index::DocBuilder;
 using search::index::DummyFileHeaderContext;
 using search::index::Schema;
 using search::index::schema::DataType;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using search::memoryindex::CompactDocumentWordsStore;
 using search::memoryindex::Dictionary;
 using search::queryeval::Source;
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
index 625e9c1f6a9..1201bc4720b 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp
@@ -4,7 +4,7 @@
 #include <vespa/document/base/documentid.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/searchcore/proton/server/executor_thread_service.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchcore/proton/reference/i_gid_to_lid_change_listener.h>
 #include <vespa/searchcore/proton/reference/gid_to_lid_change_handler.h>
 #include <map>
@@ -13,7 +13,7 @@ LOG_SETUP("gid_to_lid_change_handler_test");
 
 using document::GlobalId;
 using document::DocumentId;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using search::SerialNum;
 
 namespace proton {
diff --git a/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp b/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp
index 69b8a482476..5b5bea412f7 100644
--- a/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp
+++ b/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp
@@ -6,7 +6,7 @@ LOG_SETUP("visibility_handler_test");
 #include <vespa/searchcore/proton/test/dummy_feed_view.h>
 #include <vespa/searchcore/proton/test/threading_service_observer.h>
 #include <vespa/searchcore/proton/server/executorthreadingservice.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 
 using search::SerialNum;
 using proton::IGetSerialNum;
@@ -15,7 +15,7 @@ using proton::ExecutorThreadingService;
 using proton::test::ThreadingServiceObserver;
 using proton::IFeedView;
 using proton::VisibilityHandler;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using fastos::TimeStamp;
 
 namespace {
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
index 0549e57a528..6cc1c1eb5b9 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
@@ -1,13 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "summarycompacttarget.h"
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchcorespi/index/i_thread_service.h>
 #include <future>
 
 using search::IDocumentStore;
 using search::SerialNum;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using searchcorespi::FlushStats;
 using searchcorespi::IFlushTarget;
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
index de8eaacf184..2f7681c5909 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
@@ -1,9 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "summaryflushtarget.h"
-#include <future>
 #include <vespa/searchcorespi/index/i_thread_service.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 
 using search::IDocumentStore;
 using search::SerialNum;
@@ -91,7 +90,7 @@ SummaryFlushTarget::initFlush(SerialNum currentSerial)
     // Called by document db executor
     std::promise<Task::UP> promise;
     std::future<Task::UP> future = promise.get_future();
-    _summaryService.execute(search::makeLambdaTask(
+    _summaryService.execute(vespalib::makeLambdaTask(
                                   [&]() { promise.set_value(
                                           internalInitFlush(currentSerial));
                                   }));
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index 79d82108ee8..91b043d0c9f 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -9,7 +9,7 @@
 #include <vespa/searchcorespi/index/i_thread_service.h>
 #include <vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h>
 #include <vespa/searchlib/docstore/logdocumentstore.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchsummary/docsummary/docsumconfig.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <sstream>
@@ -32,7 +32,7 @@ using search::IDocumentStore;
 using search::LogDocumentStore;
 using search::LogDataStore;
 using search::WriteableFileChunk;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 using search::TuneFileSummary;
 using search::common::FileHeaderContext;
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp
index c7a614dafe8..3c1ac1b5361 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp
@@ -2,13 +2,13 @@
 
 #include "threadedflushtarget.h"
 #include <vespa/searchcore/proton/server/igetserialnum.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <future>
 #include <cassert>
 
 using searchcorespi::IFlushTarget;
 using searchcorespi::FlushStats;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp
index a416a7d18f3..7deb0afa7af 100644
--- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp
@@ -1,15 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "task_runner.h"
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <future>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
-namespace proton {
-
-namespace initializer {
+namespace proton::initializer {
 
 TaskRunner::TaskRunner(vespalib::Executor &executor)
     : _executor(executor),
@@ -126,6 +124,4 @@ TaskRunner::runTask(InitializerTask::SP rootTask,
     context->execute(makeLambdaTask([=]() { pollTask(context); } ));
 }
 
-} // namespace proton::initializer
-
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp
index bd3574327bc..abaf37f5084 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp
@@ -2,14 +2,12 @@
 
 #include "gid_to_lid_change_handler.h"
 #include "i_gid_to_lid_change_listener.h"
-#include <vespa/searchlib/common/lambdatask.h>
 #include <vespa/searchcorespi/index/i_thread_service.h>
-#include <vespa/document/base/globalid.h>
-#include <cassert>
 #include <vespa/vespalib/stllike/hash_map.hpp>
+#include <vespa/vespalib/util/lambdatask.h>
+#include <cassert>
 
-using search::makeLambdaTask;
-
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
@@ -22,7 +20,6 @@ GidToLidChangeHandler::GidToLidChangeHandler()
 {
 }
 
-
 GidToLidChangeHandler::~GidToLidChangeHandler()
 {
     assert(_closed);
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
index 7e8f16ac9a1..22af1dc1692 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
@@ -1,10 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "disk_mem_usage_forwarder.h"
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <cassert>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
index fb7d712db9d..bacf80e69a6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_sampler.cpp
@@ -2,10 +2,10 @@
 
 #include "disk_mem_usage_sampler.h"
 #include <vespa/vespalib/util/timer.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <unistd.h>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.cpp b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.cpp
index f48a9d37e8f..375940ea4df 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.cpp
@@ -3,10 +3,10 @@
 #include "document_subdb_initializer.h"
 #include "idocumentsubdb.h"
 #include <future>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchcorespi/index/i_thread_service.h>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 8c89f2a36af..024de835d7a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -56,7 +56,7 @@ using storage::spi::Timestamp;
 using search::common::FileHeaderContext;
 using proton::initializer::InitializerTask;
 using proton::initializer::TaskRunner;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using searchcorespi::IFlushTarget;
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
index 3e18c05ba0f..fe3314e7976 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
@@ -5,11 +5,11 @@
 #include "bootstrapconfig.h"
 #include "i_proton_configurer_owner.h"
 #include "i_document_db_config_owner.h"
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/vespalib/util/threadstackexecutorbase.h>
 #include <future>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using vespa::config::search::core::ProtonConfig;
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
index 14556c86c18..6216af77a56 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
@@ -24,7 +24,7 @@ using storage::spi::BucketInfoResult;
 using storage::spi::Timestamp;
 using vespalib::IllegalStateException;
 using vespalib::make_string;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 5fbae951536..e92c11c2fb8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -36,7 +36,7 @@ using search::GrowStrategy;
 using search::AttributeGuard;
 using search::AttributeVector;
 using search::IndexMetaInfo;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using search::TuneFileDocumentDB;
 using search::index::Schema;
 using search::SerialNum;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index c35f942ca35..290b7b74e87 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -26,7 +26,7 @@ using document::DocumentId;
 using document::DocumentTypeRepo;
 using document::DocumentUpdate;
 using search::index::Schema;
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using search::IDestructorCallback;
 using search::SerialNum;
 using storage::spi::BucketInfoResult;
diff --git a/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp b/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp
index 9afc818594f..4d104256cbd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp
@@ -3,11 +3,11 @@
 #include "tlssyncer.h"
 #include "igetserialnum.h"
 #include <vespa/vespalib/util/threadexecutor.h>
-#include <vespa/searchlib/common/lambdatask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/searchlib/transactionlog/syncproxy.h>
 #include <future>
 
-using search::makeLambdaTask;
+using vespalib::makeLambdaTask;
 using search::SerialNum;
 
 namespace proton {