almost ready message to SchemeShard

Author: jepett0

ydb/core/ydb_convert/table_description.cpp

@@ -280,6 +280,25 @@ bool BuildAlterTableModifyScheme(const Ydb::Table::AlterTableRequest* req, NKiki
         }
     }
 
+    // TO DO: redo to if, because it the fields are not repeated, for is meaningless, it just overwrites what's been written
+    for (const auto& alterIndex : req->alter_indexes()) {
+        modifyScheme->SetOperationType(NKikimrSchemeOp::EOperationType::ESchemeOpAlterTable);
+        modifyScheme->SetWorkingDir(workingDir + "/" + name + "/" + alterIndex.name());
+        auto* desc = modifyScheme->MutableAlterTable();
+        desc->SetName("indexImplTable");
+        if (!FillPartitioningPolicy(
+                [&desc]() {
+                    return desc->MutablePartitionConfig()->MutablePartitioningPolicy();
+                },
+                alterIndex.partitioning_settings(),
+                code,
+                error
+            )
+        ) {
+            return false;
+        }
+    }
+
     for (const auto& drop : req->drop_indexes()) {
         modifyScheme->SetOperationType(NKikimrSchemeOp::EOperationType::ESchemeOpDropIndex);
         auto desc = modifyScheme->MutableDropIndex();

ydb/core/ydb_convert/table_settings.cpp

@@ -215,98 +215,110 @@ bool FillCreateTableSettingsDesc(NKikimrSchemeOp::TTableDescription& tableDesc,
     return true;
 }
 
-bool FillAlterTableSettingsDesc(NKikimrSchemeOp::TTableDescription& tableDesc,
-    const Ydb::Table::AlterTableRequest& proto,
-    Ydb::StatusIds::StatusCode& code, TString& error, bool changed)
-{
-    bool hadPartitionConfig = tableDesc.HasPartitionConfig();
-    auto &partitionConfig = *tableDesc.MutablePartitionConfig();
-
-    if (proto.has_alter_partitioning_settings()) {
-        auto& alterSettings = proto.alter_partitioning_settings();
-
-        switch (alterSettings.partitioning_by_size()) {
-        case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
-            if (alterSettings.partition_size_mb()) {
-                auto &policy = *partitionConfig.MutablePartitioningPolicy();
-                policy.SetSizeToSplit((1 << 20) * alterSettings.partition_size_mb());
-                changed = true;
-            }
-            break;
-        case Ydb::FeatureFlag::ENABLED:
-        {
-            auto &policy = *partitionConfig.MutablePartitioningPolicy();
-            if (alterSettings.partition_size_mb()) {
-                policy.SetSizeToSplit((1 << 20) * alterSettings.partition_size_mb());
-            } else {
-                policy.SetSizeToSplit(defaultSizeToSplit);
-            }
-            if (!alterSettings.min_partitions_count()) {
-                policy.SetMinPartitionsCount(defaultMinPartitions);
-            }
-            changed = true;
-            break;
-        }
-        case Ydb::FeatureFlag::DISABLED:
-        {
-            if (alterSettings.partition_size_mb()) {
-                code = Ydb::StatusIds::BAD_REQUEST;
-                error = TStringBuilder() << "Auto partitioning partition size is set while "
-                    "auto partitioning by size is disabled";
-                return false;
-            }
-            auto &policy = *partitionConfig.MutablePartitioningPolicy();
-            policy.SetSizeToSplit(0);
-            changed = true;
-            break;
+bool FillPartitioningPolicy(
+    // TO DO: rename from Getter to GetOrCreate
+    std::function<NKikimrSchemeOp::TPartitioningPolicy*()>&& partitioningPolicyGetter,
+    const Ydb::Table::PartitioningSettings& alterSettings,
+    Ydb::StatusIds::StatusCode& code,
+    TString& error
+) {
+    switch (alterSettings.partitioning_by_size()) {
+    case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
+        if (alterSettings.partition_size_mb()) {
+            partitioningPolicyGetter()->SetSizeToSplit((1 << 20) * alterSettings.partition_size_mb());
         }
-        default:
-            code = Ydb::StatusIds::BAD_REQUEST;
-            error = TStringBuilder() << "Unknown auto partitioning by size feature flag status: '"
-                << (ui32)alterSettings.partitioning_by_size() << "'";
-            return false;
+        break;
+    case Ydb::FeatureFlag::ENABLED:
+    {
+        auto* policy = partitioningPolicyGetter();
+        if (alterSettings.partition_size_mb()) {
+            policy->SetSizeToSplit((1 << 20) * alterSettings.partition_size_mb());
+        } else {
+            policy->SetSizeToSplit(defaultSizeToSplit);
         }
 
-        switch (alterSettings.partitioning_by_load()) {
-        case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
-        {
-            changed = true;
-            break;
-        }
-        case Ydb::FeatureFlag::ENABLED:
-        {
-            auto &policy = *partitionConfig.MutablePartitioningPolicy();
-            policy.MutableSplitByLoadSettings()->SetEnabled(true);
-            if (!alterSettings.min_partitions_count()) {
-                policy.SetMinPartitionsCount(defaultMinPartitions);
-            }
-            changed = true;
-            break;
-        }
-        case Ydb::FeatureFlag::DISABLED:
-        {
-            auto &policy = *partitionConfig.MutablePartitioningPolicy();
-            policy.MutableSplitByLoadSettings()->SetEnabled(false);
-            changed = true;
-            break;
+        if (!alterSettings.min_partitions_count()) {
+            policy->SetMinPartitionsCount(defaultMinPartitions);
         }
-        default:
+        break;
+    }
+    case Ydb::FeatureFlag::DISABLED:
+    {
+        if (alterSettings.partition_size_mb()) {
             code = Ydb::StatusIds::BAD_REQUEST;
-            error = TStringBuilder() << "Unknown auto partitioning by load feature flag status: '"
-                << (ui32)alterSettings.partitioning_by_load() << "'";
+            error = TStringBuilder() << "Auto partitioning partition size is set while "
+                                        "auto partitioning by size is disabled";
             return false;
         }
+        partitioningPolicyGetter()->SetSizeToSplit(0);
+        break;
+    }
+    default:
+        code = Ydb::StatusIds::BAD_REQUEST;
+        error = TStringBuilder() << "Unknown auto partitioning by size feature flag status: '"
+                                 << (ui32)alterSettings.partitioning_by_size() << "'";
+        return false;
+    }
 
-        if (alterSettings.min_partitions_count()) {
-            auto &policy = *partitionConfig.MutablePartitioningPolicy();
-            policy.SetMinPartitionsCount(alterSettings.min_partitions_count());
-            changed = true;
+    switch (alterSettings.partitioning_by_load()) {
+    case Ydb::FeatureFlag::STATUS_UNSPECIFIED:
+    {
+        // allocates the protobuf
+        partitioningPolicyGetter();
+        break;
+    }
+    case Ydb::FeatureFlag::ENABLED:
+    {
+        auto* policy = partitioningPolicyGetter();
+        policy->MutableSplitByLoadSettings()->SetEnabled(true);
+        if (!alterSettings.min_partitions_count()) {
+            policy->SetMinPartitionsCount(defaultMinPartitions);
         }
+        break;
+    }
+    case Ydb::FeatureFlag::DISABLED:
+    {
+        partitioningPolicyGetter()->MutableSplitByLoadSettings()->SetEnabled(false);
+        break;
+    }
+    default:
+        code = Ydb::StatusIds::BAD_REQUEST;
+        error = TStringBuilder() << "Unknown auto partitioning by load feature flag status: '"
+                                 << (ui32)alterSettings.partitioning_by_load() << "'";
+        return false;
+    }
 
-        if (alterSettings.max_partitions_count()) {
-            auto &policy = *partitionConfig.MutablePartitioningPolicy();
-            policy.SetMaxPartitionsCount(alterSettings.max_partitions_count());
-            changed = true;
+    if (alterSettings.min_partitions_count()) {
+        partitioningPolicyGetter()->SetMinPartitionsCount(alterSettings.min_partitions_count());
+    }
+
+    if (alterSettings.max_partitions_count()) {
+        partitioningPolicyGetter()->SetMaxPartitionsCount(alterSettings.max_partitions_count());
+    }
+
+    return true;
+}
+
+bool FillAlterTableSettingsDesc(NKikimrSchemeOp::TTableDescription& tableDesc,
+    const Ydb::Table::AlterTableRequest& proto,
+    Ydb::StatusIds::StatusCode& code, TString& error, bool changed)
+{
+    bool hadPartitionConfig = tableDesc.HasPartitionConfig();
+    auto &partitionConfig = *tableDesc.MutablePartitionConfig();
+
+    if (proto.has_alter_partitioning_settings()) {
+        if (!FillPartitioningPolicy(
+                [&partitionConfig, &changed]() {
+                    // changed at least because the partitioning policy is allocated
+                    changed = true;
+                    return partitionConfig.MutablePartitioningPolicy();
+                },
+                proto.alter_partitioning_settings(),
+                code,
+                error
+            )
+        ) {
+            return false;
         }
     }
 

ydb/core/ydb_convert/table_settings.h

@@ -14,6 +14,12 @@ bool FillCreateTableSettingsDesc(NKikimrSchemeOp::TTableDescription& out,
     const Ydb::Table::CreateTableRequest& in,
     Ydb::StatusIds::StatusCode& code, TString& error, TList<TString>& warnings, bool tableProfileSet);
 
+bool FillPartitioningPolicy(
+    std::function<NKikimrSchemeOp::TPartitioningPolicy*()>&& partitioningPolicyGetter,
+    const Ydb::Table::PartitioningSettings& alterSettings,
+    Ydb::StatusIds::StatusCode& code,
+    TString& error);
+
 bool FillAlterTableSettingsDesc(NKikimrSchemeOp::TTableDescription& out,
     const Ydb::Table::AlterTableRequest& in,
     Ydb::StatusIds::StatusCode& code, TString& error, bool changed);