fix build

ydb-platform · Nov 28, 2024 · 3de0325 · 3de0325
1 parent 2908bf9
commit 3de0325
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
@@ -5444,10 +5444,10 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
             UNIT_ASSERT_C(desc.IsSuccess(), desc.GetIssues().ToString());
 
             UNIT_ASSERT(desc.GetTableDescription().GetTtlSettings());
-            auto ttl = desc.GetTableDescription().GetTtlSettings()->GetDateTypeColumn();
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers().size(), 1);
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetStorageName(), "tier1");
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetEvictionDelay(), TDuration::Seconds(10));
+            auto ttl = desc.GetTableDescription().GetTtlSettings();
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers().size(), 1);
+            UNIT_ASSERT_VALUES_EQUAL(std::get<TTtlEvictToExternalStorageAction>(ttl->GetTiers()[0].GetAction()).StorageName, "tier1");
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers()[0].GetApplyAfter(), TDuration::Seconds(10));
         }
         auto query2 = TStringBuilder() << R"(
             --!syntax_v1
@@ -5460,10 +5460,10 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
             UNIT_ASSERT_C(desc.IsSuccess(), desc.GetIssues().ToString());
 
             UNIT_ASSERT(desc.GetTableDescription().GetTtlSettings());
-            auto ttl = desc.GetTableDescription().GetTtlSettings()->GetDateTypeColumn();
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers().size(), 1);
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetStorageName(), "tier2");
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetEvictionDelay(), TDuration::Seconds(10));
+            auto ttl = desc.GetTableDescription().GetTtlSettings();
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers().size(), 1);
+            UNIT_ASSERT_VALUES_EQUAL(std::get<TTtlEvictToExternalStorageAction>(ttl->GetTiers()[0].GetAction()).StorageName, "tier2");
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers()[0].GetApplyAfter(), TDuration::Seconds(10));
         }
 
         auto query3 = TStringBuilder() << R"(
@@ -5491,10 +5491,10 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
             UNIT_ASSERT_C(desc.IsSuccess(), desc.GetIssues().ToString());
 
             UNIT_ASSERT(desc.GetTableDescription().GetTtlSettings());
-            auto ttl = desc.GetTableDescription().GetTtlSettings()->GetDateTypeColumn();
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers().size(), 1);
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetStorageName(), "tier1");
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetEvictionDelay(), TDuration::Seconds(10));
+            auto ttl = desc.GetTableDescription().GetTtlSettings();
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers().size(), 1);
+            UNIT_ASSERT_VALUES_EQUAL(std::get<TTtlEvictToExternalStorageAction>(ttl->GetTiers()[0].GetAction()).StorageName, "tier1");
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers()[0].GetApplyAfter(), TDuration::Seconds(10));
         }
 
         auto query5 = TStringBuilder() << R"(
@@ -8191,10 +8191,15 @@ Y_UNIT_TEST_SUITE(KqpOlapScheme) {
 
             const auto& description = describeResult.GetTableDescription();
             UNIT_ASSERT(describeResult.GetTableDescription().GetTtlSettings());
-            auto ttl = describeResult.GetTableDescription().GetTtlSettings()->GetDateTypeColumn();
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetExpireAfter(), TDuration::Hours(1));
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers().size(), 1);
-            UNIT_ASSERT_VALUES_EQUAL(ttl.GetTiers()[0].GetStorageName(), "tier1");
+            auto ttl = describeResult.GetTableDescription().GetTtlSettings();
+            UNIT_ASSERT_VALUES_EQUAL(ttl->GetTiers().size(), 2);
+            auto evictTier = ttl->GetTiers()[0];
+            UNIT_ASSERT(std::holds_alternative<TTtlEvictToExternalStorageAction>(evictTier.GetAction()));
+            UNIT_ASSERT_VALUES_EQUAL(std::get<TTtlEvictToExternalStorageAction>(evictTier.GetAction()).StorageName, "tier1");
+            UNIT_ASSERT_VALUES_EQUAL(evictTier.GetApplyAfter(), TDuration::Seconds(10));
+            auto deleteTier = ttl->GetTiers()[1];
+            UNIT_ASSERT(std::holds_alternative<TTtlDeleteAction>(deleteTier.GetAction()));
+            UNIT_ASSERT_VALUES_EQUAL(deleteTier.GetApplyAfter(), TDuration::Hours(1));
         }
         {
             auto alterQuery = TStringBuilder() << "ALTER TABLE `" << testTable.GetName() <<  R"(` RESET (TTL);)";

diff --git a/ydb/public/sdk/cpp/client/ydb_table/table.cpp b/ydb/public/sdk/cpp/client/ydb_table/table.cpp
@@ -2912,12 +2912,12 @@ bool operator!=(const TChangefeedDescription& lhs, const TChangefeedDescription&
 ////////////////////////////////////////////////////////////////////////////////
 
 TTtlTierSettings::TTtlTierSettings(TDuration evictionDelay, const TAction& action)
-    : EvictAfter_(evictionDelay)
+    : ApplyAfter_(evictionDelay)
     , Action_(action) {
 }
 
 TTtlTierSettings::TTtlTierSettings(const Ydb::Table::TtlTier& tier)
-    : EvictAfter_(TDuration::Seconds(tier.apply_after_seconds())) {
+    : ApplyAfter_(TDuration::Seconds(tier.apply_after_seconds())) {
     switch (tier.action_case()) {
         case Ydb::Table::TtlTier::kDelete:
             Action_ = TTtlDeleteAction();
@@ -2931,7 +2931,7 @@ TTtlTierSettings::TTtlTierSettings(const Ydb::Table::TtlTier& tier)
 }
 
 void TTtlTierSettings::SerializeTo(Ydb::Table::TtlTier& proto) const {
-    proto.set_apply_after_seconds(EvictAfter_.Seconds());
+    proto.set_apply_after_seconds(ApplyAfter_.Seconds());
 
     std::visit(TOverloaded{
             [&proto](const TTtlDeleteAction&) { proto.mutable_delete_(); },
@@ -2943,8 +2943,8 @@ void TTtlTierSettings::SerializeTo(Ydb::Table::TtlTier& proto) const {
         Action_);
 }
 
-TDuration TTtlTierSettings::GetEvictAfter() const {
-    return EvictAfter_;
+TDuration TTtlTierSettings::GetApplyAfter() const {
+    return ApplyAfter_;
 }
 
 const TTtlTierSettings::TAction& TTtlTierSettings::GetAction() const {
@@ -3145,7 +3145,7 @@ std::optional<TDuration> TTtlSettings::GetExpireAfter() const {
 std::optional<TDuration> TTtlSettings::GetExpireAfterFrom(const TVector<TTtlTierSettings>& tiers) {
     for (const auto& tier : tiers) {
         if (std::holds_alternative<TTtlDeleteAction>(tier.GetAction())) {
-            return tier.GetEvictAfter();
+            return tier.GetApplyAfter();
         }
     }
     return std::nullopt;

diff --git a/ydb/public/sdk/cpp/client/ydb_table/table.h b/ydb/public/sdk/cpp/client/ydb_table/table.h
@@ -443,11 +443,11 @@ class TTtlTierSettings {
     explicit TTtlTierSettings(const Ydb::Table::TtlTier& tier);
     void SerializeTo(Ydb::Table::TtlTier& proto) const;
 
-    TDuration GetEvictAfter() const;
+    TDuration GetApplyAfter() const;
     const TAction& GetAction() const;
 
 private:
-    TDuration EvictAfter_;
+    TDuration ApplyAfter_;
     TAction Action_;
 };