fixes

Author: ivanmorozov333

ydb/core/tx/columnshard/engines/column_engine_logs.cpp

@@ -497,6 +497,11 @@ void TColumnEngineForLogs::OnTieringModified(const std::shared_ptr<NColumnShard:
 
 void TColumnEngineForLogs::DoRegisterTable(const ui64 pathId) {
     AFL_VERIFY(Tables.emplace(pathId, std::make_shared<TGranuleMeta>(pathId, GranulesStorage, SignalCounters.RegisterGranuleDataCounters(), VersionedIndex)).second);
+    if (TiersInitialized) {
+        auto it = Tables.find(pathId);
+        AFL_VERIFY(it != Tables.end());
+        it->second->StartActualizationIndex();
+    }
 }
 
 } // namespace NKikimr::NOlap

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

@@ -387,6 +387,10 @@ const TString& TPortionInfo::GetColumnStorageId(const ui32 columnId, const TInde
     return indexInfo.GetColumnStorageId(columnId, GetMeta().GetTierName());
 }
 
+const TString& TPortionInfo::GetEntityStorageId(const ui32 columnId, const TIndexInfo& indexInfo) const {
+    return indexInfo.GetEntityStorageId(columnId, GetMeta().GetTierName());
+}
+
 void TPortionInfo::FillBlobRangesByStorage(THashMap<TString, THashSet<TBlobRange>>& result, const TIndexInfo& indexInfo) const {
     for (auto&& i : Records) {
         const TString& storageId = GetColumnStorageId(i.GetColumnId(), indexInfo);

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

@@ -83,6 +83,7 @@ class TPortionInfo {
     }
 
     const TString& GetColumnStorageId(const ui32 columnId, const TIndexInfo& indexInfo) const;
+    const TString& GetEntityStorageId(const ui32 entityId, const TIndexInfo& indexInfo) const;
 
     ui64 GetTxVolume() const; // fake-correct method for determ volume on rewrite this portion in transaction progress
 
@@ -235,6 +236,34 @@ class TPortionInfo {
         return nullptr;
     }
 
+    std::optional<TEntityChunk> GetEntityRecord(const TChunkAddress& address) const {
+        for (auto&& c : GetRecords()) {
+            if (c.GetAddress() == address) {
+                return TEntityChunk(c.GetAddress(), c.GetMeta().GetNumRowsVerified(), c.GetMeta().GetRawBytesVerified(), c.GetBlobRange());
+            }
+        }
+        for (auto&& c : GetIndexes()) {
+            if (c.GetAddress() == address) {
+                return TEntityChunk(c.GetAddress(), c.GetRecordsCount(), c.GetRawBytes(), c.GetBlobRange());
+            }
+        }
+        return {};
+    }
+
+    bool HasEntityAddress(const TChunkAddress& address) const {
+        for (auto&& c : GetRecords()) {
+            if (c.GetAddress() == address) {
+                return true;
+            }
+        }
+        for (auto&& c : GetIndexes()) {
+            if (c.GetAddress() == address) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     bool Empty() const { return Records.empty(); }
     bool Produced() const { return Meta.GetProduced() != TPortionMeta::EProduced::UNSPECIFIED; }
     bool Valid() const { return MinSnapshot.Valid() && PathId && Portion && !Empty() && Produced() && Meta.IndexKeyStart && Meta.IndexKeyEnd; }

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

@@ -11,7 +11,7 @@ void TPortionInfoWithBlobs::TBlobInfo::RestoreChunk(const TPortionInfoWithBlobs&
     const TString& data = chunk->GetData();
     Size += data.size();
     auto address = chunk->GetChunkAddress();
-    AFL_VERIFY(owner.GetPortionInfo().GetRecordPointer(address))("address", address.DebugString());
+    AFL_VERIFY(owner.GetPortionInfo().HasEntityAddress(address))("address", address.DebugString());
     AFL_VERIFY(Chunks.emplace(address, chunk).second)("address", address.DebugString());
     ChunksOrdered.emplace_back(chunk);
 }
@@ -90,7 +90,7 @@ NKikimr::NOlap::TPortionInfoWithBlobs TPortionInfoWithBlobs::RestorePortion(cons
         for (auto&& i : recordsByBlob) {
             auto builder = result.StartBlob(storage);
             for (auto&& d : i.second) {
-                auto blobData = blobs.Extract(portion.GetColumnStorageId(d.GetAddress().GetEntityId(), indexInfo), portion.RestoreBlobRange(d.GetBlobRange()));
+                auto blobData = blobs.Extract(portion.GetEntityStorageId(d.GetAddress().GetEntityId(), indexInfo), portion.RestoreBlobRange(d.GetBlobRange()));
                 builder.RestoreChunk(std::make_shared<NIndexes::TPortionIndexChunk>(d.GetAddress(), d.GetRecordsCount(), d.GetRawBytes(), std::move(blobData)));
             }
         }