schema inheritance from store to new tables (#15000)

ivanmorozov333 · web-flow · commit 735715d6b6c5 · 2025-02-26T14:25:04.000+03:00
diff --git a/ydb/core/kqp/ut/olap/indexes_ut.cpp b/ydb/core/kqp/ut/olap/indexes_ut.cpp
@@ -14,6 +14,43 @@
 namespace NKikimr::NKqp {
 
 Y_UNIT_TEST_SUITE(KqpOlapIndexes) {
+    Y_UNIT_TEST(TablesInStore) {
+        auto settings = TKikimrSettings().SetWithSampleTables(false);
+        TKikimrRunner kikimr(settings);
+
+        TLocalHelper(kikimr).CreateTestOlapTable();
+
+        auto tableClient = kikimr.GetTableClient();
+        {
+            auto alterQuery =
+                R"(ALTER OBJECT `/Root/olapStore` (TYPE TABLESTORE) SET (ACTION=UPSERT_INDEX, NAME=index_ngramm_uid, TYPE=BLOOM_NGRAMM_FILTER,
+                    FEATURES=`{"column_name" : "resource_id", "ngramm_size" : 3, "hashes_count" : 2, "filter_size_bytes" : 512, "records_count" : 1024}`);
+                )";
+            auto session = tableClient.CreateSession().GetValueSync().GetSession();
+            auto alterResult = session.ExecuteSchemeQuery(alterQuery).GetValueSync();
+            UNIT_ASSERT_VALUES_EQUAL_C(alterResult.GetStatus(), NYdb::EStatus::SUCCESS, alterResult.GetIssues().ToString());
+        }
+        {
+            auto session = tableClient.CreateSession().GetValueSync().GetSession();
+
+            auto query = TStringBuilder() << R"(
+            --!syntax_v1
+            CREATE TABLE `/Root/olapStore/olapTableTest`
+            (
+                timestamp Timestamp NOT NULL,
+                resource_id Utf8,
+                uid Utf8 NOT NULL,
+                level Int32,
+                message Utf8,
+                PRIMARY KEY (timestamp, uid)
+            )
+            PARTITION BY HASH(timestamp, uid)
+            WITH (STORE = COLUMN, PARTITION_COUNT = 1))";
+            auto result = session.ExecuteSchemeQuery(query).GetValueSync();
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
+        }
+    }
+
     Y_UNIT_TEST(IndexesActualization) {
         auto settings = TKikimrSettings().SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
diff --git a/ydb/core/tx/schemeshard/olap/column_families/schema.cpp b/ydb/core/tx/schemeshard/olap/column_families/schema.cpp
@@ -87,7 +87,7 @@ void TOlapColumnFamiliesDescription::Serialize(NKikimrSchemeOp::TColumnTableSche
     }
 }
 
-bool TOlapColumnFamiliesDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
+bool TOlapColumnFamiliesDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
     ui32 lastColumnFamilyId = 0;
     THashSet<ui32> usedColumnFamilies;
     for (const auto& familyProto : opSchema.GetColumnFamilies()) {
diff --git a/ydb/core/tx/schemeshard/olap/column_families/schema.h b/ydb/core/tx/schemeshard/olap/column_families/schema.h
@@ -39,6 +39,6 @@ class TOlapColumnFamiliesDescription {
 
     bool Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);
     void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;
-    bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
+    bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
 };
 }
diff --git a/ydb/core/tx/schemeshard/olap/columns/schema.cpp b/ydb/core/tx/schemeshard/olap/columns/schema.cpp
@@ -165,7 +165,7 @@ void TOlapColumnsDescription::Serialize(NKikimrSchemeOp::TColumnTableSchema& tab
     }
 }
 
-bool TOlapColumnsDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
+bool TOlapColumnsDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
     const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry;
 
     ui32 lastColumnId = 0;
diff --git a/ydb/core/tx/schemeshard/olap/columns/schema.h b/ydb/core/tx/schemeshard/olap/columns/schema.h
@@ -58,6 +58,6 @@ class TOlapColumnsDescription {
 
     void Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);
     void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;
