Merge 67ae8d2 into 1bb608a

Author: nshestakov

ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp

@@ -181,12 +181,8 @@ class TAlterPQ: public TSubOperation {
 
             if (alterConfig.HasPartitionStrategy() && !NPQ::SplitMergeEnabled(alterConfig)
                 && tabletConfig->HasPartitionStrategy() && NPQ::SplitMergeEnabled(*tabletConfig)) {
-                if (!alterConfig.GetPartitionStrategy().HasMaxPartitionCount() || 0 != alterConfig.GetPartitionStrategy().GetMaxPartitionCount()) {
-                    errStr = TStringBuilder() << "Can`t disable auto partitioning. Disabling auto partitioning is a destructive operation, "
-                            << "after which all partitions will become active and the message order guarantee will be violated. "
-                            << "If you are sure of this, then set max_active_partitions to 0.";
-                    return nullptr;
-                }
+                errStr = TStringBuilder() << "Can`t disable auto partitioning.";
+                return nullptr;
             }
 
             if (!alterConfig.HasPartitionStrategy() && tabletConfig->HasPartitionStrategy()) {

ydb/core/tx/schemeshard/ut_topic_splitmerge/ut_topic_splitmerge.cpp

@@ -668,29 +668,6 @@ Y_UNIT_TEST_SUITE(TSchemeShardTopicSplitMergeTest) {
                 partitionStrategy->SetPartitionStrategyType(::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED);
             }
         }, {{TEvSchemeShard::EStatus::StatusInvalidParameter}});
-
-        ModifyTopic(runtime, env, txId, [&](auto& scheme) {
-            {
-                auto* partitionStrategy = scheme.MutablePQTabletConfig()->MutablePartitionStrategy();
-                partitionStrategy->SetPartitionStrategyType(::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED);
-                partitionStrategy->SetMaxPartitionCount(0);
-            }
-        });
-
-        topic = DescribeTopic(runtime);
-
-        UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED),
-                static_cast<int>(topic.GetPQTabletConfig().GetPartitionStrategy().GetPartitionStrategyType()));
-
-        UNIT_ASSERT_VALUES_EQUAL(3, topic.GetPartitions().size());
-        for (const auto& p : topic.GetPartitions()) {
-            Cerr <<  ">>>>> Verify partition " << p.GetPartitionId() << Endl << Flush;
-            UNIT_ASSERT_VALUES_EQUAL(static_cast<int>(::NKikimrPQ::ETopicPartitionStatus::Active), static_cast<int>(p.GetStatus()));
-            UNIT_ASSERT(p.GetChildPartitionIds().empty());
-            UNIT_ASSERT(p.GetParentPartitionIds().empty());
-            UNIT_ASSERT(!p.HasKeyRange());
-        }
-
     } // Y_UNIT_TEST(DisableSplitMerge)
 
     Y_UNIT_TEST(EnableSplitMerge) {

ydb/services/datastreams/datastreams_proxy.cpp

@@ -522,8 +522,6 @@ namespace NKikimr::NDataStreams::V1 {
                 t->SetScaleThresholdSeconds(ws.stabilization_window().seconds() ? ws.stabilization_window().seconds() : 300);
                 t->SetScaleUpPartitionWriteSpeedThresholdPercent(ws.up_utilization_percent() ? ws.up_utilization_percent() : 90);
                 t->SetScaleDownPartitionWriteSpeedThresholdPercent(ws.down_utilization_percent() ? ws.down_utilization_percent() : 30);
-            } else if (0 == s.max_active_partitions()) {
-                t->SetMaxPartitionCount(0);
             }
         }