diff options
Diffstat (limited to 'searchcore')
4 files changed, 5 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 67a7ceeae34..59bb33f51ce 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -908,7 +908,6 @@ TEST_F("require that document pruner is active", MaintenanceControllerFixture) f._builder.createDocs(3, 6, 8); // 2 docs f._builder.createDocs(4, 8, 11); // 3 docs test::UserDocuments removeDocs(f._builder.getDocs()); - BucketId bucketId3(removeDocs.getBucket(3)); f.removeDocs(removeDocs, remTime); f.notifyClusterStateChanged(); EXPECT_TRUE(f._executor.isIdle()); diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h index 9216b10e5a9..637c341ff6a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h +++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h @@ -15,7 +15,7 @@ namespace proton { struct IDocumentMetaStore; class IPruneRemovedDocumentsHandler; -class RawDocumentMetaData; +struct RawDocumentMetaData; /** * Job that regularly checks whether old removed documents should be diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp index c050719b361..de3baa8d26e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp @@ -325,11 +325,10 @@ StoreOnlyFeedView::putSummary(SerialNum serialNum, Lid lid, } void -StoreOnlyFeedView::putSummaryNoop(SerialNum serialNum, Lid lid, - FutureStream futureStream, OnOperationDoneType onDone) +StoreOnlyFeedView::putSummaryNoop(FutureStream futureStream, OnOperationDoneType onDone) { summaryExecutor().execute( - makeLambdaTask([serialNum, lid, futureStream = std::move(futureStream), onDone] () mutable { + makeLambdaTask([futureStream = std::move(futureStream), onDone] () mutable { (void) onDone; vespalib::nbostream os = futureStream.get(); (void) os; @@ -427,7 +426,7 @@ StoreOnlyFeedView::internalUpdate(FeedToken token, const UpdateOperation &updOp) if (useDocStore) { putSummary(serialNum, lid, std::move(futureStream), onWriteDone); } else { - putSummaryNoop(serialNum, lid, std::move(futureStream), onWriteDone); + putSummaryNoop(std::move(futureStream), onWriteDone); } _writeService.shared().execute(makeLambdaTask( [upd = updOp.getUpdate(), useDocStore, lid, onWriteDone, promisedDoc = std::move(promisedDoc), diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h index 5a0257fda57..b9e02276180 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h @@ -157,7 +157,7 @@ private: return _writeService.summary(); } void putSummary(SerialNum serialNum, Lid lid, FutureStream doc, OnOperationDoneType onDone); - void putSummaryNoop(SerialNum serialNum, Lid lid, FutureStream doc, OnOperationDoneType onDone); + void putSummaryNoop(FutureStream doc, OnOperationDoneType onDone); void putSummary(SerialNum serialNum, Lid lid, DocumentSP doc, OnOperationDoneType onDone); void removeSummary(SerialNum serialNum, Lid lid, OnWriteDoneType onDone); void heartBeatSummary(SerialNum serialNum); |