Skip to content

Commit df44e57

Browse files
authored
Merge pull request #36937 from vespa-engine/toregge/shrink-summary-lid-space-is-a-gc-flush-target
Shrink summary lid space flush target is a GC style flush target that [MERGEOK]
2 parents 118d0c1 + adbb975 commit df44e57

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ShrinkSummaryLidSpaceFlushTarget : public ShrinkLidSpaceFlushTarget {
5858

5959
public:
6060
ShrinkSummaryLidSpaceFlushTarget(const std::string& name, Type type, Component component,
61-
SerialNum flushedSerialNum, vespalib::system_time lastFlushTime,
61+
SerialNum flushedSerialNum,
6262
vespalib::Executor& summaryService,
6363
std::shared_ptr<ICompactableLidSpace> target);
6464
~ShrinkSummaryLidSpaceFlushTarget() override;
@@ -67,10 +67,9 @@ class ShrinkSummaryLidSpaceFlushTarget : public ShrinkLidSpaceFlushTarget {
6767

6868
ShrinkSummaryLidSpaceFlushTarget::ShrinkSummaryLidSpaceFlushTarget(const std::string& name, Type type,
6969
Component component, SerialNum flushedSerialNum,
70-
vespalib::system_time lastFlushTime,
7170
vespalib::Executor& summaryService,
7271
std::shared_ptr<ICompactableLidSpace> target)
73-
: ShrinkLidSpaceFlushTarget(name, type, component, flushedSerialNum, lastFlushTime, std::move(target)),
72+
: ShrinkLidSpaceFlushTarget(name, type, component, flushedSerialNum, vespalib::system_clock::now(), std::move(target)),
7473
_summaryService(summaryService) {
7574
}
7675

@@ -170,8 +169,8 @@ namespace {
170169

171170
IFlushTarget::SP createShrinkLidSpaceFlushTarget(vespalib::Executor& summaryService, IDocumentStore::SP docStore) {
172171
return std::make_shared<ShrinkSummaryLidSpaceFlushTarget>(
173-
"summary.shrink", IFlushTarget::Type::GC, IFlushTarget::Component::DOCUMENT_STORE, docStore->lastSyncToken(),
174-
docStore->getLastFlushTime(), summaryService, std::move(docStore));
172+
"summary.shrink", IFlushTarget::Type::GC, IFlushTarget::Component::DOCUMENT_STORE, docStore->tentativeLastSyncToken(),
173+
summaryService, std::move(docStore));
175174
}
176175

177176
} // namespace

0 commit comments

Comments
 (0)