Moved commit "Fix pqv1 max partitions" from ydb repo

niksaveliev · Gazizonoki · commit 767e86b00d9a · 2024-09-18T19:53:32.000+03:00
diff --git a/src/client/persqueue_public/impl/persqueue_impl.h b/src/client/persqueue_public/impl/persqueue_impl.h
@@ -57,7 +57,7 @@ class TPersQueueClient::TImpl : public TClientImplCommon<TPersQueueClient::TImpl
 
         bool autoPartitioningSettingsDefined = false;
         if (settings.MaxPartitionsCount_.has_value()) {
-            props.mutable_auto_partitioning_settings()->set_max_active_partitions(settings.PartitionsCount_);
+            props.mutable_auto_partitioning_settings()->set_max_active_partitions(*settings.MaxPartitionsCount_);
             autoPartitioningSettingsDefined = true;
         }
         if (settings.AutoPartitioningStrategy_.has_value()) {
@@ -77,9 +77,7 @@ class TPersQueueClient::TImpl : public TClientImplCommon<TPersQueueClient::TImpl
             autoPartitioningSettingsDefined = true;
         }
 
-        if (!autoPartitioningSettingsDefined) {
-            props.set_partitions_count(settings.PartitionsCount_);
-        } else {
+        if (autoPartitioningSettingsDefined) {
             props.mutable_auto_partitioning_settings()->set_min_active_partitions(settings.PartitionsCount_);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class TPersQueueClient::TImpl : public TClientImplCommon<TPersQueueClient::TImpl`
`57`	`57`
`58`	`58`	`bool autoPartitioningSettingsDefined = false;`
`59`	`59`	`if (settings.MaxPartitionsCount_.has_value()) {`
`60`		`- props.mutable_auto_partitioning_settings()->set_max_active_partitions(settings.PartitionsCount_);`
	`60`	`+ props.mutable_auto_partitioning_settings()->set_max_active_partitions(*settings.MaxPartitionsCount_);`
`61`	`61`	`autoPartitioningSettingsDefined = true;`
`62`	`62`	`}`
`63`	`63`	`if (settings.AutoPartitioningStrategy_.has_value()) {`
`@@ -77,9 +77,7 @@ class TPersQueueClient::TImpl : public TClientImplCommon<TPersQueueClient::TImpl`
`77`	`77`	`autoPartitioningSettingsDefined = true;`
`78`	`78`	`}`
`79`	`79`
`80`		`- if (!autoPartitioningSettingsDefined) {`
`81`		`- props.set_partitions_count(settings.PartitionsCount_);`
`82`		`- } else {`
	`80`	`+ if (autoPartitioningSettingsDefined) {`
`83`	`81`	`props.mutable_auto_partitioning_settings()->set_min_active_partitions(settings.PartitionsCount_);`
`84`	`82`	`}`
`85`	`83`