fix

ydb-platform · Dec 17, 2024 · fe1cc5a · fe1cc5a
1 parent 0533380
commit fe1cc5a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/ydb/core/tx/columnshard/columnshard_impl.cpp b/ydb/core/tx/columnshard/columnshard_impl.cpp
@@ -355,13 +355,15 @@ void TColumnShard::RunInit(const NKikimrTxColumnShard::TInitShard& proto, const
 
     NIceDb::TNiceDb db(txc.DB);
 
-    AFL_VERIFY(proto.HasOwnerPathId());
-    OwnerPathId = proto.GetOwnerPathId();
-    Schema::SaveSpecialValue(db, Schema::EValueIds::OwnerPathId, OwnerPathId);
+    if (proto.HasOwnerPathId()) {
+        OwnerPathId = proto.GetOwnerPathId();
+        Schema::SaveSpecialValue(db, Schema::EValueIds::OwnerPathId, OwnerPathId);
+    }
 
-    AFL_VERIFY(proto.HasOwnerPathId());
-    OwnerPath = proto.GetOwnerPath();
-    Schema::SaveSpecialValue(db, Schema::EValueIds::OwnerPath, OwnerPath);
+    if (proto.HasOwnerPath()) {
+        OwnerPath = proto.GetOwnerPath();
+        Schema::SaveSpecialValue(db, Schema::EValueIds::OwnerPath, OwnerPath);
+    }
 
     for (auto& createTable : proto.GetTables()) {
         RunEnsureTable(createTable, version, txc);

diff --git a/ydb/core/tx/columnshard/engines/scheme/objects_cache.cpp b/ydb/core/tx/columnshard/engines/scheme/objects_cache.cpp
@@ -8,10 +8,15 @@ std::shared_ptr<const TIndexInfo> TSchemaObjectsCache::GetIndexInfoCache(TIndexI
     const ui64 schemaVersion = indexInfo.GetVersion();
     std::unique_lock lock(SchemasMutex);
     auto* findSchema = SchemasByVersion.FindPtr(schemaVersion);
-    if (!findSchema || findSchema->expired()) {
-        SchemasByVersion[schemaVersion] = std::make_shared<TIndexInfo>(std::move(indexInfo));
+    std::shared_ptr<const TIndexInfo> cachedSchema;
+    if (findSchema) {
+        cachedSchema = findSchema->lock();
     }
-    return findSchema->lock();
+    if (!cachedSchema) {
+        cachedSchema = std::make_shared<TIndexInfo>(std::move(indexInfo));
+        SchemasByVersion[schemaVersion] = cachedSchema;
+    }
+    return cachedSchema;
 }
 
 }   // namespace NKikimr::NOlap