Merge 07dfc23 into 9785f6a

Author: gridnevvvit

ydb/core/kqp/provider/yql_kikimr_settings.cpp

@@ -34,8 +34,7 @@ ui64 ParseEnableSpillingNodes(const TString &v) {
         if (s.empty()) {
             throw yexception() << "Empty value item";
         }
-        auto value = FromStringWithDefault<NYql::TDqSettings::EEnabledSpillingNodes>(
-            s, NYql::TDqSettings::EEnabledSpillingNodes::None);
+        auto value = FromString<NYql::TDqSettings::EEnabledSpillingNodes>(s);
         res |= ui64(value);
     }
     return res;

ydb/core/kqp/ut/spilling/kqp_scan_spilling_ut.cpp

@@ -54,6 +54,24 @@ NKikimrConfig::TAppConfig AppCfgLowComputeLimits(ui64 reasonableTreshold) {
 
 Y_UNIT_TEST_SUITE(KqpScanSpilling) {
 
+Y_UNIT_TEST(SpillingPragmaParseError) {
+    Cerr << "cwd: " << NFs::CurrentWorkingDirectory() << Endl;
+    TKikimrRunner kikimr(AppCfg());
+
+    auto db = kikimr.GetQueryClient();
+    auto query = R"(
+        --!syntax_v1
+        PRAGMA ydb.EnableSpillingNodes="GraceJoin1";
+        select t1.Key, t1.Value, t2.Key, t2.Value
+        from `/Root/KeyValue` as t1 full join `/Root/KeyValue` as t2 on t1.Value = t2.Value
+        order by t1.Value
+    )";
+
+    auto explainMode = NYdb::NQuery::TExecuteQuerySettings().ExecMode(NYdb::NQuery::EExecMode::Explain);
+    auto planres = db.ExecuteQuery(query, NYdb::NQuery::TTxControl::NoTx(), explainMode).ExtractValueSync();
+    UNIT_ASSERT_VALUES_EQUAL_C(planres.GetStatus(), EStatus::GENERIC_ERROR, planres.GetIssues().ToString());
+}
+
 Y_UNIT_TEST_TWIN(SpillingInRuntimeNodes, EnabledSpilling) {
     ui64 reasonableTreshold = EnabledSpilling ? 100 : 200_MB;
     Cerr << "cwd: " << NFs::CurrentWorkingDirectory() << Endl;

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

@@ -110,7 +110,7 @@ TDqConfiguration::TDqConfiguration() {
                 if (s.empty()) {
                     throw yexception() << "Empty value item";
                 }
-                auto value = FromStringWithDefault<EEnabledSpillingNodes>(s, EEnabledSpillingNodes::None);
+                auto value = FromString<EEnabledSpillingNodes>(s);
                 res |= ui64(value);
             }
             return res;