Skip to content

Commit 4259ea9

Browse files
committed
Fix
1 parent 726bc92 commit 4259ea9

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

ydb/core/persqueue/ut/common/autoscaling_ut_common.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ std::shared_ptr<ISimpleBlockingWriteSession> CreateWriteSession(TTopicClient& cl
124124
}
125125

126126

127-
TTestReadSession::TTestReadSession(const TString& name, TTopicClient& client, size_t expectedMessagesCount, bool autoCommit, std::set<ui32> partitions, bool autoscalingSupport) {
127+
TTestReadSession::TTestReadSession(const TString& name, TTopicClient& client, size_t expectedMessagesCount, bool autoCommit, std::set<ui32> partitions, bool autoPartitioningSupport) {
128128
Impl = std::make_shared<TImpl>(name, autoCommit);
129129

130130
Impl->Acquire();
131131

132132
auto readSettings = TReadSessionSettings()
133133
.ConsumerName(TEST_CONSUMER)
134134
.AppendTopics(TEST_TOPIC)
135-
.AutoscalingSupport(autoscalingSupport);
135+
.AutoPartitioningSupport(autoPartitioningSupport);
136136
for (auto partitionId : partitions) {
137137
readSettings.Topics_[0].AppendPartitionIds(partitionId);
138138
}

ydb/core/persqueue/ut/common/autoscaling_ut_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct TTestReadSession {
4242

4343
static constexpr size_t SemCount = 1;
4444

45-
TTestReadSession(const TString& name, TTopicClient& client, size_t expectedMessagesCount = Max<size_t>(), bool autoCommit = true, std::set<ui32> partitions = {}, bool autoscalingSupport = true);
45+
TTestReadSession(const TString& name, TTopicClient& client, size_t expectedMessagesCount = Max<size_t>(), bool autoCommit = true, std::set<ui32> partitions = {}, bool AutoPartitioningSupport = true);
4646

4747
void WaitAllMessages();
4848

ydb/public/sdk/cpp/client/ydb_topic/impl/read_session_impl.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ inline void TSingleClusterReadSessionImpl<false>::InitImpl(TDeferredActions<fals
485485
auto& init = *req.mutable_init_request();
486486

487487
init.set_consumer(Settings.ConsumerName_);
488-
init.set_autoscaling_support(Settings.AutoscalingSupport_);
488+
init.set_auto_partitioning_support(Settings.AutoPartitioningSupport_);
489489

490490
for (const TTopicReadSettings& topic : Settings.Topics_) {
491491
auto* topicSettings = init.add_topics_read_settings();

ydb/public/sdk/cpp/client/ydb_topic/include/control_plane.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ struct TAlterPartitioningSettings;
158158
struct TAlterTopicSettings;
159159

160160
struct TAutoPartitioningSettings {
161-
friend struct TAutoscalingSettingsBuilder;
161+
friend struct TAutoPartitioningSettingsBuilder;
162162
public:
163163
TAutoPartitioningSettings()
164164
: Strategy_(EAutoPartitioningStrategy::Disabled)
@@ -566,10 +566,10 @@ struct TCreateTopicSettings : public TOperationRequestSettings<TCreateTopicSetti
566566
TPartitioningSettingsBuilder BeginConfigurePartitioningSettings();
567567
};
568568

569-
struct TAutoscalingSettingsBuilder {
570-
using TSelf = TAutoscalingSettingsBuilder;
569+
struct TAutoPartitioningSettingsBuilder {
570+
using TSelf = TAutoPartitioningSettingsBuilder;
571571
public:
572-
TAutoscalingSettingsBuilder(TPartitioningSettingsBuilder& parent, TAutoPartitioningSettings& settings): Parent_(parent), Settings_(settings) {}
572+
TAutoPartitioningSettingsBuilder(TPartitioningSettingsBuilder& parent, TAutoPartitioningSettings& settings): Parent_(parent), Settings_(settings) {}
573573

574574
TSelf Strategy(EAutoPartitioningStrategy value) {
575575
Settings_.Strategy_ = value;
@@ -615,7 +615,7 @@ struct TPartitioningSettingsBuilder {
615615
return *this;
616616
}
617617

618-
TAutoscalingSettingsBuilder BeginConfigureAutoPartitioningSettings() {
618+
TAutoPartitioningSettingsBuilder BeginConfigureAutoPartitioningSettings() {
619619
return {*this, Parent_.PartitioningSettings_.AutoPartitioningSettings_};
620620
}
621621

ydb/public/sdk/cpp/client/ydb_topic/include/read_session.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ struct TReadSessionSettings: public TRequestSettings<TReadSessionSettings> {
193193

194194
FLUENT_SETTING_DEFAULT(TDuration, ConnectTimeout, TDuration::Seconds(30));
195195

196-
//! AutoscalingSupport.
197-
FLUENT_SETTING_DEFAULT(bool, AutoscalingSupport, false);
196+
//! AutoPartitioningSupport.
197+
FLUENT_SETTING_DEFAULT(bool, AutoPartitioningSupport, false);
198198

199199
//! Log.
200200
FLUENT_SETTING_OPTIONAL(TLog, Log);

ydb/services/persqueue_v1/actors/read_session_actor.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ TReadSessionActor<UseMigrationProtocol>::TReadSessionActor(
5959
, ReadsInfly(0)
6060
, TopicsHandler(topicsHandler)
6161
, DirectRead(false)
62-
, AutoscalingSupport(false)
62+
, AutoPartitioningSupport(false)
6363
{
6464
Y_ASSERT(Request);
6565
}
@@ -758,7 +758,7 @@ void TReadSessionActor<UseMigrationProtocol>::Handle(typename TEvReadInit::TPtr&
758758
if (init.reader_name()) {
759759
PeerName = init.reader_name();
760760
}
761-
AutoscalingSupport = init.auto_partitioning_support();
761+
AutoPartitioningSupport = init.auto_partitioning_support();
762762
}
763763

764764
if (MaxTimeLagMs < 0) {
@@ -2327,10 +2327,10 @@ void TReadSessionActor<UseMigrationProtocol>::Handle(TEvPQProxy::TEvReadingFinis
23272327
}
23282328

23292329
auto& topic = it->second;
2330-
NTabletPipe::SendData(ctx, topic.PipeClient, new TEvPersQueue::TEvReadingPartitionFinishedRequest(ClientId, msg->PartitionId, AutoscalingSupport, msg->FirstMessage));
2330+
NTabletPipe::SendData(ctx, topic.PipeClient, new TEvPersQueue::TEvReadingPartitionFinishedRequest(ClientId, msg->PartitionId, AutoPartitioningSupport, msg->FirstMessage));
23312331

23322332
if constexpr (!UseMigrationProtocol) {
2333-
if (AutoscalingSupport) {
2333+
if (AutoPartitioningSupport) {
23342334
TPartitionActorInfo* partitionInfo = nullptr;
23352335
for (auto& [_, p] : Partitions) {
23362336
if (p.Partition.Partition == msg->PartitionId) {

ydb/services/persqueue_v1/actors/read_session_actor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ class TReadSessionActor
451451
NPersQueue::TTopicsToConverter TopicsList;
452452

453453
bool DirectRead;
454-
bool AutoscalingSupport;
454+
bool AutoPartitioningSupport;
455455
};
456456

457457
}

0 commit comments

Comments
 (0)