-    bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
+    bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
 };
 }
diff --git a/ydb/core/tx/schemeshard/olap/indexes/schema.cpp b/ydb/core/tx/schemeshard/olap/indexes/schema.cpp
@@ -83,7 +83,10 @@ void TOlapIndexesDescription::Serialize(NKikimrSchemeOp::TColumnTableSchema& tab
     }
 }
 
-bool TOlapIndexesDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
+bool TOlapIndexesDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
+    if (opSchema.GetIndexes().size() == 0) {
+        return true;
+    }
     THashSet<ui32> usedIndexes;
     ui32 lastIdx = 0;
     for (const auto& proto : opSchema.GetIndexes()) {
diff --git a/ydb/core/tx/schemeshard/olap/indexes/schema.h b/ydb/core/tx/schemeshard/olap/indexes/schema.h
@@ -77,6 +77,6 @@ class TOlapIndexesDescription {
 
     void Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);
     void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;
-    bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
+    bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
 };
 }
diff --git a/ydb/core/tx/schemeshard/olap/operations/create_table.cpp b/ydb/core/tx/schemeshard/olap/operations/create_table.cpp
@@ -99,7 +99,7 @@ class TTableConstructorBase {
 
 class TOlapPresetConstructor : public TTableConstructorBase {
     ui32 PresetId = 0;
-    TString PresetName = "default";
+    TString PresetName = TOlapStoreInfo::DefaultPresetName;
     const TOlapStoreInfo& StoreInfo;
     mutable bool NeedUpdateObject = false;
 public:
@@ -118,27 +118,16 @@ class TOlapPresetConstructor : public TTableConstructorBase {
             return false;
         }
 
-        if (description.HasSchemaPresetId()) {
-            PresetId = description.GetSchemaPresetId();
-            if (!StoreInfo.SchemaPresets.contains(PresetId)) {
-                errors.AddError(Sprintf("Specified schema preset %" PRIu32 " does not exist in tablestore", PresetId));
-                return false;
-            }
-            PresetName = StoreInfo.SchemaPresets.at(PresetId).GetName();
-        } else {
-            if (description.HasSchemaPresetName()) {
-                PresetName = description.GetSchemaPresetName();
-            }
-            if (!StoreInfo.SchemaPresetByName.contains(PresetName)) {
-                errors.AddError(Sprintf("Specified schema preset '%s' does not exist in tablestore", PresetName.c_str()));
-                return false;
-            }
-            PresetId = StoreInfo.SchemaPresetByName.at(PresetName);
-            Y_ABORT_UNLESS(StoreInfo.SchemaPresets.contains(PresetId));
+        auto* preset = StoreInfo.GetPresetOptional(description);
+        if (!preset) {
+            errors.AddError("preset not found in tables store");
+            return false;
         }
+        PresetId = preset->GetId();
+        PresetName = preset->GetName();
 
         if (description.HasSchema()) {
-            if (!GetSchema().Validate(description.GetSchema(), errors)) {
+            if (!GetSchema().ValidateForStore(description.GetSchema(), errors)) {
                 return false;
             }
         }
diff --git a/ydb/core/tx/schemeshard/olap/options/schema.cpp b/ydb/core/tx/schemeshard/olap/options/schema.cpp
@@ -42,7 +42,10 @@ void TOlapOptionsDescription::Serialize(NKikimrSchemeOp::TColumnTableSchema& tab
     }
 }
 
-bool TOlapOptionsDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& /*opSchema*/, IErrorCollector& /*errors*/) const {
+bool TOlapOptionsDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& /*errors*/) const {
+    if (!opSchema.HasOptions()) {
+        return true;
+    }
     return true;
 }
 
diff --git a/ydb/core/tx/schemeshard/olap/options/schema.h b/ydb/core/tx/schemeshard/olap/options/schema.h
@@ -16,6 +16,6 @@ class TOlapOptionsDescription {
 
     void Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);
     void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;
-    bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
+    bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
 };
 }
