Revert "Complex messages expiration in the topic (#16413)" (#16628)

Author: nshestakov

ydb/core/persqueue/partition.cpp

@@ -429,7 +429,6 @@ bool TPartition::CleanUpBlobs(TEvKeyValue::TEvRequest *request, const TActorCont
     const TDuration lifetimeLimit{TDuration::Seconds(partConfig.GetLifetimeSeconds())};
 
     const bool hasStorageLimit = partConfig.HasStorageLimitBytes();
-    const auto hasLifetime = !hasStorageLimit || (partConfig.HasLifetimeSeconds() && partConfig.GetLifetimeSeconds() > 0);
     const auto now = ctx.Now();
     const ui64 importantConsumerMinOffset = ImportantClientsMinOffset();
 
@@ -447,11 +446,15 @@ bool TPartition::CleanUpBlobs(TEvKeyValue::TEvRequest *request, const TActorCont
         }
 
         auto& firstKey = DataKeysBody.front();
-
-        auto expiredByLifetime = hasLifetime && now >= firstKey.Timestamp + lifetimeLimit;
-        auto expiredByStorageLimit = hasStorageLimit && BodySize > firstKey.Size && (BodySize - firstKey.Size) >= partConfig.GetStorageLimitBytes();
-        if (!expiredByLifetime && !expiredByStorageLimit) {
-            break;
+        if (hasStorageLimit) {
+            const auto bodySize = BodySize - firstKey.Size;
+            if (bodySize < partConfig.GetStorageLimitBytes()) {
+                break;
+            }
+        } else {
+            if (now < firstKey.Timestamp + lifetimeLimit) {
+                break;
+            }
         }
 
         BodySize -= firstKey.Size;

ydb/core/persqueue/ut/utils_ut.cpp

@@ -76,39 +76,6 @@ Y_UNIT_TEST_SUITE(TPQUtilsTest) {
             UNIT_ASSERT_VALUES_EQUAL(r, 2);
         }
     }
-
-    Y_UNIT_TEST(Migration_Lifetime) {
-        {
-            NKikimrPQ::TPQTabletConfig config;
-            config.MutablePartitionConfig()->SetLifetimeSeconds(123);
-            NKikimr::NPQ::Migrate(config);
-
-            UNIT_ASSERT_VALUES_EQUAL(true, config.GetMigrations().GetLifetime());
-            UNIT_ASSERT_VALUES_EQUAL(false, config.GetPartitionConfig().HasStorageLimitBytes());
-            UNIT_ASSERT_VALUES_EQUAL(123, config.GetPartitionConfig().GetLifetimeSeconds());
-        }
-        {
-            NKikimrPQ::TPQTabletConfig config;
-            config.MutablePartitionConfig()->SetLifetimeSeconds(123);
-            config.MutablePartitionConfig()->SetStorageLimitBytes(456);
-            NKikimr::NPQ::Migrate(config);
-
-            UNIT_ASSERT_VALUES_EQUAL(true, config.GetMigrations().GetLifetime());
-            UNIT_ASSERT_VALUES_EQUAL(456, config.GetPartitionConfig().GetStorageLimitBytes());
-            UNIT_ASSERT_VALUES_EQUAL(TDuration::Days(3650).Seconds(), config.GetPartitionConfig().GetLifetimeSeconds());
-        }
-        {
-            NKikimrPQ::TPQTabletConfig config;
-            config.MutableMigrations()->SetLifetime(true);
-            config.MutablePartitionConfig()->SetLifetimeSeconds(123);
-            config.MutablePartitionConfig()->SetStorageLimitBytes(456);
-            NKikimr::NPQ::Migrate(config);
-
-            UNIT_ASSERT_VALUES_EQUAL(true, config.GetMigrations().GetLifetime());
-            UNIT_ASSERT_VALUES_EQUAL(456, config.GetPartitionConfig().GetStorageLimitBytes());
-            UNIT_ASSERT_VALUES_EQUAL(123, config.GetPartitionConfig().GetLifetimeSeconds());
-        }
-    }
 }
 
 }

ydb/core/persqueue/utils.cpp

@@ -116,13 +116,6 @@ void Migrate(NKikimrPQ::TPQTabletConfig& config) {
             config.AddAllPartitions()->CopyFrom(partition);
         }
     }
-
-    if (!config.GetMigrations().GetLifetime()) {
-        if (config.GetPartitionConfig().HasStorageLimitBytes()) {
-            config.MutablePartitionConfig()->SetLifetimeSeconds(TDuration::Days(3650).Seconds());
-        }
-    }
-    config.MutableMigrations()->SetLifetime(true);
 }
 
 bool HasConsumer(const NKikimrPQ::TPQTabletConfig& config, const TString& consumerName) {

ydb/core/protos/pqconfig.proto

@@ -421,7 +421,7 @@ message TPQTabletConfig {
         optional uint32 MinPartitionCount = 1 [default = 1];
         // The maximum number of partitions that will be supported by the strategy. The strategy will not create partitions if the specified
         // amount is reached, even if the load exceeds the current capabilities of the topic.
-        optional uint32 MaxPartitionCount = 2 [default = 1];
+        optional uint32 MaxPartitionCount = 2 [default = 1];;
         optional uint32 ScaleThresholdSeconds = 3 [default = 300];
         optional uint32 ScaleUpPartitionWriteSpeedThresholdPercent = 4 [default = 80];
         optional uint32 ScaleDownPartitionWriteSpeedThresholdPercent = 5 [default = 20];
@@ -433,11 +433,6 @@ message TPQTabletConfig {
     repeated TPartition AllPartitions = 36; // filled by schemeshard
 
     optional TOffloadConfig OffloadConfig = 38;
-
-    message TMigrations {
-        optional bool Lifetime = 1 [default = false];
-    }
-    optional TMigrations Migrations = 39;
 }
 
 message THeartbeat {

ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp

@@ -217,8 +217,6 @@ class TAlterPQ: public TSubOperation {
                 TPath::Resolve(alterConfig.GetOffloadConfig().GetIncrementalBackup().GetDstPath(), context.SS).Base()->PathId.ToProto(pathId);
             }
 
-            alterConfig.MutableMigrations()->CopyFrom(tabletConfig->GetMigrations());
-
             alterConfig.MutablePartitionKeySchema()->Swap(tabletConfig->MutablePartitionKeySchema());
             Y_PROTOBUF_SUPPRESS_NODISCARD alterConfig.SerializeToString(&params->TabletConfig);
             alterConfig.Swap(tabletConfig);
@@ -559,7 +557,6 @@ class TAlterPQ: public TSubOperation {
         }
 
         NKikimrPQ::TPQTabletConfig tabletConfig = topic->GetTabletConfig();
-        NKikimr::NPQ::Migrate(tabletConfig);
         NKikimrPQ::TPQTabletConfig newTabletConfig = tabletConfig;
 
         TTopicInfo::TPtr alterData = ParseParams(context, &newTabletConfig, alter, errStr);

ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp

@@ -168,9 +168,6 @@ TTopicInfo::TPtr CreatePersQueueGroup(TOperationContext& context,
     }
 
     NKikimrPQ::TPQTabletConfig tabletConfig = op.GetPQTabletConfig();
-
-    tabletConfig.MutableMigrations()->SetLifetime(true);
-
     tabletConfig.ClearPartitionIds();
     tabletConfig.ClearPartitions();
 

ydb/services/persqueue_v1/persqueue_ut.cpp

@@ -5428,9 +5428,6 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) {
       Version: 567
       Important: true
     }
-    Migrations {
-      Lifetime: true
-    }
   }
   ErrorCode: OK
 }