Merge c27620d into a1b2d93

ydb-platform · Oct 30, 2024 · 55fad61 · 55fad61
2 parents a1b2d93 + c27620d
commit 55fad61
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ydb/core/tx/columnshard/engines/scheme/index_info.cpp b/ydb/core/tx/columnshard/engines/scheme/index_info.cpp
@@ -282,6 +282,7 @@ bool TIndexInfo::DeserializeFromProto(const NKikimrSchemeOp::TColumnTableSchema&
     }
 
     Version = schema.GetVersion();
+    Precalculate();
     Validate();
     return true;
 }
@@ -550,10 +551,19 @@ TIndexInfo::TIndexInfo(const TIndexInfo& original, const TSchemaDiffView& diff,
     if (diff.GetCompressionOptions()) {
         DeserializeDefaultCompressionFromProto(*diff.GetCompressionOptions());
     }
+    Precalculate();
     Validate();
 }
 
+void TIndexInfo::Precalculate() {
+    UsedStorageIds = std::make_shared<std::set<TString>>();
+    for (auto&& i : ColumnFeatures) {
+        UsedStorageIds->emplace(i->GetOperator()->GetStorageId());
+    }
+}
+
 void TIndexInfo::Validate() const {
+    AFL_VERIFY(!!UsedStorageIds);
     AFL_VERIFY(ColumnFeatures.size() == SchemaColumnIdsWithSpecials.size());
     AFL_VERIFY(ColumnFeatures.size() == (ui32)SchemaWithSpecials->num_fields());
     AFL_VERIFY(ColumnFeatures.size() == (ui32)Schema->num_fields() + IIndexInfo::SpecialColumnsCount);

diff --git a/ydb/core/tx/columnshard/engines/scheme/index_info.h b/ydb/core/tx/columnshard/engines/scheme/index_info.h
@@ -98,6 +98,7 @@ struct TIndexInfo: public IIndexInfo {
 
     std::vector<std::shared_ptr<TColumnFeatures>> ColumnFeatures;
     THashMap<ui32, NIndexes::TIndexMetaContainer> Indexes;
+    std::shared_ptr<std::set<TString>> UsedStorageIds;
 
     bool SchemeNeedActualization = false;
     std::shared_ptr<NStorageOptimizer::IOptimizerPlannerConstructor> CompactionPlannerConstructor;
@@ -149,6 +150,7 @@ struct TIndexInfo: public IIndexInfo {
         const std::shared_ptr<TSchemaObjectsCache>& cache) const;
 
     void Validate() const;
+    void Precalculate();
 
     bool DeserializeFromProto(const NKikimrSchemeOp::TColumnTableSchema& schema, const std::shared_ptr<IStoragesManager>& operators,
         const std::shared_ptr<TSchemaObjectsCache>& cache);
@@ -228,15 +230,11 @@ struct TIndexInfo: public IIndexInfo {
     }
 
     std::set<TString> GetUsedStorageIds(const TString& portionTierName) const {
-        std::set<TString> result;
         if (portionTierName && portionTierName != IStoragesManager::DefaultStorageId) {
-            result.emplace(portionTierName);
+            return { portionTierName };
         } else {
-            for (auto&& i : ColumnFeatures) {
-                result.emplace(i->GetOperator()->GetStorageId());
-            }
+            return *UsedStorageIds;
         }
-        return result;
     }
 
     const THashMap<ui32, NIndexes::TIndexMetaContainer>& GetIndexes() const {