diff --git a/ydb/core/tx/schemeshard/olap/schema/schema.cpp b/ydb/core/tx/schemeshard/olap/schema/schema.cpp
@@ -71,16 +71,20 @@ void TOlapSchema::Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchemaExt)
     std::swap(resultLocal, tableSchemaExt);
 }
 
-bool TOlapSchema::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
-    if (!Columns.Validate(opSchema, errors)) {
+bool TOlapSchema::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {
+    if (!Columns.ValidateForStore(opSchema, errors)) {
         return false;
     }
 
-    if (!Indexes.Validate(opSchema, errors)) {
+    if (!Indexes.ValidateForStore(opSchema, errors)) {
         return false;
     }
 
-    if (!Options.Validate(opSchema, errors)) {
+    if (!Options.ValidateForStore(opSchema, errors)) {
+        return false;
+    }
+
+    if (!ColumnFamilies.ValidateForStore(opSchema, errors)) {
         return false;
     }
     return true;
diff --git a/ydb/core/tx/schemeshard/olap/schema/schema.h b/ydb/core/tx/schemeshard/olap/schema/schema.h
@@ -30,7 +30,7 @@ namespace NKikimr::NSchemeShard {
 
         void ParseFromLocalDB(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);
         void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;
-        bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
+        bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;
         bool ValidateTtlSettings(const NKikimrSchemeOp::TColumnDataLifeCycle& ttlSettings, const TOperationContext& context, IErrorCollector& errors) const;
     };
 
diff --git a/ydb/core/tx/schemeshard/olap/store/store.h b/ydb/core/tx/schemeshard/olap/store/store.h
@@ -17,6 +17,8 @@ struct TOlapStoreInfo {
     NKikimrSchemeOp::TColumnStoreDescription Description;
     ui64 AlterVersion = 0;
 public:
+    static const inline TString DefaultPresetName = "default";
+
     using TPtr = std::shared_ptr<TOlapStoreInfo>;
 
     class TLayoutInfo {
@@ -99,6 +101,41 @@ struct TOlapStoreInfo {
             shardInfoProto->SetLocalId(idx.GetLocalId().GetValue());
         }
     }
+
+    const TOlapStoreSchemaPreset* GetPresetOptional(const ui32 presetId) const {
+        auto it = SchemaPresets.find(presetId);
+        if (it == SchemaPresets.end()) {
+            return nullptr;
+        }
+        return &it->second;
+    }
+
+    const TOlapStoreSchemaPreset& GetPresetVerified(const ui32 presetId) const {
+        auto* result = GetPresetOptional(presetId);
+        AFL_VERIFY(result);
+        return *result;
+    }
+
+    const TOlapStoreSchemaPreset* GetPresetOptional(const TString& presetName) const {
+        auto it = SchemaPresetByName.find(presetName);
+        if (it == SchemaPresetByName.end()) {
+            return nullptr;
+        }
+        return &GetPresetVerified(it->second);
+    }
+
+    const TOlapStoreSchemaPreset* GetPresetOptional(const NKikimrSchemeOp::TColumnTableDescription& description) const {
+        if (description.HasSchemaPresetId()) {
+            return GetPresetOptional(description.GetSchemaPresetId());
+        } else {
+            if (description.HasSchemaPresetName()) {
+                return GetPresetOptional(description.GetSchemaPresetName());
+            } else {
+                return GetPresetOptional(DefaultPresetName);
+            }
+        }
+    }
+
     void SerializeDescription(NKikimrSchemeOp::TColumnStoreDescription& descriptionProto) const;
     void ParseFromLocalDB(const NKikimrSchemeOp::TColumnStoreDescription& descriptionProto);
     bool ParseFromRequest(const NKikimrSchemeOp::TColumnStoreDescription& descriptionProto, IErrorCollector& errors);

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void TOlapColumnFamiliesDescription::Serialize(NKikimrSchemeOp::TColumnTableSche`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-bool TOlapColumnFamiliesDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
	`90`	`+bool TOlapColumnFamiliesDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
`91`	`91`	`ui32 lastColumnFamilyId = 0;`
`92`	`92`	`THashSet<ui32> usedColumnFamilies;`
`93`	`93`	`for (const auto& familyProto : opSchema.GetColumnFamilies()) {`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ class TOlapColumnFamiliesDescription {`
`39`	`39`
`40`	`40`	`bool Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);`
`41`	`41`	`void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;`
`42`		`- bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
	`42`	`+ bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
`43`	`43`	`};`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ void TOlapColumnsDescription::Serialize(NKikimrSchemeOp::TColumnTableSchema& tab`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`-bool TOlapColumnsDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
	`168`	`+bool TOlapColumnsDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
`169`	`169`	`const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry;`
`170`	`170`
`171`	`171`	`ui32 lastColumnId = 0;`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,6 @@ class TOlapColumnsDescription {`
`58`	`58`
`59`	`59`	`void Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);`
`60`	`60`	`void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;`
`61`		`- bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
	`61`	`+ bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
`62`	`62`	`};`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,10 @@ void TOlapIndexesDescription::Serialize(NKikimrSchemeOp::TColumnTableSchema& tab`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`-bool TOlapIndexesDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
	`86`	`+bool TOlapIndexesDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
	`87`	`+ if (opSchema.GetIndexes().size() == 0) {`
	`88`	`+ return true;`
	`89`	`+ }`
`87`	`90`	`THashSet<ui32> usedIndexes;`
`88`	`91`	`ui32 lastIdx = 0;`
`89`	`92`	`for (const auto& proto : opSchema.GetIndexes()) {`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,6 @@ class TOlapIndexesDescription {`
`77`	`77`
`78`	`78`	`void Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);`
`79`	`79`	`void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;`
`80`		`- bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
	`80`	`+ bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
`81`	`81`	`};`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ void TOlapOptionsDescription::Serialize(NKikimrSchemeOp::TColumnTableSchema& tab`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-bool TOlapOptionsDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema& /opSchema/, IErrorCollector& /errors/) const {`
	`45`	`+bool TOlapOptionsDescription::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& /errors/) const {`
	`46`	`+ if (!opSchema.HasOptions()) {`
	`47`	`+ return true;`
	`48`	`+ }`
`46`	`49`	`return true;`
`47`	`50`	`}`
`48`	`51`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ class TOlapOptionsDescription {`
`16`	`16`
`17`	`17`	`void Parse(const NKikimrSchemeOp::TColumnTableSchema& tableSchema);`
`18`	`18`	`void Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchema) const;`
`19`		`- bool Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
	`19`	`+ bool ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const;`
`20`	`20`	`};`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,16 +71,20 @@ void TOlapSchema::Serialize(NKikimrSchemeOp::TColumnTableSchema& tableSchemaExt)`
`71`	`71`	`std::swap(resultLocal, tableSchemaExt);`
`72`	`72`	`}`
`73`	`73`
`74`		`-bool TOlapSchema::Validate(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
`75`		`- if (!Columns.Validate(opSchema, errors)) {`
	`74`	`+bool TOlapSchema::ValidateForStore(const NKikimrSchemeOp::TColumnTableSchema& opSchema, IErrorCollector& errors) const {`
	`75`	`+ if (!Columns.ValidateForStore(opSchema, errors)) {`
`76`	`76`	`return false;`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (!Indexes.Validate(opSchema, errors)) {`
	`79`	`+ if (!Indexes.ValidateForStore(opSchema, errors)) {`
`80`	`80`	`return false;`
`81`	`81`	`}`
`82`	`82`
`83`		`- if (!Options.Validate(opSchema, errors)) {`
	`83`	`+ if (!Options.ValidateForStore(opSchema, errors)) {`
	`84`	`+ return false;`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ if (!ColumnFamilies.ValidateForStore(opSchema, errors)) {`
`84`	`88`	`return false;`
`85`	`89`	`}`
`86`	`90`	`return true;`