Skip to content

Commit 44606a1

Browse files
committed
[dq] Separate setting SplitStageOnDqReplicate (YQL-17382)
1 parent 1f95d62 commit 44606a1

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

ydb/library/yql/cfg/tests/gateways.conf

+5
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ Dq {
188188
Name: "UseWideChannels"
189189
Value: "true"
190190
}
191+
192+
DefaultSettings {
193+
Name: "SplitStageOnDqReplicate"
194+
Value: "true"
195+
}
191196
}
192197

193198
Fs {

ydb/library/yql/providers/dq/common/yql_dq_settings.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,18 @@ TDqConfiguration::TDqConfiguration() {
8383
.ValueSetter([this](const TString&, TDqSettings::ESpillingEngine value) {
8484
SpillingEngine = value;
8585
if (value != TDqSettings::ESpillingEngine::Disable) {
86+
SplitStageOnDqReplicate = false;
8687
EnableDqReplicate = true;
8788
}
8889
});
8990
REGISTER_SETTING(*this, DisableLLVMForBlockStages);
91+
REGISTER_SETTING(*this, SplitStageOnDqReplicate)
92+
.ValueSetter([this](const TString&, bool value) {
93+
SplitStageOnDqReplicate = value;
94+
if (!value) {
95+
EnableDqReplicate = true;
96+
}
97+
});
9098
}
9199

92100
} // namespace NYql

ydb/library/yql/providers/dq/common/yql_dq_settings.h

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ struct TDqSettings {
127127
NCommon::TConfSetting<bool, false> UseBlockReader;
128128
NCommon::TConfSetting<ESpillingEngine, false> SpillingEngine;
129129
NCommon::TConfSetting<bool, false> DisableLLVMForBlockStages;
130+
NCommon::TConfSetting<bool, false> SplitStageOnDqReplicate;
130131

131132
// This options will be passed to executor_actor and worker_actor
132133
template <typename TProtoConfig>

ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ struct TDqsPipelineConfigurator : public IPipelineConfigurator {
266266
}
267267
pipeline->Add(
268268
NDq::CreateDqBuildPhyStagesTransformer(
269-
State_->Settings->SpillingEngine.Get().GetOrElse(TDqSettings::TDefault::SpillingEngine) != TDqSettings::ESpillingEngine::Disable,
269+
!State_->Settings->SplitStageOnDqReplicate.Get().GetOrElse(true),
270270
*pipeline->GetTypeAnnotationContext(), mode
271271
),
272272
"BuildPhy");

0 commit comments

Comments
 (0)