Merge db67711 into 064fd75

ydb-platform · Sep 17, 2024 · 9cc5a80 · 9cc5a80
2 parents 064fd75 + db67711
commit 9cc5a80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ydb/services/lib/actors/pq_schema_actor.cpp b/ydb/services/lib/actors/pq_schema_actor.cpp
@@ -688,9 +688,6 @@ namespace NKikimr::NGRpcProxy::V1 {
         if (!config.HasPartitionStrategy()) {
             return std::nullopt;
         }
-        if (::NKikimrPQ::TPQTabletConfig_TPartitionStrategyType::TPQTabletConfig_TPartitionStrategyType_DISABLED == config.GetPartitionStrategy().GetPartitionStrategyType()) {
-            return std::nullopt;
-        }
         auto strategy = config.GetPartitionStrategy();
         if (strategy.GetMinPartitionCount() < 0) {
             error = TStringBuilder() << "Partitions count must be non-negative, provided " << strategy.GetMinPartitionCount();
@@ -1098,7 +1095,10 @@ namespace NKikimr::NGRpcProxy::V1 {
                 return TYdbPqCodes(Ydb::StatusIds::BAD_REQUEST, Ydb::PersQueue::ErrorCode::VALIDATION_ERROR);
             }
             minParts = std::max<ui32>(1, settings.min_active_partitions());
-            if (appData->FeatureFlags.GetEnableTopicSplitMerge() && request.has_partitioning_settings()) {
+            if (appData->FeatureFlags.GetEnableTopicSplitMerge() &&
+                request.partitioning_settings().has_auto_partitioning_settings() &&
+                request.partitioning_settings().auto_partitioning_settings().strategy() != ::Ydb::Topic::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED) {
+
                 auto pqTabletConfigPartStrategy = pqTabletConfig->MutablePartitionStrategy();
                 auto autoscaleSettings = settings.auto_partitioning_settings();
                 pqTabletConfigPartStrategy->SetMinPartitionCount(minParts);

diff --git a/ydb/services/persqueue_v1/topic_yql_ut.cpp b/ydb/services/persqueue_v1/topic_yql_ut.cpp
@@ -35,7 +35,8 @@ Y_UNIT_TEST_SUITE(TTopicYqlTest) {
             CREATE TOPIC `/Root/PQ/rt3.dc1--legacy--topic1` (
                 CONSUMER c1
             ) WITH (min_active_partitions = 2,
-                    partition_count_limit = 5
+                    partition_count_limit = 5,
+                    auto_partitioning_strategy = 'scale_up'
             );
         )__";