ut

Author: niksaveliev

ydb/services/datastreams/datastreams_proxy.cpp

@@ -516,13 +516,15 @@ namespace NKikimr::NDataStreams::V1 {
         if (!GetProtoRequest()->has_partitioning_settings() ||
             (GetProtoRequest()->partitioning_settings().has_auto_partitioning_settings() &&
             GetProtoRequest()->partitioning_settings().auto_partitioning_settings().strategy() ==
-                Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED)) {
+            Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED)) {
+
             if (!ValidateShardsCount(*GetProtoRequest(), pqGroupDescription, error))
             {
                 return ReplyWithError(Ydb::StatusIds::BAD_REQUEST, static_cast<size_t>(NYds::EErrorCodes::BAD_REQUEST), error);
             }
 
             groupConfig.SetTotalGroupCount(GetProtoRequest()->target_shard_count());
+
         } else {
             auto r = ValidatePartitioningSettings(GetProtoRequest()->partitioning_settings());
             if (!r.empty()) {
@@ -535,6 +537,7 @@ namespace NKikimr::NDataStreams::V1 {
             auto& as = s.auto_partitioning_settings();
             switch(as.strategy()) {
                 case Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_UNSPECIFIED:
+                    break;
                 case Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED:
                 case Ydb::DataStreams::V1::AutoPartitioningStrategy::AutoPartitioningStrategy_INT_MAX_SENTINEL_DO_NOT_USE_:
                 case Ydb::DataStreams::V1::AutoPartitioningStrategy::AutoPartitioningStrategy_INT_MIN_SENTINEL_DO_NOT_USE_:

ydb/services/datastreams/datastreams_ut.cpp

@@ -2706,7 +2706,6 @@ Y_UNIT_TEST_SUITE(DataStreams) {
 
         TString streamName = "test-topic";
         TString streamName2 = "test-topic-2";
-
         {
             NYdb::NTopic::TTopicClient pqClient(*testServer.Driver);
             auto settings = NYdb::NTopic::TCreateTopicSettings()
@@ -2807,6 +2806,67 @@ Y_UNIT_TEST_SUITE(DataStreams) {
             UNIT_ASSERT_VALUES_EQUAL(description.shards(4).parent_shard_id(), "shard-000001");
         }
 
+        auto streamForAlterTest = "stream-alter-test";
+        {
+            auto result = testServer.DataStreamsClient->CreateStream(streamForAlterTest,
+                NYDS_V1::TCreateStreamSettings()
+                    .ShardCount(3)
+                ).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
+            if (result.GetStatus() != EStatus::SUCCESS) {
+                result.GetIssues().PrintTo(Cerr);
+            }
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+        }
+
+        {
+            auto result = testServer.DataStreamsClient->DescribeStream(streamForAlterTest).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
+            Cerr << result.GetIssues().ToString() << "\n";
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+
+            auto& d = result.GetResult().stream_description();
+            UNIT_ASSERT_VALUES_EQUAL(d.shards().size(), 3);
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_status(), YDS_V1::StreamDescription::ACTIVE);
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_name(), streamForAlterTest);
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_arn(), streamForAlterTest);
+
+            UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().strategy(), ::Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED);
+        }
+
+        {
+            auto result = testServer.DataStreamsClient->UpdateStream(streamForAlterTest,
+                 NYDS_V1::TUpdateStreamSettings()
+                    .TargetShardCount(5)
+                    .BeginConfigurePartitioningSettings()
+                        .BeginConfigureAutoPartitioningSettings()
+                            .Strategy(NYdb::NDataStreams::V1::EAutoPartitioningStrategy::Disabled)
+                        .EndConfigureAutoPartitioningSettings()
+                    .EndConfigurePartitioningSettings()
+                ).ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
+            if (result.GetStatus() != EStatus::SUCCESS) {
+                result.GetIssues().PrintTo(Cerr);
+            }
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+        }
+
+        {
+            auto result = testServer.DataStreamsClient->DescribeStream(streamForAlterTest).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
+            Cerr << result.GetIssues().ToString() << "\n";
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+
+            auto& d = result.GetResult().stream_description();
+            UNIT_ASSERT_VALUES_EQUAL(d.shards().size(), 5);
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_status(), YDS_V1::StreamDescription::ACTIVE);
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_name(), streamForAlterTest);
+            UNIT_ASSERT_VALUES_EQUAL(d.stream_arn(), streamForAlterTest);
+
+            UNIT_ASSERT_VALUES_EQUAL(d.partitioning_settings().auto_partitioning_settings().strategy(), ::Ydb::DataStreams::V1::AutoPartitioningStrategy::AUTO_PARTITIONING_STRATEGY_DISABLED);
+        }
+
         {
             auto result = testServer.DataStreamsClient->CreateStream(streamName2,
                 NYDS_V1::TCreateStreamSettings()