Ignore auto partitioning fields if disabled (#9312)

Author: niksaveliev

ydb/core/kafka_proxy/actors/kafka_list_offsets_actor.cpp

@@ -33,9 +33,9 @@ void TKafkaListOffsetsActor::SendOffsetsRequests(const NActors::TActorContext& c
     for (size_t i = 0; i < ListOffsetsRequestData->Topics.size(); ++i) {
         auto &requestTopic = ListOffsetsRequestData->Topics[i];
         auto &responseTopic = ListOffsetsResponseData->Topics[i];
-        
+
         responseTopic = TListOffsetsResponseData::TListOffsetsTopicResponse{};
-        
+
         if (!requestTopic.Name.has_value()) {
             HandleMissingTopicName(requestTopic, responseTopic);
             continue;
@@ -44,7 +44,7 @@ void TKafkaListOffsetsActor::SendOffsetsRequests(const NActors::TActorContext& c
         responseTopic.Name = requestTopic.Name;
         TTopicRequestInfo topicRequestInfo;
         topicRequestInfo.TopicIndex = i;
-        
+
         for (auto& partition: requestTopic.Partitions) {
             topicRequestInfo.Partitions.push_back(TPartitionRequestInfo{.PartitionId = partition.PartitionIndex, .Timestamp = partition.Timestamp});
         }
@@ -65,7 +65,7 @@ void TKafkaListOffsetsActor::HandleMissingTopicName(const TListOffsetsRequestDat
 
 TActorId TKafkaListOffsetsActor::SendOffsetsRequest(const TListOffsetsRequestData::TListOffsetsTopic& topic, const NActors::TActorContext&) {
     KAFKA_LOG_D("ListOffsets actor: Get offsets for topic '" << topic.Name << "' for user '" << Context->UserToken->GetUserSID() << "'");
-    
+
     TEvKafka::TGetOffsetsRequest offsetsRequest;
     offsetsRequest.Topic = NormalizePath(Context->DatabasePath, topic.Name.value());
     offsetsRequest.Token = Context->UserToken->GetSerializedToken();
@@ -83,7 +83,7 @@ void TKafkaListOffsetsActor::Handle(TEvKafka::TEvTopicOffsetsResponse::TPtr& ev,
     --PendingResponses;
     auto it = TopicsRequestsInfo.find(ev->Sender);
 
-    Y_DEBUG_ABORT_UNLESS(it != TopicsRequestsInfo.end()); 
+    Y_DEBUG_ABORT_UNLESS(it != TopicsRequestsInfo.end());
     if (it == TopicsRequestsInfo.end()) {
         KAFKA_LOG_CRIT("ListOffsets actor: received unexpected TEvTopicOffsetsResponse. Ignoring.");
         return RespondIfRequired(ctx);
@@ -110,15 +110,15 @@ void TKafkaListOffsetsActor::Handle(TEvKafka::TEvTopicOffsetsResponse::TPtr& ev,
             auto& responseFromPQPartition = it->second;
             responsePartition.LeaderEpoch = responseFromPQPartition.Generation;
             responsePartition.Timestamp = TIMESTAMP_DEFAULT_RESPONSE_VALUE;
-            
+
             if (partitionRequestInfo.Timestamp == TIMESTAMP_START_OFFSET) {
                 responsePartition.Offset = responseFromPQPartition.StartOffset;
                 responsePartition.ErrorCode = NONE_ERROR;
             } else if (partitionRequestInfo.Timestamp == TIMESTAMP_END_OFFSET) {
                 responsePartition.Offset = responseFromPQPartition.EndOffset;
                 responsePartition.ErrorCode = NONE_ERROR;
             } else {
-                responsePartition.ErrorCode = INVALID_REQUEST; // FIXME(savnik): handle it
+                responsePartition.ErrorCode = INVALID_REQUEST; // FIXME(savnik): handle
                 ErrorCode = INVALID_REQUEST;
             }
         } else {

ydb/services/lib/actors/pq_schema_actor.cpp

@@ -597,9 +597,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();
@@ -1007,7 +1004,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);

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'
             );
         )__";