fix write insert counters (#19591)

Co-authored-by: ivanmorozov333 <imorozov333@ya.ru>

Author: 2 people

ydb/core/tx/columnshard/blobs_action/transaction/tx_blobs_written.cpp

@@ -36,12 +36,7 @@ bool TTxBlobsWritingFinished::DoExecute(TTransactionContext& txc, const TActorCo
         AFL_VERIFY(portion.GetPortionInfoConstructor()->GetPortionConstructor().GetType() == NOlap::EPortionType::Written);
         auto* constructor =
             static_cast<NOlap::TWrittenPortionInfoConstructor*>(&portion.GetPortionInfoConstructor()->MutablePortionConstructor());
-        if (PackBehaviour == EOperationBehaviour::NoTxWrite) {
-            static TAtomicCounter Counter = 0;
-            constructor->SetInsertWriteId((TInsertWriteId)Counter.Inc());
-        } else {
-            constructor->SetInsertWriteId(Self->InsertTable->BuildNextWriteId(txc));
-        }
+        constructor->SetInsertWriteId(granule.BuildNextInsertWriteId());
         InsertWriteIds.emplace_back(constructor->GetInsertWriteIdVerified());
         portion.Finalize(Self, txc);
         if (PackBehaviour == EOperationBehaviour::NoTxWrite) {

ydb/core/tx/columnshard/engines/storage/granule/granule.cpp

@@ -151,6 +151,9 @@ void TGranuleMeta::UpsertPortionOnLoad(const std::shared_ptr<TPortionInfo>& port
     if (!portion->IsCommitted()) {
         const std::shared_ptr<TWrittenPortionInfo> portionImpl = std::static_pointer_cast<TWrittenPortionInfo>(portion);
         const TInsertWriteId insertWriteId = portionImpl->GetInsertWriteId();
+        if (AtomicGet(LastInsertWriteId) < (i64)portionImpl->GetInsertWriteId()) {
+            AtomicSet(LastInsertWriteId, (i64)portionImpl->GetInsertWriteId());
+        }
         AFL_VERIFY(InsertedPortions.emplace(insertWriteId, portionImpl).second);
         AFL_VERIFY(!Portions.contains(portionImpl->GetPortionId()));
     } else {

ydb/core/tx/columnshard/engines/storage/granule/granule.h

@@ -119,6 +119,7 @@ class TGranuleMeta: TNonCopyable {
 private:
     TMonotonic ModificationLastTime = TMonotonic::Now();
     THashMap<ui64, std::shared_ptr<TPortionInfo>> Portions;
+    TAtomic LastInsertWriteId = 1;
     THashMap<TInsertWriteId, std::shared_ptr<TWrittenPortionInfo>> InsertedPortions;
     THashMap<TInsertWriteId, TPortionDataAccessor> InsertedAccessors;
     mutable std::optional<TGranuleAdditiveSummary> AdditiveSummaryCache;
@@ -167,6 +168,10 @@ class TGranuleMeta: TNonCopyable {
         return ActualizationIndex->CollectMetadataRequests(Portions);
     }
 
+    TInsertWriteId BuildNextInsertWriteId() {
+        return (TInsertWriteId)AtomicIncrement(LastInsertWriteId);
+    }
+
     const NStorageOptimizer::IOptimizerPlanner& GetOptimizerPlanner() const {
         return *OptimizerPlanner;
     }