Merge 5ea9628 into 1b4620e

Author: ivanmorozov333

ydb/core/tx/columnshard/counters/engine_logs.cpp

@@ -83,11 +83,18 @@ void TEngineLogsCounters::OnActualizationTask(const ui32 evictCount, const ui32
 void TEngineLogsCounters::TPortionsInfoGuard::OnNewPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const {
     const ui32 producedId = (ui32)(portion->HasRemoveSnapshot() ? NOlap::NPortion::EProduced::INACTIVE : portion->GetMeta().Produced);
     Y_ABORT_UNLESS(producedId < BlobGuards.size());
+    THashSet<NOlap::TUnifiedBlobId> blobIds;
     for (auto&& i : portion->GetRecords()) {
-        BlobGuards[producedId]->Add(i.GetBlobRange().Size, i.GetBlobRange().Size);
+        const auto blobId = portion->GetBlobId(i.GetBlobRange().GetBlobIdxVerified());
+        if (blobIds.emplace(blobId).second) {
+            BlobGuards[producedId]->Add(blobId.BlobSize(), blobId.BlobSize());
+        }
     }
     for (auto&& i : portion->GetIndexes()) {
-        BlobGuards[producedId]->Add(i.GetBlobRange().Size, i.GetBlobRange().Size);
+        const auto blobId = portion->GetBlobId(i.GetBlobRange().GetBlobIdxVerified());
+        if (blobIds.emplace(blobId).second) {
+            BlobGuards[producedId]->Add(blobId.BlobSize(), blobId.BlobSize());
+        }
     }
     PortionRecordCountGuards[producedId]->Add(portion->GetRecordsCount(), 1);
     PortionSizeGuards[producedId]->Add(portion->GetTotalBlobBytes(), 1);
@@ -96,11 +103,18 @@ void TEngineLogsCounters::TPortionsInfoGuard::OnNewPortion(const std::shared_ptr
 void TEngineLogsCounters::TPortionsInfoGuard::OnDropPortion(const std::shared_ptr<NOlap::TPortionInfo>& portion) const {
     const ui32 producedId = (ui32)(portion->HasRemoveSnapshot() ? NOlap::NPortion::EProduced::INACTIVE : portion->GetMeta().Produced);
     Y_ABORT_UNLESS(producedId < BlobGuards.size());
+    THashSet<NOlap::TUnifiedBlobId> blobIds;
     for (auto&& i : portion->GetRecords()) {
-        BlobGuards[producedId]->Sub(i.GetBlobRange().Size, i.GetBlobRange().Size);
+        const auto blobId = portion->GetBlobId(i.GetBlobRange().GetBlobIdxVerified());
+        if (blobIds.emplace(blobId).second) {
+            BlobGuards[producedId]->Sub(blobId.BlobSize(), blobId.BlobSize());
+        }
     }
     for (auto&& i : portion->GetIndexes()) {
-        BlobGuards[producedId]->Sub(i.GetBlobRange().Size, i.GetBlobRange().Size);
+        const auto blobId = portion->GetBlobId(i.GetBlobRange().GetBlobIdxVerified());
+        if (blobIds.emplace(blobId).second) {
+            BlobGuards[producedId]->Sub(blobId.BlobSize(), blobId.BlobSize());
+        }
     }
     PortionRecordCountGuards[producedId]->Sub(portion->GetRecordsCount(), 1);
     PortionSizeGuards[producedId]->Sub(portion->GetTotalBlobBytes(), 1);