summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-10-12 15:25:40 +0000
committerGeir Storli <geirst@yahooinc.com>2022-10-12 16:21:01 +0000
commit8273895eb7fdc6d681b3f24096be129248f3d5c3 (patch)
tree92e2d51c3f0a04261a45157fdfa97d71449ec307 /searchcore
parent73cbdc601031890cba53907a0804c644c3551a2c (diff)
Rename onGenerationChange() -> before_inc_generation() and change parameter to be the current generation.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp6
-rw-r--r--searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index c6ef6994b81..0a3d0192d81 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -241,11 +241,11 @@ DocumentMetaStore::onUpdateStat()
}
void
-DocumentMetaStore::onGenerationChange(generation_t generation)
+DocumentMetaStore::before_inc_generation(generation_t current_gen)
{
_gidToLidMap.getAllocator().freeze();
- _gidToLidMap.getAllocator().assign_generation(generation - 1);
- getGenerationHolder().assign_generation(generation - 1);
+ _gidToLidMap.getAllocator().assign_generation(current_gen);
+ getGenerationHolder().assign_generation(current_gen);
updateStat(false);
}
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
index c4010a07709..b6f907c26d5 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
@@ -93,7 +93,7 @@ private:
void onUpdateStat() override;
// Implements AttributeVector
- void onGenerationChange(generation_t generation) override;
+ void before_inc_generation(generation_t current_gen) override;
void removeOldGenerations(generation_t firstUsed) override;
std::unique_ptr<search::AttributeSaver> onInitSave(vespalib::stringref fileName) override;
bool onLoad(vespalib::Executor *executor) override;