more changes

Author: swalrus1

ydb/public/api/protos/ydb_table.proto

@@ -635,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;
@@ -715,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;

ydb/public/sdk/cpp/client/ydb_table/table.cpp

@@ -345,11 +345,6 @@ class TTableDescription::TImpl {
             break;
         }
 
-        // tiering
-        if (proto.tiering().size()) {
-            Tiering_ = proto.tiering();
-        }
-
         if (proto.store_type()) {
             StoreType_ = (proto.store_type() == Ydb::Table::STORE_TYPE_COLUMN) ? EStoreType::Column : EStoreType::Row;
         }
@@ -580,10 +575,6 @@ class TTableDescription::TImpl {
         return TtlSettings_;
     }
 
-    const TMaybe<TString>& GetTiering() const {
-        return Tiering_;
-    }
-
     EStoreType GetStoreType() const {
         return StoreType_;
     }
@@ -664,7 +655,6 @@ class TTableDescription::TImpl {
     TVector<TIndexDescription> Indexes_;
     TVector<TChangefeedDescription> Changefeeds_;
     TMaybe<TTtlSettings> TtlSettings_;
-    TMaybe<TString> Tiering_;
     TString Owner_;
     TVector<NScheme::TPermissions> Permissions_;
     TVector<NScheme::TPermissions> EffectivePermissions_;
@@ -731,7 +721,7 @@ TMaybe<TTtlSettings> TTableDescription::GetTtlSettings() const {
 }
 
 TMaybe<TString> TTableDescription::GetTiering() const {
-    return Impl_->GetTiering();
+    return Nothing();
 }
 
 EStoreType TTableDescription::GetStoreType() const {
@@ -954,10 +944,6 @@ void TTableDescription::SerializeTo(Ydb::Table::CreateTableRequest& request) con
         ttl->SerializeTo(*request.mutable_ttl_settings());
     }
 
-    if (const auto& tiering = Impl_->GetTiering()) {
-        request.set_tiering(*tiering);
-    }
-
     if (Impl_->GetStoreType() == EStoreType::Column) {
         request.set_store_type(Ydb::Table::StoreType::STORE_TYPE_COLUMN);
     }
@@ -2941,6 +2927,18 @@ bool operator!=(const TChangefeedDescription& lhs, const TChangefeedDescription&
 
 ////////////////////////////////////////////////////////////////////////////////
 
+namespace {
+
+TVector<TEvictionTierSettings> DeserializeTiers(const NProtoBuf::RepeatedPtrField<Ydb::Table::EvictionTier>& serialized) {
+    TVector<TEvictionTierSettings> tiers;
+    for (const auto& tier : serialized) {
+        tiers.push_back(TEvictionTierSettings(tier));
+    }
+    return tiers;
+}
+
+}
+
 TEvictionTierSettings::TEvictionTierSettings(TString storageName, TDuration evictionDelay)
     : StorageName_(storageName)
     , EvictionDelay_(evictionDelay)
@@ -2981,7 +2979,7 @@ void TDateTypeColumnModeSettings::SerializeTo(Ydb::Table::DateTypeColumnModeSett
         proto.set_expire_after_seconds(ExpireAfter_->Seconds());
     }
     for (const auto& tier : Tiers_) {
-        tier.SerializeTo(*proto.Addstorage_tiers());
+        tier.SerializeTo(*proto.add_storage_tiers());
     }
 }
 
@@ -3001,6 +2999,10 @@ bool TDateTypeColumnModeSettings::HasExpireAfter() const {
     return !!ExpireAfter_;
 }
 
+const TVector<TEvictionTierSettings>& TDateTypeColumnModeSettings::GetTiers() const {
+    return Tiers_;
+}
+
 TValueSinceUnixEpochModeSettings::TValueSinceUnixEpochModeSettings(const TString& columnName, EUnit columnUnit, const TDuration& expireAfter)
     : ColumnName_(columnName)
     , ColumnUnit_(columnUnit)
@@ -3045,6 +3047,10 @@ bool TValueSinceUnixEpochModeSettings::HasExpireAfter() const {
     return !!ExpireAfter_;
 }
 
+const TVector<TEvictionTierSettings>& TValueSinceUnixEpochModeSettings::GetTiers() const {
+    return Tiers_;
+}
+
 void TValueSinceUnixEpochModeSettings::Out(IOutputStream& out, EUnit unit) {
 #define PRINT_UNIT(x) \
     case EUnit::x: \
@@ -3096,14 +3102,7 @@ TTtlSettings::TTtlSettings(const TString& columnName, const TDuration& expireAft
 TTtlSettings::TTtlSettings(const Ydb::Table::DateTypeColumnModeSettings& mode, ui32 runIntervalSeconds)
     : TTtlSettings(mode.column_name(),
           mode.has_expire_after_seconds() ? std::optional<TDuration>(TDuration::Seconds(mode.expire_after_seconds())) : std::nullopt,
-          [&tiers = mode.storage_tiers()]() {
-              TVector<TEvictionTierSettings> result;
-              for (const auto& tier : tiers) {
-                  result.push_back(TEvictionTierSettings(tier));
-              }
-              return result;
-          }())
-{
+          DeserializeTiers(mode.storage_tiers())) {
     RunInterval_ = TDuration::Seconds(runIntervalSeconds);
 }
 
@@ -3122,14 +3121,7 @@ TTtlSettings::TTtlSettings(const TString& columnName, EUnit columnUnit, const TD
 TTtlSettings::TTtlSettings(const Ydb::Table::ValueSinceUnixEpochModeSettings& mode, ui32 runIntervalSeconds)
     : TTtlSettings(mode.column_name(), TProtoAccessor::FromProto(mode.column_unit()),
           mode.has_expire_after_seconds() ? std::optional<TDuration>(TDuration::Seconds(mode.expire_after_seconds())) : std::nullopt,
-          [&tiers = mode.storage_tiers()]() {
-              TVector<TEvictionTierSettings> result;
-              for (const auto& tier : tiers) {
-                  result.push_back(TEvictionTierSettings(tier));
-              }
-              return result;
-          }())
-{
+          DeserializeTiers(mode.storage_tiers())) {
     RunInterval_ = TDuration::Seconds(runIntervalSeconds);
 }
 

ydb/public/sdk/cpp/client/ydb_table/table.h

@@ -445,6 +445,7 @@ class TDateTypeColumnModeSettings {
     const TString& GetColumnName() const;
     const TDuration& GetExpireAfter() const;
     bool HasExpireAfter() const;
+    const TVector<TEvictionTierSettings>& GetTiers() const;
 
 private:
     TString ColumnName_;
@@ -472,6 +473,7 @@ class TValueSinceUnixEpochModeSettings {
     EUnit GetColumnUnit() const;
     const TDuration& GetExpireAfter() const;
     bool HasExpireAfter() const;
+    const TVector<TEvictionTierSettings>& GetTiers() const;
 
     static void Out(IOutputStream& o, EUnit unit);
     static TString ToString(EUnit unit);
@@ -633,6 +635,7 @@ class TTableDescription {
     TVector<TIndexDescription> GetIndexDescriptions() const;
     TVector<TChangefeedDescription> GetChangefeedDescriptions() const;
     TMaybe<TTtlSettings> GetTtlSettings() const;
+    // Deprecated. Use GetTtlSettings() instead
     TMaybe<TString> GetTiering() const;
     EStoreType GetStoreType() const;