Skip to content

Commit c119de6

Browse files
author
Pavel Velikhov
committed
Update before rebased
1 parent 8abcdd8 commit c119de6

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

ydb/core/kqp/compile_service/kqp_compile_actor.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,15 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
757757
kqpConfig.DefaultHashShuffleFuncType = NYql::NDq::EHashShuffleFuncType::HashV2;
758758
break;
759759
}
760+
761+
switch(serviceConfig.GetBackportMode()) {
762+
case NKikimrConfig::TTableServiceConfig_EBackportMode_Released:
763+
kqpConfig.BackportMode = NYql::EBackportCompatibleFeaturesMode::Released;
764+
break;
765+
case NKikimrConfig::TTableServiceConfig_EBackportMode_All:
766+
kqpConfig.BackportMode = NYql::EBackportCompatibleFeaturesMode::All;
767+
break;
768+
}
760769
}
761770

762771
IActor* CreateKqpCompileActor(const TActorId& owner, const TKqpSettings::TConstPtr& kqpSettings,

ydb/core/kqp/ut/rbo/kqp_rbo_yql_ut.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
6969
Y_UNIT_TEST(Select) {
7070
NKikimrConfig::TAppConfig appConfig;
7171
appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
72+
appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
7273
TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
7374
auto db = kikimr.GetTableClient();
7475
auto session = db.CreateSession().GetValueSync().GetSession();
@@ -84,6 +85,7 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
8485
Y_UNIT_TEST(Filter) {
8586
NKikimrConfig::TAppConfig appConfig;
8687
appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
88+
appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
8789
TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
8890
auto db = kikimr.GetTableClient();
8991
auto session = db.CreateSession().GetValueSync().GetSession();
@@ -140,6 +142,7 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
140142
Y_UNIT_TEST(ConstantFolding) {
141143
NKikimrConfig::TAppConfig appConfig;
142144
appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
145+
appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
143146
TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
144147
auto db = kikimr.GetTableClient();
145148
auto session = db.CreateSession().GetValueSync().GetSession();

ydb/core/protos/table_service_config.proto

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,4 +439,11 @@ message TTableServiceConfig {
439439
optional bool EnableBuildAggregationResultStages = 106 [default = true, (InvalidateCompileCache) = true];
440440

441441
optional bool EnforceSqlVersionV1 = 107 [default = true, (InvalidateCompileCache) = true];
442+
443+
enum EBackportMode {
444+
Released = 0;
445+
All = 1;
446+
}
447+
448+
optional EBackportMode BackportMode = 108 [ default = Released, (InvalidateCompileCache) = true];
442449
};

0 commit comments

Comments
 (0)