Merge 4365df4 into 7b9c7e3

Author: swalrus1

ydb/core/protos/flat_scheme_op.proto

@@ -221,11 +221,17 @@ message TTTLSettings {
         optional uint32 MaxShardsInFlight = 6 [default = 0]; // zero means no limit
     }
 
+    message TTier {
+        optional uint32 EvictAfterSeconds = 1;
+        optional string StorageName = 2;
+    }
+
     message TEnabled {
         optional string ColumnName = 1;
         optional uint32 ExpireAfterSeconds = 2;
         optional EUnit ColumnUnit = 3;
         optional TSysSettings SysSettings = 4;
+        repeated TTier Tiers = 5;
     }
 
     message TDisabled {
@@ -555,6 +561,7 @@ message TColumnDataLifeCycle {
             uint64 ExpireAfterBytes = 4;
         }
         optional TTTLSettings.EUnit ColumnUnit = 3;
+        repeated TTTLSettings.TTier Tiers = 5;
     }
 
     message TDisabled {

ydb/core/ydb_convert/table_description.cpp

@@ -48,8 +48,6 @@ THashSet<EAlterOperationKind> GetAlterOperationKinds(const Ydb::Table::AlterTabl
         req->alter_columns_size() ||
         req->ttl_action_case() !=
             Ydb::Table::AlterTableRequest::TTL_ACTION_NOT_SET ||
-        req->tiering_action_case() !=
-            Ydb::Table::AlterTableRequest::TIERING_ACTION_NOT_SET ||
         req->has_alter_storage_settings() || req->add_column_families_size() ||
         req->alter_column_families_size() || req->set_compaction_policy() ||
         req->has_alter_partitioning_settings() ||
@@ -509,11 +507,22 @@ Ydb::Type* AddColumn<NKikimrSchemeOp::TColumnDescription>(Ydb::Table::ColumnMeta
 
 template <typename TYdbProto, typename TTtl>
 static void AddTtl(TYdbProto& out, const TTtl& inTTL) {
+    static const auto& fillCommonFields = []<class TModeSettings>(TModeSettings& out, const TTtl& in) {
+        out.set_column_name(in.GetColumnName());
+        if (in.HasExpireAfterSeconds()) {
+            out.set_expire_after_seconds(in.GetExpireAfterSeconds());
+        }
+        for (const auto& in_tier : in.GetTiers()) {
+            auto* out_tier = out.add_storage_tiers();
+            out_tier->set_evict_after_seconds(in_tier.GetEvictAfterSeconds());
+            out_tier->set_storage_name(in_tier.GetStorageName());
+        }
+    };
+
     switch (inTTL.GetColumnUnit()) {
     case NKikimrSchemeOp::TTTLSettings::UNIT_AUTO: {
         auto& outTTL = *out.mutable_ttl_settings()->mutable_date_type_column();
-        outTTL.set_column_name(inTTL.GetColumnName());
-        outTTL.set_expire_after_seconds(inTTL.GetExpireAfterSeconds());
+        fillCommonFields(outTTL, inTTL);
         break;
     }
 
@@ -522,9 +531,8 @@ static void AddTtl(TYdbProto& out, const TTtl& inTTL) {
     case NKikimrSchemeOp::TTTLSettings::UNIT_MICROSECONDS:
     case NKikimrSchemeOp::TTTLSettings::UNIT_NANOSECONDS: {
         auto& outTTL = *out.mutable_ttl_settings()->mutable_value_since_unix_epoch();
-        outTTL.set_column_name(inTTL.GetColumnName());
+        fillCommonFields(outTTL, inTTL);
         outTTL.set_column_unit(static_cast<Ydb::Table::ValueSinceUnixEpochModeSettings::Unit>(inTTL.GetColumnUnit()));
-        outTTL.set_expire_after_seconds(inTTL.GetExpireAfterSeconds());
         break;
     }
 
@@ -572,10 +580,6 @@ void FillColumnDescriptionImpl(TYdbProto& out,
         if (in.GetTTLSettings().HasEnabled()) {
             AddTtl(out, in.GetTTLSettings().GetEnabled());
         }
-
-        if (in.GetTTLSettings().HasUseTiering()) {
-            out.set_tiering(in.GetTTLSettings().GetUseTiering());
-        }
     }
 }
 
@@ -612,10 +616,6 @@ void FillColumnDescription(Ydb::Table::DescribeTableResult& out, const NKikimrSc
         if (in.GetTtlSettings().HasEnabled()) {
             AddTtl(out, in.GetTtlSettings().GetEnabled());
         }
-
-        if (in.GetTtlSettings().HasUseTiering()) {
-            out.set_tiering(in.GetTtlSettings().GetUseTiering());
-        }
     }
 
     out.set_store_type(Ydb::Table::StoreType::STORE_TYPE_COLUMN);
@@ -829,12 +829,6 @@ bool BuildAlterColumnTableModifyScheme(const TString& path, const Ydb::Table::Al
         } else if (req->has_drop_ttl_settings()) {
             alterColumnTable->MutableAlterTtlSettings()->MutableDisabled();
         }
-
-        if (req->has_set_tiering()) {
-            alterColumnTable->MutableAlterTtlSettings()->SetUseTiering(req->set_tiering());
-        } else if (req->has_drop_tiering()) {
-            alterColumnTable->MutableAlterTtlSettings()->SetUseTiering("");
-        }
     }
 
     return true;

ydb/core/ydb_convert/table_settings.h

@@ -28,15 +28,25 @@ bool FillTtlSettings(TTtlSettingsEnabled& out, const Ydb::Table::TtlSettings& in
         return false;
     };
 
+    static const auto& fillCommonFields = []<class TModeSettings>(TTtlSettingsEnabled& out, const TModeSettings& in) {
+        out.SetColumnName(in.column_name());
+        if (in.has_expire_after_seconds()) {
+            out.SetExpireAfterSeconds(in.expire_after_seconds());
+        }
+        for (const auto& in_tier : in.storage_tiers()) {
+            auto* out_tier = out.AddTiers();
+            out_tier->SetEvictAfterSeconds(in_tier.evict_after_seconds());
+            out_tier->SetStorageName(in_tier.storage_name());
+        }
+    };
+
     switch (in.mode_case()) {
     case Ydb::Table::TtlSettings::kDateTypeColumn:
-        out.SetColumnName(in.date_type_column().column_name());
-        out.SetExpireAfterSeconds(in.date_type_column().expire_after_seconds());
+        fillCommonFields(out, in.date_type_column());
         break;
 
     case Ydb::Table::TtlSettings::kValueSinceUnixEpoch:
-        out.SetColumnName(in.value_since_unix_epoch().column_name());
-        out.SetExpireAfterSeconds(in.value_since_unix_epoch().expire_after_seconds());
+        fillCommonFields(out, in.value_since_unix_epoch());
 
         #define CASE_UNIT(type) \
             case Ydb::Table::ValueSinceUnixEpochModeSettings::type: \

ydb/public/api/protos/ydb_table.proto

@@ -433,6 +433,13 @@ message ColumnMeta {
     }
 }
 
+message EvictionTier {
+    // Name of tiered storage
+    string storage_name = 1;
+
+    uint32 evict_after_seconds = 2;
+}
+
 message DateTypeColumnModeSettings {
     // The row will be considered as expired at the moment of time, when the value
     // stored in <column_name> is less than or equal to the current time (in epoch
@@ -442,7 +449,9 @@ message DateTypeColumnModeSettings {
     // The column type must be a date type
     string column_name = 1;
 
-    uint32 expire_after_seconds = 2;
+    optional uint32 expire_after_seconds = 2;
+
+    repeated EvictionTier storage_tiers = 3;
 }
 
 message ValueSinceUnixEpochModeSettings {
@@ -468,7 +477,9 @@ message ValueSinceUnixEpochModeSettings {
 
     // This option is always interpreted as seconds regardless of the
     // <column_unit> value.
-    uint32 expire_after_seconds = 3;
+    optional uint32 expire_after_seconds = 3;
+
+    repeated EvictionTier storage_tiers = 4;
 }
 
 message TtlSettings {
@@ -624,7 +635,7 @@ message CreateTableRequest {
     Ydb.FeatureFlag.Status key_bloom_filter = 16;
     // Read replicas settings for table
     ReadReplicasSettings read_replicas_settings = 17;
-    // Tiering rules name. It specifies how data migrates from one tier (logical storage) to another.
+    // Deprecated. Use TTL instead.
     string tiering = 18;
     // Is temporary table
     bool temporary = 19;
@@ -704,7 +715,7 @@ message AlterTableRequest {
     repeated string drop_changefeeds = 20;
     // Rename existed index
     repeated RenameIndexItem rename_indexes = 21;
-    // Setup or remove tiering
+    // Deprecated. Use ttl_action instead
     oneof tiering_action {
         string set_tiering = 22;
         google.protobuf.Empty drop_tiering = 23;

ydb/public/lib/experimental/ydb_logstore.cpp

@@ -199,8 +199,6 @@ void TLogTableDescription::SerializeTo(Ydb::LogStore::CreateLogTableRequest& req
 
     if (TtlSettings) {
         TtlSettings->SerializeTo(*request.mutable_ttl_settings());
-    } else if (TieringSettings) {
-        TieringSettings->SerializeTo(*request.mutable_tiering_settings());
     }
 }
 

ydb/public/lib/experimental/ydb_logstore.h

@@ -152,21 +152,6 @@ struct TLogTableSharding {
     TLogTableSharding(const Ydb::LogStore::DescribeLogTableResult& desc);
 };
 
-class TTieringSettings {
-private:
-    TString TieringId;
-public:
-    TTieringSettings(const TString& tieringId)
-        : TieringId(tieringId) {
-
-    }
-
-    void SerializeTo(Ydb::LogStore::TieringSettings& proto) const {
-        proto.set_tiering_id(TieringId);
-    }
-
-};
-
 class TLogTableDescription {
 public:
     TLogTableDescription(const TString& schemaPresetName, const TLogTableSharding& sharding);
@@ -200,16 +185,11 @@ class TLogTableDescription {
         TtlSettings = settings;
         return *this;
     }
-    TLogTableDescription& SetTieringSettings(const TTieringSettings& settings) {
-        TieringSettings = settings;
-        return *this;
-    }
 private:
     const TString SchemaPresetName;
     const TSchema Schema;
     const TLogTableSharding Sharding;
     TMaybe<TTtlSettings> TtlSettings;
-    TMaybe<TTieringSettings> TieringSettings;
     TString Owner;
     TVector<NScheme::TPermissions> Permissions;
     TVector<NScheme::TPermissions> EffectivePermissions;