Update before rebased

Author: Pavel Velikhov

ydb/core/kqp/compile_service/kqp_compile_actor.cpp

@@ -709,6 +709,15 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
             kqpConfig.DefaultHashShuffleFuncType = NYql::NDq::EHashShuffleFuncType::HashV2;
             break;
     }
+
+    switch(serviceConfig.GetBackportMode()) {
+        case NKikimrConfig::TTableServiceConfig_EBackportMode_Released:
+            kqpConfig.BackportMode = NYql::EBackportCompatibleFeaturesMode::Released;
+            break;
+        case NKikimrConfig::TTableServiceConfig_EBackportMode_All:
+            kqpConfig.BackportMode = NYql::EBackportCompatibleFeaturesMode::All;
+            break;
+    }
 }
 
 IActor* CreateKqpCompileActor(const TActorId& owner, const TKqpSettings::TConstPtr& kqpSettings,

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

@@ -69,6 +69,7 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
     Y_UNIT_TEST(Select) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
+        appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
         TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
@@ -84,6 +85,7 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
     Y_UNIT_TEST(Filter) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
+        appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
         TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
@@ -140,6 +142,7 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
     Y_UNIT_TEST(ConstantFolding) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
+        appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
         TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();

ydb/core/protos/table_service_config.proto

@@ -437,4 +437,11 @@ message TTableServiceConfig {
     optional bool EnableDqHashCombineByDefault = 105 [default = true, (InvalidateCompileCache) = true];
 
     optional bool EnableBuildAggregationResultStages = 106 [default = true, (InvalidateCompileCache) = true];
+
+    enum EBackportMode {
+        Released = 0;
+        All = 1;
+    }
+
+    optional EBackportMode BackportMode = 107 [ default = Released, (InvalidateCompileCache) = true];
 };

yql/essentials/sql/v1/sql_query.cpp

@@ -266,19 +266,19 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
                 return false;
             }
 
-            if (Ctx_.YqlSelectMode != EYqlSelectMode::Disable) {
-                //if (!IsBackwardCompatibleFeatureAvailable(MakeLangVersion(2025, 04))) {
-                //    Error() << "YqlSelect is not available before 2025.04";
-                //    return false;
-                //}
+            if (Ctx_.GetYqlSelectMode() != EYqlSelectMode::Disable) {
+                if (!IsBackwardCompatibleFeatureAvailable(MakeLangVersion(2025, 04))) {
+                    Error() << "YqlSelect is not available before 2025.04";
+                    return false;
+                }
 
                 const auto stmt = core.GetAlt_sql_stmt_core2().GetRule_select_stmt1();
                 if (auto result = BuildYqlSelect(Ctx_, Mode_, stmt)) {
                     blocks.emplace_back(std::move(*result));
                     break;
                 } else if (
                     result.error() == EYqlSelectError::Unsupported &&
-                    Ctx_.YqlSelectMode == EYqlSelectMode::Force)
+                    Ctx_.GetYqlSelectMode() == EYqlSelectMode::Force)
                 {
                     Error() << "Translation of the statement "
                             << "to YqlSelect was forced, but unsupported";
@@ -672,6 +672,28 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
                 return false;
             }
 
+            if (Ctx_.GetYqlSelectMode() != EYqlSelectMode::Disable) {
+                const auto langVer = GetMaxLangVersion();
+                if (!IsBackwardCompatibleFeatureAvailable(langVer)) {
+                    Error() << "YqlSelect is not available before "
+                            << FormatLangVersion(langVer);
+                    return false;
+                }
+
+                const auto stmt = core.GetAlt_sql_stmt_core21().GetRule_values_stmt1();
+                if (auto result = BuildYqlSelect(Ctx_, Mode_, stmt)) {
+                    blocks.emplace_back(std::move(*result));
+                    break;
+                } else if (
+                    result.error() == EYqlSelectError::Unsupported &&
+                    Ctx_.GetYqlSelectMode() == EYqlSelectMode::Force)
+                {
+                    Error() << "Translation of the statement "
+                            << "to YqlSelect was forced, but unsupported";
+                    return false;
+                }
+            }
+
             Ctx_.BodyPart();
             TSqlValues values(Ctx_, Mode_);
             TPosition pos;
@@ -3541,6 +3563,14 @@ THashMap<TString, TPragmaDescr> PragmaDescrs{
     }),
     TableElemExt("YqlSelect", [](CB_SIG) -> TMaybe<TNodePtr> {
         auto& ctx = query.Context();
+        if (!IsBackwardCompatibleFeatureAvailable(
+                ctx.Settings.LangVer,
+                MakeLangVersion(2025, 04),
+                ctx.Settings.BackportMode))
+        {
+            query.Error() << "YqlSelect is not available before 2025.04";
+            return Nothing();
+        }
 
         const TString* literal = values.size() == 1 ? values[0].GetLiteral() : nullptr;
         if (!literal) {
@@ -3549,19 +3579,17 @@ THashMap<TString, TPragmaDescr> PragmaDescrs{
         }
 
         if (*literal == "disable") {
-            ctx.YqlSelectMode = EYqlSelectMode::Disable;
+            ctx.SetYqlSelectMode(EYqlSelectMode::Disable);
         } else if (*literal == "auto") {
-            ctx.YqlSelectMode = EYqlSelectMode::Auto;
+            ctx.SetYqlSelectMode(EYqlSelectMode::Auto);
         } else if (*literal == "force") {
-            ctx.YqlSelectMode = EYqlSelectMode::Force;
+            ctx.SetYqlSelectMode(EYqlSelectMode::Force);
         } else {
             query.Error() << "Unexpected literal '" << *literal << "' for: " << pragma
                           << ", expected 'disable', 'auto' or 'force'";
             return Nothing();
         }
 
-        ctx.DeriveColumnOrder = true;
-
         return TNodePtr();
     }),