Moved commit "new tiered_ttl mode in public TtlSettings" from ydb repo

Author: swalrus1

include/ydb-cpp-sdk/client/table/table.h

@@ -32,8 +32,7 @@ class TtlTier;
 class TableIndex;
 class TableIndexDescription;
 class ValueSinceUnixEpochModeSettings;
-class DateTypeColumnModeSettingsV1;
-class ValueSinceUnixEpochModeSettingsV1;
+class EvictionToExternalStorageSettings;
 
 } // namespace Table
 } // namespace Ydb
@@ -434,46 +433,17 @@ struct TPartitionStats {
     uint32_t LeaderNodeId = 0;
 };
 
-struct TTtlDeleteAction {};
-
-struct TTtlEvictToExternalStorageAction {
-    std::string StorageName;
-};
-
-class TTtlTierSettings {
-public:
-    using TAction = std::variant<
-        std::monostate,
-        TTtlDeleteAction,
-        TTtlEvictToExternalStorageAction
-    >;
-
-public:
-    explicit TTtlTierSettings(TDuration applyAfter, const TAction& action);
-    explicit TTtlTierSettings(const Ydb::Table::TtlTier& tier);
-    void SerializeTo(Ydb::Table::TtlTier& proto) const;
-
-    TDuration GetApplyAfter() const;
-    const TAction& GetAction() const;
-
-private:
-    TDuration ApplyAfter_;
-    TAction Action_;
-};
-
 class TDateTypeColumnModeSettings {
 public:
-    explicit TDateTypeColumnModeSettings(const std::string& columnName, const TDuration& deprecatedExpireAfter = TDuration::Max());
+    explicit TDateTypeColumnModeSettings(const std::string& columnName, const TDuration& applyAfter);
     void SerializeTo(Ydb::Table::DateTypeColumnModeSettings& proto) const;
-    void SerializeTo(Ydb::Table::DateTypeColumnModeSettingsV1& proto) const;
 
     const std::string& GetColumnName() const;
-    // Deprecated. Use TTtlSettings::GetExpireAfter()
     const TDuration& GetExpireAfter() const;
 
 private:
     std::string ColumnName_;
-    TDuration DeprecatedExpireAfter_;
+    TDuration ApplyAfter_;
 };
 
 class TValueSinceUnixEpochModeSettings {
@@ -488,9 +458,8 @@ class TValueSinceUnixEpochModeSettings {
     };
 
 public:
-    explicit TValueSinceUnixEpochModeSettings(const std::string& columnName, EUnit columnUnit, const TDuration& deprecatedExpireAfter = TDuration::Max());
+    explicit TValueSinceUnixEpochModeSettings(const std::string& columnName, EUnit columnUnit, const TDuration& applyAfter);
     void SerializeTo(Ydb::Table::ValueSinceUnixEpochModeSettings& proto) const;
-    void SerializeTo(Ydb::Table::ValueSinceUnixEpochModeSettingsV1& proto) const;
 
     const std::string& GetColumnName() const;
     EUnit GetColumnUnit() const;
@@ -503,7 +472,45 @@ class TValueSinceUnixEpochModeSettings {
 private:
     std::string ColumnName_;
     EUnit ColumnUnit_;
-    TDuration DeprecatedExpireAfter_;
+    TDuration ApplyAfter_;
+};
+
+class TTtlDeleteAction {};
+class TTtlEvictToExternalStorageAction {
+public:
+    TTtlEvictToExternalStorageAction(const std::string& storageName);
+    void SerializeTo(Ydb::Table::EvictionToExternalStorageSettings& proto) const;
+
+    std::string GetStorage() const;
+
+private:
+    std::string Storage_;
+};
+
+class TTtlTierSettings {
+public:
+    using TExpression = std::variant<
+        TDateTypeColumnModeSettings,
+        TValueSinceUnixEpochModeSettings
+    >;
+
+    using TAction = std::variant<
+        TTtlDeleteAction,
+        TTtlEvictToExternalStorageAction
+    >;
+
+public:
+    explicit TTtlTierSettings(const TExpression& expression, const TAction& action);
+
+    static std::optional<TTtlTierSettings> FromProto(const Ydb::Table::TtlTier& tier);
+    void SerializeTo(Ydb::Table::TtlTier& proto) const;
+
+    const TExpression& GetExpression() const;
+    const TAction& GetAction() const;
+
+private:
+    TExpression Expression_;
+    TAction Action_;
 };
 
 //! Represents ttl settings
@@ -522,16 +529,14 @@ class TTtlSettings {
         ValueSinceUnixEpoch = 1,
     };
 
-    explicit TTtlSettings(const std::string& columnName, const std::vector<TTtlTierSettings>& tiers);
+    explicit TTtlSettings(const std::vector<TTtlTierSettings>& tiers);
+
     explicit TTtlSettings(const std::string& columnName, const TDuration& expireAfter);
     const TDateTypeColumnModeSettings& GetDateTypeColumn() const;
-    // Deprecated. Use FromProto()
     explicit TTtlSettings(const Ydb::Table::DateTypeColumnModeSettings& mode, uint32_t runIntervalSeconds);
 
-    explicit TTtlSettings(const std::string& columnName, EUnit columnUnit, const std::vector<TTtlTierSettings>& tiers);
     explicit TTtlSettings(const std::string& columnName, EUnit columnUnit, const TDuration& expireAfter);
     const TValueSinceUnixEpochModeSettings& GetValueSinceUnixEpoch() const;
-    // Deprecated. Use FromProto()
     explicit TTtlSettings(const Ydb::Table::ValueSinceUnixEpochModeSettings& mode, uint32_t runIntervalSeconds);
 
     static std::optional<TTtlSettings> FromProto(const Ydb::Table::TtlSettings& proto);
@@ -542,14 +547,8 @@ class TTtlSettings {
     const TDuration& GetRunInterval() const;
 
     const std::vector<TTtlTierSettings>& GetTiers() const;
-    std::optional<TDuration> GetExpireAfter() const;
-
-private:
-    explicit TTtlSettings(TMode mode, const std::vector<TTtlTierSettings>& tiers, ui32 runIntervalSeconds);
-    static std::optional<TDuration> GetExpireAfterFrom(const std::vector<TTtlTierSettings>& tiers);
 
 private:
-    TMode Mode_;
     std::vector<TTtlTierSettings> Tiers_;
     TDuration RunInterval_ = TDuration::Zero();
 };

src/api/protos/ydb_table.proto

@@ -435,44 +435,11 @@ message ColumnMeta {
 
 message EvictionToExternalStorageSettings {
     // Path to external data source
-    string storage_name = 1;
-}
-
-message TtlTier {
-    uint32 apply_after_seconds = 1;
-
-    oneof action {
-        google.protobuf.Empty delete = 2;
-        EvictionToExternalStorageSettings evict_to_external_storage = 3;
-    }
-}
-
-message DateTypeColumnModeSettingsV1 {
-    // The row will be assigned a tier at the moment of time, when the value
-    // stored in <column_name> is less than or equal to the current time (in epoch
-    // time format), and <tier.apply_after_seconds> has passed since that moment;
-    // i.e. the eviction threshold is the value of <column_name> plus <tier.apply_after_seconds>.
-
-    // The column type must be a date type
-    string column_name = 1;
-}
-
-message ValueSinceUnixEpochModeSettingsV1 {
-    // Same as DateTypeColumnModeSettings (above), but useful when type of the
-    // value stored in <column_name> is not a date type.
-
-    // The column type must be one of:
-    // - Uint32
-    // - Uint64
-    // - DyNumber
-    string column_name = 1;
-
-    // Interpretation of the value stored in <column_name>
-    ValueSinceUnixEpochModeSettings.Unit column_unit = 2;
+    string storage = 1;
 }
 
 message DateTypeColumnModeSettings {
-    // The row will be assigned a tier at the moment of time, when the value
+    // The row will be considered as expired or assigned a tier at the moment of time, when the value
     // stored in <column_name> is less than or equal to the current time (in epoch
     // time format), and <expire_after_seconds> has passed since that moment;
     // i.e. the expiration threshold is the value of <column_name> plus <expire_after_seconds>.
@@ -509,12 +476,27 @@ message ValueSinceUnixEpochModeSettings {
     uint32 expire_after_seconds = 3;
 }
 
+message TtlTier {
+    oneof expression {
+        DateTypeColumnModeSettings date_type_column = 1;
+        ValueSinceUnixEpochModeSettings value_since_unix_epoch = 2;
+    }
+
+    oneof action {
+        google.protobuf.Empty delete = 3;
+        EvictionToExternalStorageSettings evict_to_external_storage = 4;
+    }
+}
+
+message TieredModeSettings {
+    repeated TtlTier tiers = 1;
+}
+
 message TtlSettings {
     oneof mode {
-        DateTypeColumnModeSettings date_type_column = 1 [deprecated = true];
-        ValueSinceUnixEpochModeSettings value_since_unix_epoch = 2 [deprecated = true];
-        DateTypeColumnModeSettingsV1 date_type_column_v1 = 4;
-        ValueSinceUnixEpochModeSettingsV1 value_since_unix_epoch_v1 = 5;
+        DateTypeColumnModeSettings date_type_column = 1;
+        ValueSinceUnixEpochModeSettings value_since_unix_epoch = 2;
+        TieredModeSettings tiered_ttl = 4;
     }
 
     // There is no guarantee that expired row will be deleted immediately upon
@@ -530,8 +512,6 @@ message TtlSettings {
     // How often to run BRO on the same partition.
     // BRO will not be started more often, but may be started less often.
     uint32 run_interval_seconds = 3;
-
-    repeated TtlTier tiers = 6;
 }
 
 message StorageSettings {