Closure -> lambda

16 files changed, 37 insertions, 108 deletions

diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
index 23267e0628b..4bf8f36caa3 100644
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
@@ -113,8 +113,7 @@ public:
         if (!EXPECT_EQUAL(expRemoveCompleteCount, _removeCompleteCount)) {
             return false;
         }
-        if (!EXPECT_EQUAL(expRemoveBatchCompleteCount,
-                          _removeBatchCompleteCount)) {
+        if (!EXPECT_EQUAL(expRemoveBatchCompleteCount, _removeBatchCompleteCount)) {
             return false;
         }
         if (!EXPECT_EQUAL(expRemoveCompleteLids, _removeCompleteLids)) {
@@ -152,9 +151,7 @@ public:
         test::runInMaster(_writeService, func);
     }
 
-    void
-    cycledLids(const std::vector<uint32_t> &lids)
-    {
+    void cycledLids(const std::vector<uint32_t> &lids) {
         if (lids.size() == 1) {
             _store.removeComplete(lids[0]);
         } else {
@@ -162,33 +159,23 @@ public:
         }
     }
 
-    void
-    performCycleLids(const std::vector<uint32_t> &lids)
-    {
-        _writeService.master().execute(
-                makeLambdaTask([this, lids]() { cycledLids(lids);}));
+    void performCycleLids(const std::vector<uint32_t> &lids) {
+        _writeService.master().execute(makeLambdaTask([this, lids]() { cycledLids(lids);}));
     }
 
-    void
-    cycleLids(const std::vector<uint32_t> &lids)
-    {
+    void cycleLids(const std::vector<uint32_t> &lids) {
         if (lids.empty())
             return;
-        _writeService.index().execute(
-                makeLambdaTask([this, lids]() { performCycleLids(lids);}));
+        _writeService.index().execute(makeLambdaTask([this, lids]() { performCycleLids(lids);}));
     }
 
-    bool
-    delayReuse(uint32_t lid)
-    {
+    bool delayReuse(uint32_t lid) {
         bool res = false;
         runInMaster([&] () { res = _lidReuseDelayer->delayReuse(lid); } );
         return res;
     }
 
-    bool
-    delayReuse(const std::vector<uint32_t> &lids)
-    {
+    bool delayReuse(const std::vector<uint32_t> &lids) {
         bool res = false;
         runInMaster([&] () { res = _lidReuseDelayer->delayReuse(lids); });
         return res;
@@ -198,26 +185,10 @@ public:
         runInMaster([&] () { cycleLids(_lidReuseDelayer->getReuseLids()); });
     }
 
-    void
-    sync()
-    {
-        _writeService.sync();
-    }
+    void sync() { _writeService.sync(); }
 
-    void
-    scheduleDelayReuseLid(uint32_t lid)
-    {
-        runInMaster([&] () { cycleLids({ lid }); });
-    }
-
-    void
-    scheduleDelayReuseLids(const std::vector<uint32_t> &lids)
-    {
-        runInMaster([&] () { cycleLids(lids); });
-    }
 };
 
-
 TEST_F("require that nothing happens before free list is active", Fixture)
 {
     EXPECT_FALSE(f.delayReuse(4));
@@ -226,7 +197,6 @@ TEST_F("require that nothing happens before free list is active", Fixture)
     EXPECT_TRUE(assertThreadObserver(2, 0, 0, f._writeService));
 }
 
-
 TEST_F("require that reuse can be batched", Fixture)
 {
     f._store._freeListActive = true;
@@ -243,7 +213,6 @@ TEST_F("require that reuse can be batched", Fixture)
     EXPECT_TRUE(assertThreadObserver(6, 1, 0, f._writeService));
 }
 
-
 TEST_F("require that single element array is optimized", Fixture)
 {
     f._store._freeListActive = true;
diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
index f730d286b34..577bd32ca1f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
@@ -69,8 +69,7 @@ ClusterStateHandler::performSetClusterState(const ClusterState *calc, IGenericRe
 }
 
 void
-ClusterStateHandler::performGetModifiedBuckets(
-        IBucketIdListResultHandler *resultHandler)
+ClusterStateHandler::performGetModifiedBuckets(IBucketIdListResultHandler *resultHandler)
 {
     storage::spi::BucketIdListResult::List modifiedBuckets;
     modifiedBuckets.resize(_modifiedBuckets.size());
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp
index e10f7937dd0..6951125f408 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp
@@ -75,8 +75,7 @@ DocumentBucketMover::setupForBucket(const BucketId &bucket,
 }
 
 
-namespace
-{
+namespace {
 
 class MoveKey
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index 7fb16e851fa..18af8e15335 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -33,7 +33,6 @@
 #include <vespa/searchlib/engine/docsumreply.h>
 #include <vespa/searchlib/engine/searchreply.h>
 #include <vespa/vespalib/util/destructor_callbacks.h>
-#include <vespa/vespalib/util/closuretask.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/metrics/updatehook.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ibucketmodifiedhandler.h b/searchcore/src/vespa/searchcore/proton/server/ibucketmodifiedhandler.h
index 96f70d32dc5..652c303283f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ibucketmodifiedhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ibucketmodifiedhandler.h
@@ -2,16 +2,9 @@
 
 #pragma once
 
-namespace document
-{
-
-class BucketId;
-
-}
-
-namespace proton
-{
+namespace document { class BucketId;}
 
+namespace proton {
 
 class IBucketModifiedHandler
 {
@@ -20,6 +13,4 @@ public:
     virtual ~IBucketModifiedHandler() {}
 };
 
-
-} // namespace proton
-
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/ibucketstatecalculator.h b/searchcore/src/vespa/searchcore/proton/server/ibucketstatecalculator.h
index 10c0b194aac..15211c8ceb7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ibucketstatecalculator.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ibucketstatecalculator.h
@@ -16,7 +16,7 @@ struct IBucketStateCalculator
     virtual bool nodeUp() const = 0;
     virtual bool nodeInitializing() const = 0;
     virtual bool nodeRetired() const = 0;
-    virtual ~IBucketStateCalculator() {}
+    virtual ~IBucketStateCalculator() = default;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangedhandler.h b/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangedhandler.h
index 1ed0359042e..f97d1b697cb 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangedhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangedhandler.h
@@ -4,16 +4,9 @@
 
 #include <vespa/persistence/spi/bucketinfo.h>
 
-namespace document
-{
-
-class BucketId;
-
-}
-
-namespace proton
-{
+namespace document { class BucketId; }
 
+namespace proton {
 
 /**
  * Interface used to notify when bucket state has changed.
@@ -24,8 +17,7 @@ public:
     virtual void notifyBucketStateChanged(const document::BucketId &bucketId,
                                           storage::spi::BucketInfo::ActiveState newState) = 0;
 
-    virtual ~IBucketStateChangedHandler() {}
+    virtual ~IBucketStateChangedHandler() = default;
 };
 
-
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangednotifier.h b/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangednotifier.h
index b21c184d431..0f1f03370d0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangednotifier.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ibucketstatechangednotifier.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-namespace proton
-{
+namespace proton {
 
 class IBucketStateChangedHandler;
 
@@ -13,14 +12,10 @@ class IBucketStateChangedHandler;
 class IBucketStateChangedNotifier
 {
 public:
-    virtual void
-    addBucketStateChangedHandler(IBucketStateChangedHandler *handler) = 0;
-
-    virtual void
-    removeBucketStateChangedHandler(IBucketStateChangedHandler *handler) = 0;
+    virtual void addBucketStateChangedHandler(IBucketStateChangedHandler *handler) = 0;
+    virtual void removeBucketStateChangedHandler(IBucketStateChangedHandler *handler) = 0;
     
-    virtual ~IBucketStateChangedNotifier() {}
+    virtual ~IBucketStateChangedNotifier() = default;
 };
 
-
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/iclusterstatechangedhandler.h b/searchcore/src/vespa/searchcore/proton/server/iclusterstatechangedhandler.h
index f50e591d0e8..16c98054a11 100644
--- a/searchcore/src/vespa/searchcore/proton/server/iclusterstatechangedhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/iclusterstatechangedhandler.h
@@ -4,8 +4,7 @@
 
 #include "ibucketstatecalculator.h"
 
-namespace proton
-{
+namespace proton {
 
 /**
  * Interface used to notify when cluster state has changed.
@@ -13,10 +12,9 @@ namespace proton
 class IClusterStateChangedHandler
 {
 public:
-    virtual ~IClusterStateChangedHandler() { }
+    virtual ~IClusterStateChangedHandler() = default;
 
-    virtual void
-    notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) = 0;
+    virtual void notifyClusterStateChanged(const std::shared_ptr<IBucketStateCalculator> &newCalc) = 0;
 };
 
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
index aa04cc89f52..c05c25990a6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
@@ -117,14 +117,14 @@ MaintenanceJobsInjector::injectJobs(MaintenanceController &controller,
                                     IAttributeManagerSP notReadyAttributeManager,
                                     std::unique_ptr<const AttributeConfigInspector> attribute_config_inspector,
                                     std::shared_ptr<TransientMemoryUsageProvider> transient_memory_usage_provider,
-                                    AttributeUsageFilter &attributeUsageFilter) {
+                                    AttributeUsageFilter &attributeUsageFilter)
+{
     controller.registerJobInMasterThread(std::make_unique<HeartBeatJob>(hbHandler, config.getHeartBeatConfig()));
     controller.registerJobInDefaultPool(std::make_unique<PruneSessionCacheJob>(scPruner, config.getSessionCachePruneInterval()));
     const MaintenanceDocumentSubDB &mRemSubDB(controller.getRemSubDB());
     auto pruneRDjob = std::make_unique<PruneRemovedDocumentsJob>(config.getPruneRemovedDocumentsConfig(), *mRemSubDB.meta_store(),
-                                                mRemSubDB.sub_db_id(), docTypeName, prdHandler, fbHandler);
-    controller.registerJobInMasterThread(
-            trackJob(jobTrackers.getRemovedDocumentsPrune(), std::move(pruneRDjob)));
+                                                                 mRemSubDB.sub_db_id(), docTypeName, prdHandler, fbHandler);
+    controller.registerJobInMasterThread(trackJob(jobTrackers.getRemovedDocumentsPrune(), std::move(pruneRDjob)));
     if (!config.getLidSpaceCompactionConfig().isDisabled()) {
         injectLidSpaceCompactionJobs(controller, config, bucketExecutor, lscHandlers, opStorer, fbHandler,
                                      jobTrackers.getLidSpaceCompact(), diskMemUsageNotifier,
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
index e35f9e1aa48..8ec479084d2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.h
@@ -46,10 +46,8 @@ struct MaintenanceJobsInjector
                            IPruneRemovedDocumentsHandler &prdHandler,
                            IDocumentMoveHandler &moveHandler,
                            IBucketModifiedHandler &bucketModifiedHandler,
-                           IClusterStateChangedNotifier &
-                           clusterStateChangedNotifier,
-                           IBucketStateChangedNotifier &
-                           bucketStateChangedNotifier,
+                           IClusterStateChangedNotifier & clusterStateChangedNotifier,
+                           IBucketStateChangedNotifier & bucketStateChangedNotifier,
                            const std::shared_ptr<IBucketStateCalculator> &calc,
                            IDiskMemUsageNotifier &diskMemUsageNotifier,
                            DocumentDBJobTrackers &jobTrackers,
diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
index 43be4e9accd..dfb84af5da5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
@@ -23,7 +23,7 @@ PruneRemovedDocumentsJob(const Config &config,
                          IPruneRemovedDocumentsHandler &handler,
                          IFrozenBucketHandler &frozenHandler)
     : BlockableMaintenanceJob("prune_removed_documents." + docTypeName,
-                      config.getDelay(), config.getInterval()),
+                              config.getDelay(), config.getInterval()),
       _metaStore(metaStore),
       _subDbId(subDbId),
       _cfgAgeLimit(config.getAge()),
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index 020111fbf58..38478b4ff20 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -16,7 +16,6 @@
 #include <vespa/searchlib/fef/indexproperties.h>
 #include <vespa/searchlib/fef/properties.h>
 #include <vespa/eval/eval/fast_value.h>
-#include <vespa/vespalib/util/closuretask.h>
 
 using vespa::config::search::RankProfilesConfig;
 using proton::matching::MatchingStats;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 7dbf54cfd6c..95051341e8c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -23,7 +23,6 @@
 #include <vespa/searchlib/docstore/document_store_visitor_progress.h>
 #include <vespa/searchlib/util/fileheadertk.h>
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/util/closuretask.h>
 #include <vespa/vespalib/util/exceptions.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
index 070cfd8085e..9c928f49ca8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
@@ -4,7 +4,6 @@
 #include "transactionlogmanager.h"
 #include <vespa/searchlib/transactionlog/translogclient.h>
 #include <vespa/searchcore/proton/common/eventlogger.h>
-#include <vespa/vespalib/util/closuretask.h>
 #include <vespa/vespalib/util/exceptions.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/test/thread_utils.h b/searchcore/src/vespa/searchcore/proton/test/thread_utils.h
index 340d3b08441..43033d35185 100644
--- a/searchcore/src/vespa/searchcore/proton/test/thread_utils.h
+++ b/searchcore/src/vespa/searchcore/proton/test/thread_utils.h
@@ -2,17 +2,10 @@
 #pragma once
 
 #include <vespa/searchcorespi/index/ithreadingservice.h>
-#include <vespa/vespalib/util/closuretask.h>
+#include <vespa/vespalib/util/lambdatask.h>
 
 namespace proton::test {
 
-template <typename FunctionType>
-void
-runFunction(FunctionType *func)
-{
-    (*func)();
-}
-
 /**
  * Run the given function in the master thread and wait until done.
  */
@@ -20,8 +13,7 @@ template <typename FunctionType>
 void
 runInMaster(searchcorespi::index::IThreadingService &writeService, FunctionType func)
 {
-    writeService.master().execute(vespalib::makeTask
-            (vespalib::makeClosure(&runFunction<FunctionType>, &func)));
+    writeService.master().execute(vespalib::makeLambdaTask(std::move(func)));
     writeService.sync();
 }