Got it all working

Author: Pavel Velikhov

ydb/core/kqp/host/kqp_translate.cpp

@@ -187,6 +187,7 @@ TKqpTranslationSettingsBuilder& TKqpTranslationSettingsBuilder::SetFromConfig(co
     // only options that should be specified for all types of queries
     // including views and etc..
     SetLangVer(config.LangVer);
+    SetBackportMode(config.BackportMode);
     SetIsAmbiguityError(config.Antlr4ParserIsAmbiguityError);
     return *this;
 }

ydb/core/kqp/host/kqp_translate.h

@@ -151,6 +151,11 @@ class TKqpTranslationSettingsBuilder {
         return *this;
     }
 
+    TKqpTranslationSettingsBuilder& SetBackportMode(NYql::EBackportCompatibleFeaturesMode backportMode) {
+        BackportMode = backportMode;
+        return *this;
+    }
+
     TKqpTranslationSettingsBuilder& SetIsAmbiguityError(bool isAmbiguityError) {
         IsAmbiguityError = isAmbiguityError;
         return *this;

ydb/core/kqp/opt/rbo/kqp_rbo_transformer.cpp

@@ -14,7 +14,12 @@ namespace {
 TExprNode::TPtr PushTakeIntoPlan(const TExprNode::TPtr &node, TExprContext &ctx, const TTypeAnnotationContext &typeCtx) {
     Y_UNUSED(typeCtx);
     auto take = TCoTake(node);
-    if (auto root = take.Input().Maybe<TKqpOpRoot>()) {
+    auto takeInput = take.Input();
+    if (takeInput.Maybe<TCoUnordered>()) {
+        takeInput = takeInput.Cast<TCoUnordered>().Input();
+    }
+
+    if (auto root = takeInput.Maybe<TKqpOpRoot>()) {
         // clang-format off
         return Build<TKqpOpRoot>(ctx, node->Pos())
             .Input<TKqpOpLimit>()

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

@@ -86,6 +86,8 @@ Y_UNIT_TEST_SUITE(KqpRboYql) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetEnableNewRBO(true);
         appConfig.MutableTableServiceConfig()->SetBackportMode(NKikimrConfig::TTableServiceConfig_EBackportMode_All);
+        appConfig.MutableTableServiceConfig()->SetDefaultLangVer(NYql::GetMaxLangVersion());
+
         TKikimrRunner kikimr(NKqp::TKikimrSettings(appConfig).SetWithSampleTables(false));
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();