remove family action

Author: swalrus1

ydb/core/protos/flat_scheme_op.proto

@@ -224,16 +224,11 @@ message TTTLSettings {
         optional string StorageName = 1;
     }
 
-    message TEvictionToColumnFamilySettings {
-        optional string FamilyName = 1;
-    }
-
     message TTier {
         optional uint32 EvictAfterSeconds = 1;
         oneof Action {
             google.protobuf.Empty Delete = 2;
             TEvictionToExternalStorageSettings EvictToExternalStorage = 3;
-            TEvictionToColumnFamilySettings EvictToColumnFamily = 4;
         }
     }
 

ydb/core/ydb_convert/table_description.cpp

@@ -534,9 +534,6 @@ static void AddTtl(TYdbProto& out, const TTtl& inTTL) {
             case NKikimrSchemeOp::TTTLSettings::TTier::ActionCase::kEvictToExternalStorage:
                 outTier->mutable_evict_to_external_storage()->set_storage_name(inTier.GetEvictToExternalStorage().GetStorageName());
                 break;
-            case NKikimrSchemeOp::TTTLSettings::TTier::ActionCase::kEvictToColumnFamily:
-                outTier->mutable_evict_to_column_family()->set_family_name(inTier.GetEvictToColumnFamily().GetFamilyName());
-                break;
             case NKikimrSchemeOp::TTTLSettings::TTier::ActionCase::ACTION_NOT_SET:
                 break;
         }

ydb/core/ydb_convert/table_settings.h

@@ -46,9 +46,6 @@ bool FillTtlSettings(TTtlSettingsEnabled& out, const Ydb::Table::TtlSettings& in
                 case Ydb::Table::TtlTier::kEvictToExternalStorage:
                     outTier->MutableEvictToExternalStorage()->SetStorageName(inTier.evict_to_external_storage().storage_name());
                     break;
-                case Ydb::Table::TtlTier::kEvictToColumnFamily:
-                    outTier->MutableEvictToColumnFamily()->SetFamilyName(inTier.evict_to_column_family().family_name());
-                    break;
                 case Ydb::Table::TtlTier::ACTION_NOT_SET:
                     break;
             }

ydb/public/api/protos/ydb_table.proto

@@ -449,7 +449,6 @@ message TtlTier {
     oneof action {
         google.protobuf.Empty delete = 2;
         EvictionToExternalStorageSettings evict_to_external_storage = 3;
-        EvictionToFamilySettings evict_to_column_family = 3;
     }
 }
 

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

@@ -25,6 +25,7 @@
 
 #include <library/cpp/cache/cache.h>
 
+#include <util/generic/overloaded.h>
 #include <util/generic/map.h>
 #include <util/random/random.h>
 #include <util/string/join.h>
@@ -2950,9 +2951,6 @@ TTtlTierSettings::TTtlTierSettings(const Ydb::Table::TtlTier& tier)
         case Ydb::Table::TtlTier::kEvictToExternalStorage:
             Action_ = TTtlEvictToExternalStorageAction(tier.evict_to_external_storage().storage_name());
             break;
-        case Ydb::Table::TtlTier::kEvictToColumnFamily:
-            Action_ = TTtlEvictToExternalStorageAction(tier.evict_to_column_family().family_name());
-            break;
         case Ydb::Table::TtlTier::ACTION_NOT_SET:
             break;
     }
@@ -2961,17 +2959,14 @@ TTtlTierSettings::TTtlTierSettings(const Ydb::Table::TtlTier& tier)
 void TTtlTierSettings::SerializeTo(Ydb::Table::TtlTier& proto) const {
     proto.set_evict_after_seconds(EvictionDelay_.Seconds());
 
-    auto actionVisitor = [proto](auto&& action) mutable {
-        using T = std::decay_t<decltype(action)>;
-        if constexpr (std::is_same_v<T, TTtlDeleteAction>) {
-            proto.mutable_delete_();
-        } else if constexpr (std::is_same_v<T, TTtlEvictToExternalStorageAction>) {
-            proto.mutable_evict_to_external_storage()->set_storage_name(action.StorageName);
-        } else if constexpr (std::is_same_v<T, TTtlEvictToColumnFamilyAction>) {
-            proto.mutable_evict_to_column_family()->set_storage_name(action.FamilyName);
-        }
-    };
-    std::visit(std::move(actionVisitor), Action_);
+    std::visit(TOverloaded{
+            [&proto](const TTtlDeleteAction&) { proto.mutable_delete_(); },
+            [&proto](const TTtlEvictToExternalStorageAction& action) {
+                proto.mutable_evict_to_external_storage()->set_storage_name(action.StorageName);
+            },
+            [](const std::monostate) {},
+        },
+        Action_);
 }
 
 TDuration TTtlTierSettings::GetEvictionDelay() const {

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

@@ -428,10 +428,6 @@ struct TTtlEvictToExternalStorageAction {
     TString StorageName;
 };
 
-struct TTtlEvictToColumnFamilyAction {
-    TString FamilyName;
-};
-
 class TTtlTierSettings {
 public:
     using TAction = std::variant<