Merge 877d32f into 813afdd

Author: ivanmorozov333

ydb/core/tx/columnshard/engines/portions/constructor.cpp

@@ -31,6 +31,35 @@ TPortionInfo TPortionInfoConstructor::Build(const bool needChunksNormalization)
     NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("portion_id", GetPortionIdVerified());
     FullValidation();
 
+    if (BlobIdxs.size()) {
+        auto itRecord = Records.begin();
+        auto itIndex = Indexes.begin();
+        auto itBlobIdx = BlobIdxs.begin();
+        while (itRecord != Records.end() && itIndex != Indexes.end()) {
+            if (itRecord->GetAddress() < itIndex->GetAddress()) {
+                AFL_VERIFY(itRecord->GetAddress() == itBlobIdx->GetAddress());
+                itRecord->RegisterBlobIdx(itBlobIdx->GetBlobIdx());
+                ++itRecord;
+                ++itBlobIdx;
+            } else if (itIndex->GetAddress() < itRecord->GetAddress()) {
+                AFL_VERIFY(itIndex->GetAddress() == itBlobIdx->GetAddress());
+                itIndex->RegisterBlobIdx(itBlobIdx->GetBlobIdx());
+                ++itIndex;
+                ++itBlobIdx;
+            } else {
+                AFL_VERIFY(false);
+            }
+        }
+        for (; itRecord != Records.end(); ++itRecord, ++itBlobIdx) {
+            AFL_VERIFY(itRecord->GetAddress() == itBlobIdx->GetAddress());
+            itRecord->RegisterBlobIdx(itBlobIdx->GetBlobIdx());
+        }
+        for (; itIndex != Indexes.end(); ++itIndex, ++itBlobIdx) {
+            AFL_VERIFY(itIndex->GetAddress() == itBlobIdx->GetAddress());
+            itIndex->RegisterBlobIdx(itBlobIdx->GetBlobIdx());
+        }
+    }
+
     result.Indexes = Indexes;
     result.Records = Records;
     result.BlobIds = BlobIds;

ydb/core/tx/columnshard/engines/portions/constructor.h

@@ -29,6 +29,21 @@ class TPortionInfoConstructor {
     YDB_ACCESSOR_DEF(std::vector<TColumnRecord>, Records);
     std::vector<TUnifiedBlobId> BlobIds;
 
+    class TAddressBlobId {
+    private:
+        YDB_READONLY_DEF(TChunkAddress, Address);
+        YDB_READONLY(TBlobRangeLink16::TLinkId, BlobIdx, 0);
+
+    public:
+        TAddressBlobId(const TChunkAddress& address, const TBlobRangeLink16::TLinkId blobIdx)
+            : Address(address)
+            , BlobIdx(blobIdx)
+        {
+
+        }
+    };
+    std::vector<TAddressBlobId> BlobIdxs;
+
 public:
     void SetPortionId(const ui64 value) {
         AFL_VERIFY(value);
@@ -226,19 +241,7 @@ class TPortionInfoConstructor {
     }
 
     void RegisterBlobIdx(const TChunkAddress& address, const TBlobRangeLink16::TLinkId blobIdx) {
-        for (auto&& i : Records) {
-            if (i.GetColumnId() == address.GetEntityId() && i.GetChunkIdx() == address.GetChunkIdx()) {
-                i.RegisterBlobIdx(blobIdx);
-                return;
-            }
-        }
-        for (auto&& i : Indexes) {
-            if (i.GetIndexId() == address.GetEntityId() && i.GetChunkIdx() == address.GetChunkIdx()) {
-                i.RegisterBlobIdx(blobIdx);
-                return;
-            }
-        }
-        AFL_VERIFY(false)("problem", "portion haven't address for blob registration")("address", address.DebugString());
+        BlobIdxs.emplace_back(address, blobIdx);
     }
 
     TString DebugString() const {
@@ -265,26 +268,37 @@ class TPortionInfoConstructor {
             std::sort(Indexes.begin(), Indexes.end(), pred);
             CheckChunksOrder(Indexes);
         }
+        {
+            auto pred = [](const TIndexChunk& l, const TIndexChunk& r) {
+                return l.GetAddress() < r.GetAddress();
+            };
+            std::sort(BlobIdxs.begin(), BlobIdxs.end(), pred);
+        }
     }
 
     void FullValidation() const {
         AFL_VERIFY(Records.size());
         CheckChunksOrder(Records);
         CheckChunksOrder(Indexes);
-        std::set<ui32> blobIdxs;
-        for (auto&& i : Records) {
-            blobIdxs.emplace(i.GetBlobRange().GetBlobIdxVerified());
-        }
-        for (auto&& i : Indexes) {
-            if (i.HasBlobRange()) {
-                blobIdxs.emplace(i.GetBlobRangeVerified().GetBlobIdxVerified());
-            }
-        }
-        if (BlobIds.size()) {
-            AFL_VERIFY(BlobIds.size() == blobIdxs.size());
-            AFL_VERIFY(BlobIds.size() == *blobIdxs.rbegin() + 1);
+        if (BlobIdxs.size()) {
+            AFL_VERIFY(BlobIdxs.size() == Records.size() + Indexes.size())("blobs", BlobIdxs.size())("records", Records.size())(
+                                                               "indexes", Indexes.size());
         } else {
-            AFL_VERIFY(blobIdxs.empty());
+            std::set<ui32> blobIdxs;
+            for (auto&& i : Records) {
+                blobIdxs.emplace(i.GetBlobRange().GetBlobIdxVerified());
+            }
+            for (auto&& i : Indexes) {
+                if (i.HasBlobRange()) {
+                    blobIdxs.emplace(i.GetBlobRangeVerified().GetBlobIdxVerified());
+                }
+            }
+            if (BlobIds.size()) {
+                AFL_VERIFY(BlobIds.size() == blobIdxs.size());
+                AFL_VERIFY(BlobIds.size() == *blobIdxs.rbegin() + 1);
+            } else {
+                AFL_VERIFY(blobIdxs.empty());
+            }
         }
     }