Skip to content

Commit c1313ff

Browse files
committed
Fix unit
1 parent 4f38b65 commit c1313ff

File tree

3 files changed

+36
-17
lines changed

3 files changed

+36
-17
lines changed

ydb/_grpc/grpcwrapper/ydb_topic.py

+12-7
Original file line numberDiff line numberDiff line change
@@ -1090,10 +1090,15 @@ class AlterPartitioningSettings(IToProto):
10901090
alter_auto_partitioning_settings: Optional[AlterAutoPartitioningSettings]
10911091

10921092
def to_proto(self) -> ydb_topic_pb2.AlterPartitioningSettings:
1093+
alter_auto_partitioning_settings = None
1094+
if self.alter_auto_partitioning_settings is not None:
1095+
alter_auto_partitioning_settings = self.alter_auto_partitioning_settings.to_proto()
1096+
10931097
return ydb_topic_pb2.AlterPartitioningSettings(
10941098
set_min_active_partitions=self.set_min_active_partitions,
10951099
set_partition_count_limit=self.set_partition_count_limit,
10961100
set_max_active_partitions=self.set_max_active_partitions,
1101+
alter_auto_partitioning_settings=alter_auto_partitioning_settings,
10971102
)
10981103

10991104

@@ -1109,12 +1114,12 @@ def from_public(
11091114
if not settings:
11101115
return None
11111116

1112-
return AutoPartitioningSettings(
1113-
strategy=settings.set_strategy,
1114-
partition_write_speed=AlterAutoPartitioningWriteSpeedStrategy(
1115-
stabilization_window=settings.set_stabilization_window,
1116-
up_utilization_percent=settings.set_up_utilization_percent,
1117-
down_utilization_percent=settings.set_down_utilization_percent,
1117+
return AlterAutoPartitioningSettings(
1118+
set_strategy=settings.set_strategy,
1119+
set_partition_write_speed=AlterAutoPartitioningWriteSpeedStrategy(
1120+
set_stabilization_window=settings.set_stabilization_window,
1121+
set_up_utilization_percent=settings.set_up_utilization_percent,
1122+
set_down_utilization_percent=settings.set_down_utilization_percent,
11181123
),
11191124
)
11201125

@@ -1295,7 +1300,7 @@ def from_public(req: ydb_topic_public_types.AlterTopicRequestParams) -> AlterTop
12951300

12961301
alter_auto_partitioning_settings = None
12971302
if req.alter_auto_partitioning_settings is not None:
1298-
alter_auto_partitioning_settings = AutoPartitioningSettings.from_public(
1303+
alter_auto_partitioning_settings = AlterAutoPartitioningSettings.from_public(
12991304
req.alter_auto_partitioning_settings
13001305
)
13011306

ydb/_grpc/grpcwrapper/ydb_topic_public_types.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ class PublicAutoPartitioningStrategy(IntEnum):
8282

8383
@dataclass
8484
class PublicAutoPartitioningSettings:
85-
strategy: Optional["PublicAutoPartitioningStrategy"]
86-
stabilization_window: Optional[datetime.timedelta]
87-
up_utilization_percent: Optional[int]
88-
down_utilization_percent: Optional[int]
85+
strategy: Optional["PublicAutoPartitioningStrategy"] = 0
86+
stabilization_window: Optional[datetime.timedelta] = None
87+
up_utilization_percent: Optional[int] = None
88+
down_utilization_percent: Optional[int] = None
8989

9090

9191
@dataclass
9292
class PublicAlterAutoPartitioningSettings:
93-
set_strategy: Optional["PublicAutoPartitioningStrategy"]
94-
set_stabilization_window: Optional[datetime.timedelta]
95-
set_up_utilization_percent: Optional[int]
96-
set_down_utilization_percent: Optional[int]
93+
set_strategy: Optional["PublicAutoPartitioningStrategy"] = 0
94+
set_stabilization_window: Optional[datetime.timedelta] = None
95+
set_up_utilization_percent: Optional[int] = None
96+
set_down_utilization_percent: Optional[int] = None
9797

9898

9999
@dataclass

ydb/_grpc/grpcwrapper/ydb_topic_test.py

+16-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
from .ydb_topic_public_types import (
88
AlterTopicRequestParams,
99
PublicAlterConsumer,
10+
PublicAlterAutoPartitioningSettings,
11+
PublicAutoPartitioningStrategy,
1012
PublicConsumer,
1113
PublicCodec,
1214
)
@@ -51,7 +53,11 @@ def test_alter_topic_request_from_public_to_proto():
5153
"alter_attributes": {"key": "value"},
5254
"set_metering_mode": 1,
5355
"set_min_active_partitions": 2,
54-
"set_partition_count_limit": 4,
56+
"set_max_active_partitions": 8,
57+
"set_partition_count_limit": 10,
58+
"alter_auto_partitioning_settings": PublicAlterAutoPartitioningSettings(
59+
set_strategy=PublicAutoPartitioningStrategy.DISABLED,
60+
),
5561
}
5662

5763
params_public = AlterTopicRequestParams(**params)
@@ -62,7 +68,15 @@ def test_alter_topic_request_from_public_to_proto():
6268

6369
expected_dict = {
6470
"path": "topic_name",
65-
"alter_partitioning_settings": {"set_min_active_partitions": "2", "set_partition_count_limit": "4"},
71+
"alter_partitioning_settings": {
72+
"set_min_active_partitions": "2",
73+
"set_max_active_partitions": "8",
74+
"set_partition_count_limit": "10",
75+
"alter_auto_partitioning_settings": {
76+
"set_strategy": "AUTO_PARTITIONING_STRATEGY_DISABLED",
77+
"set_partition_write_speed": {},
78+
},
79+
},
6680
"set_retention_period": "2419200s",
6781
"set_retention_storage_mb": "4",
6882
"set_supported_codecs": {"codecs": [1, 2]},

0 commit comments

Comments
 (0)