Rename onGenerationChange() -> before_inc_generation() and change parameter to be the current generation.

33 files changed, 62 insertions, 64 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;
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
index 938a7fb35d7..35758ce7c08 100644
--- a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
+++ b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
@@ -44,8 +44,8 @@ class MyAttribute : public search::NotImplementedAttribute
     virtual void removeOldGenerations(generation_t firstUsed) override {
         _mvMapping.reclaim_memory(firstUsed);
     }
-    virtual void onGenerationChange(generation_t generation) override {
-        _mvMapping.assign_generation(generation - 1);
+    virtual void before_inc_generation(generation_t current_gen) override {
+        _mvMapping.assign_generation(current_gen);
     }
 
 public:
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index 876830bb186..3d557f3380c 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -184,7 +184,7 @@ void
 AttributeVector::incGeneration()
 {
     // Freeze trees etc, to stop new readers from accessing currently held data
-    onGenerationChange(_genHandler.getNextGeneration());
+    before_inc_generation(_genHandler.getCurrentGeneration());
     _genHandler.incGeneration();
     // Remove old data on hold lists that can no longer be reached by readers
     removeAllOldGenerations();
@@ -238,7 +238,7 @@ AttributeVector::headerTypeOK(const vespalib::GenericHeader &header) const
 }
 
 void AttributeVector::removeOldGenerations(generation_t firstUsed) { (void) firstUsed; }
-void AttributeVector::onGenerationChange(generation_t generation) { (void) generation; }
+void AttributeVector::before_inc_generation(generation_t current_gen) { (void) current_gen; }
 const IEnumStore* AttributeVector::getEnumStoreBase() const { return nullptr; }
 IEnumStore* AttributeVector::getEnumStoreBase() { return nullptr; }
 const attribute::MultiValueMappingBase * AttributeVector::getMultiValueBase() const { return nullptr; }
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 4d4cd8ac35f..56bc8688905 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -447,7 +447,7 @@ private:
 
     /// Clean up [0, firstUsed>
     virtual void removeOldGenerations(generation_t firstUsed);
-    virtual void onGenerationChange(generation_t generation);
+    virtual void before_inc_generation(generation_t current_gen);
     virtual void onUpdateStat() = 0;
     /**
      * Used to regulate access to critical resources. Apply the
diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.h b/searchlib/src/vespa/searchlib/attribute/multienumattribute.h
index ee8f3181fd9..f7a13fc71b1 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.h
@@ -64,7 +64,7 @@ public:
     void onUpdateStat() override;
 
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
 
     //-----------------------------------------------------------------------------------------------------------------
     // Attribute read API
diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp
index ad827d0fd85..66bc21748e4 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp
@@ -202,7 +202,7 @@ MultiValueEnumAttribute<B, M>::removeOldGenerations(generation_t firstUsed)
 
 template <typename B, typename M>
 void
-MultiValueEnumAttribute<B, M>::onGenerationChange(generation_t generation)
+MultiValueEnumAttribute<B, M>::before_inc_generation(generation_t current_gen)
 {
     /*
      * Freeze tree before generation is increased in attribute vector
@@ -211,8 +211,8 @@ MultiValueEnumAttribute<B, M>::onGenerationChange(generation_t generation)
      * sufficiently new frozen tree.
      */
     freezeEnumDictionary();
-    this->_mvMapping.assign_generation(generation - 1);
-    this->_enumStore.assign_generation(generation - 1);
+    this->_mvMapping.assign_generation(current_gen);
+    this->_enumStore.assign_generation(current_gen);
 }
 
 template <typename B, typename M>
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h
index 0a29b4af48d..0a7b579e6b3 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h
@@ -62,7 +62,7 @@ public:
     void onUpdateStat() override;
     void removeOldGenerations(generation_t firstUsed) override;
 
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     bool onLoad(vespalib::Executor *executor) override;
     virtual bool onLoadEnumerated(ReaderBase &attrReader);
 
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp
index 2405841f331..0791ee60147 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp
@@ -103,9 +103,9 @@ void MultiValueNumericAttribute<B, M>::removeOldGenerations(generation_t firstUs
 
 
 template <typename B, typename M>
-void MultiValueNumericAttribute<B, M>::onGenerationChange(generation_t generation)
+void MultiValueNumericAttribute<B, M>::before_inc_generation(generation_t current_gen)
 {
-    this->_mvMapping.assign_generation(generation - 1);
+    this->_mvMapping.assign_generation(current_gen);
 }
 
 template <typename B, typename M>
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h
index 4bd8ad6e99f..6ef2547934d 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h
@@ -81,7 +81,7 @@ public:
     ~MultiValueNumericPostingAttribute();
 
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
 
     std::unique_ptr<attribute::SearchContext>
     getSearch(QueryTermSimpleUP term, const attribute::SearchContextParams & params) const override;
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp
index 70a438f1551..3117cdd8442 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp
@@ -64,11 +64,11 @@ MultiValueNumericPostingAttribute<B, M>::removeOldGenerations(generation_t first
 
 template <typename B, typename M>
 void
-MultiValueNumericPostingAttribute<B, M>::onGenerationChange(generation_t generation)
+MultiValueNumericPostingAttribute<B, M>::before_inc_generation(generation_t current_gen)
 {
     _postingList.freeze();
-    MultiValueNumericEnumAttribute<B, M>::onGenerationChange(generation);
-    _postingList.assign_generation(generation - 1);
+    MultiValueNumericEnumAttribute<B, M>::before_inc_generation(current_gen);
+    _postingList.assign_generation(current_gen);
 }
 
 template <typename B, typename M>
diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h
index 4deb71e9759..c1996e9c868 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h
@@ -78,7 +78,7 @@ public:
     ~MultiValueStringPostingAttributeT();
 
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
 
     std::unique_ptr<attribute::SearchContext>
     getSearch(QueryTermSimpleUP term, const attribute::SearchContextParams & params) const override;
diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
index 9bc2c31b163..dd3aa2d6117 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
@@ -83,11 +83,11 @@ MultiValueStringPostingAttributeT<B, T>::removeOldGenerations(generation_t first
 
 template <typename B, typename T>
 void
-MultiValueStringPostingAttributeT<B, T>::onGenerationChange(generation_t generation)
+MultiValueStringPostingAttributeT<B, T>::before_inc_generation(generation_t current_gen)
 {
     _postingList.freeze();
-    MultiValueStringAttributeT<B, T>::onGenerationChange(generation);
-    _postingList.assign_generation(generation - 1);
+    MultiValueStringAttributeT<B, T>::before_inc_generation(current_gen);
+    _postingList.assign_generation(current_gen);
 }
 
 
diff --git a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
index 8593b013443..25a4f5748a9 100644
--- a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
@@ -132,10 +132,10 @@ PredicateAttribute::removeOldGenerations(generation_t firstUsed)
 }
 
 void
-PredicateAttribute::onGenerationChange(generation_t generation)
+PredicateAttribute::before_inc_generation(generation_t current_gen)
 {
-    getGenerationHolder().assign_generation(generation - 1);
-    _index->assign_generation(generation - 1);
+    getGenerationHolder().assign_generation(current_gen);
+    _index->assign_generation(current_gen);
 }
 
 void
diff --git a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.h b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.h
index f5d789298a0..bc03916dd66 100644
--- a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.h
@@ -49,7 +49,7 @@ public:
     bool onLoad(vespalib::Executor *executor) override;
     void onCommit() override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     void onUpdateStat() override;
     bool addDoc(DocId &doc_id) override;
     uint32_t clearDoc(DocId doc_id) override;
diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp
index aa884e1e298..1311868599a 100644
--- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp
@@ -169,13 +169,13 @@ ReferenceAttribute::removeOldGenerations(generation_t firstUsed)
 }
 
 void
-ReferenceAttribute::onGenerationChange(generation_t generation)
+ReferenceAttribute::before_inc_generation(generation_t current_gen)
 {
     _referenceMappings.freeze();
     _store.freeze();
-    _referenceMappings.assign_generation(generation - 1);
-    _store.assign_generation(generation - 1);
-    getGenerationHolder().assign_generation(generation - 1);
+    _referenceMappings.assign_generation(current_gen);
+    _store.assign_generation(current_gen);
+    getGenerationHolder().assign_generation(current_gen);
 }
 
 void
diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.h b/searchlib/src/vespa/searchlib/attribute/reference_attribute.h
index dc3e2ad729a..0e9c7858315 100644
--- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.h
@@ -51,7 +51,7 @@ private:
 
     void onAddDocs(DocId docIdLimit) override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     void onCommit() override;
     void onUpdateStat() override;
     std::unique_ptr<AttributeSaver> onInitSave(vespalib::stringref fileName) override;
diff --git a/searchlib/src/vespa/searchlib/attribute/singleboolattribute.cpp b/searchlib/src/vespa/searchlib/attribute/singleboolattribute.cpp
index 6e07a9e658e..b4e32bc8bd9 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleboolattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/singleboolattribute.cpp
@@ -262,8 +262,8 @@ SingleBoolAttribute::removeOldGenerations(generation_t firstUsed) {
 }
 
 void
-SingleBoolAttribute::onGenerationChange(generation_t generation) {
-    getGenerationHolder().assign_generation(generation - 1);
+SingleBoolAttribute::before_inc_generation(generation_t current_gen) {
+    getGenerationHolder().assign_generation(current_gen);
 }
 
 }
diff --git a/searchlib/src/vespa/searchlib/attribute/singleboolattribute.h b/searchlib/src/vespa/searchlib/attribute/singleboolattribute.h
index 7868c228e77..741331c4abd 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleboolattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singleboolattribute.h
@@ -29,7 +29,7 @@ public:
     void clearDocs(DocId lidLow, DocId lidLimit, bool in_shrink_lid_space) override;
     void onShrinkLidSpace() override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     uint64_t getEstimatedSaveByteSize() const override;
 
     std::unique_ptr<attribute::SearchContext>
diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h
index 6e46c697fbc..b9d19bbc305 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h
@@ -112,7 +112,7 @@ public:
     void onCommit() override;
     void onUpdateStat() override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     EnumHandle getEnum(DocId doc) const override {
        return getE(doc);
     }
diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp
index f0649224b89..9980d466740 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp
@@ -272,7 +272,7 @@ SingleValueEnumAttribute<B>::removeOldGenerations(generation_t firstUsed)
 
 template <typename B>
 void
-SingleValueEnumAttribute<B>::onGenerationChange(generation_t generation)
+SingleValueEnumAttribute<B>::before_inc_generation(generation_t current_gen)
 {
     /*
      * Freeze tree before generation is increased in attribute vector
@@ -281,8 +281,8 @@ SingleValueEnumAttribute<B>::onGenerationChange(generation_t generation)
      * sufficiently new frozen tree.
      */
     freezeEnumDictionary();
-    getGenerationHolder().assign_generation(generation - 1);
-    this->_enumStore.assign_generation(generation - 1);
+    getGenerationHolder().assign_generation(current_gen);
+    this->_enumStore.assign_generation(current_gen);
 }
 
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h
index fd2767eaee1..b22b6e1c0a6 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h
@@ -56,7 +56,7 @@ public:
     void onAddDocs(DocId lidLimit) override;
     void onUpdateStat() override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     bool addDoc(DocId & doc) override;
     bool onLoad(vespalib::Executor *executor) override;
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.hpp
index bbacc10e79c..6e169e9d241 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.hpp
@@ -102,9 +102,9 @@ SingleValueNumericAttribute<B>::removeOldGenerations(generation_t firstUsed)
 
 template <typename B>
 void
-SingleValueNumericAttribute<B>::onGenerationChange(generation_t generation)
+SingleValueNumericAttribute<B>::before_inc_generation(generation_t current_gen)
 {
-    getGenerationHolder().assign_generation(generation - 1);
+    getGenerationHolder().assign_generation(current_gen);
 }
 
 template <typename B>
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h
index 720fb211e1a..dac498f4050 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h
@@ -70,7 +70,7 @@ public:
     ~SingleValueNumericPostingAttribute();
 
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
 
     std::unique_ptr<attribute::SearchContext>
     getSearch(QueryTermSimpleUP term, const attribute::SearchContextParams & params) const override;
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp
index c5acc0c360a..1170ed8def9 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp
@@ -135,11 +135,11 @@ SingleValueNumericPostingAttribute<B>::removeOldGenerations(generation_t firstUs
 
 template <typename B>
 void
-SingleValueNumericPostingAttribute<B>::onGenerationChange(generation_t generation)
+SingleValueNumericPostingAttribute<B>::before_inc_generation(generation_t current_gen)
 {
     _postingList.freeze();
-    SingleValueNumericEnumAttribute<B>::onGenerationChange(generation);
-    _postingList.assign_generation(generation - 1);
+    SingleValueNumericEnumAttribute<B>::before_inc_generation(current_gen);
+    _postingList.assign_generation(current_gen);
 }
 
 template <typename B>
diff --git a/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.cpp b/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.cpp
index 02ab5798f9f..0f18faacecc 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.cpp
@@ -113,9 +113,9 @@ SingleValueSmallNumericAttribute::removeOldGenerations(generation_t firstUsed)
 
 
 void
-SingleValueSmallNumericAttribute::onGenerationChange(generation_t generation)
+SingleValueSmallNumericAttribute::before_inc_generation(generation_t current_gen)
 {
-    getGenerationHolder().assign_generation(generation - 1);
+    getGenerationHolder().assign_generation(current_gen);
 }
 
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h
index 4bf120d7952..d299724121b 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singlesmallnumericattribute.h
@@ -73,7 +73,7 @@ public:
     void onAddDocs(DocId docIdLimit) override;
     void onUpdateStat() override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     bool addDoc(DocId & doc) override;
     bool onLoad(vespalib::Executor *executor) override;
     void onSave(IAttributeSaveTarget &saveTarget) override;
diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h
index 30549f3048a..0e6bbbe0462 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h
@@ -72,7 +72,7 @@ public:
     ~SingleValueStringPostingAttributeT();
 
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
 
     std::unique_ptr<attribute::SearchContext>
     getSearch(QueryTermSimpleUP term, const attribute::SearchContextParams & params) const override;
diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp
index 5e7b70b5080..0e1ccce1ea8 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp
@@ -135,11 +135,11 @@ SingleValueStringPostingAttributeT<B>::removeOldGenerations(generation_t firstUs
 
 template <typename B>
 void
-SingleValueStringPostingAttributeT<B>::onGenerationChange(generation_t generation)
+SingleValueStringPostingAttributeT<B>::before_inc_generation(generation_t current_gen)
 {
     _postingList.freeze();
-    SingleValueStringAttributeT<B>::onGenerationChange(generation);
-    _postingList.assign_generation(generation - 1);
+    SingleValueStringAttributeT<B>::before_inc_generation(current_gen);
+    _postingList.assign_generation(current_gen);
 }
 
 template <typename B>
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
index 6a47e0da5df..c5cccc8153c 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
@@ -450,13 +450,11 @@ DenseTensorAttribute::onCommit()
 }
 
 void
-DenseTensorAttribute::onGenerationChange(generation_t next_gen)
+DenseTensorAttribute::before_inc_generation(generation_t current_gen)
 {
-    // TODO: Change onGenerationChange() to send current generation instead of next generation.
-    //       This applies for entire attribute vector code.
-    TensorAttribute::onGenerationChange(next_gen);
+    TensorAttribute::before_inc_generation(current_gen);
     if (_index) {
-        _index->assign_generation(next_gen - 1);
+        _index->assign_generation(current_gen);
     }
 }
 
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.h b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.h
index b0991aa57aa..191e2c8d5f1 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.h
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.h
@@ -47,7 +47,7 @@ public:
     std::unique_ptr<AttributeSaver> onInitSave(vespalib::stringref fileName) override;
     uint32_t getVersion() const override;
     void onCommit() override;
-    void onGenerationChange(generation_t next_gen) override;
+    void before_inc_generation(generation_t current_gen) override;
     void removeOldGenerations(generation_t first_used_gen) override;
     void get_state(const vespalib::slime::Inserter& inserter) const override;
     void onShrinkLidSpace() override;
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
index 1d147c14cca..f70c83c62ce 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
@@ -117,10 +117,10 @@ TensorAttribute::removeOldGenerations(generation_t firstUsed)
 }
 
 void
-TensorAttribute::onGenerationChange(generation_t generation)
+TensorAttribute::before_inc_generation(generation_t current_gen)
 {
-    getGenerationHolder().assign_generation(generation - 1);
-    _tensorStore.assign_generation(generation - 1);
+    getGenerationHolder().assign_generation(current_gen);
+    _tensorStore.assign_generation(current_gen);
 }
 
 bool
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h
index 7cfbb68eac7..88bb9fd4c61 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h
@@ -49,7 +49,7 @@ public:
     void onCommit() override;
     void onUpdateStat() override;
     void removeOldGenerations(generation_t firstUsed) override;
-    void onGenerationChange(generation_t generation) override;
+    void before_inc_generation(generation_t current_gen) override;
     bool addDoc(DocId &docId) override;
     std::unique_ptr<vespalib::eval::Value> getEmptyTensor() const override;
     vespalib::eval::TypedCells extract_cells_ref(uint32_t docid) const override;