aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraidarsamer <aidarsamer@ydb.tech>2023-01-26 16:42:54 +0300
committeraidarsamer <aidarsamer@ydb.tech>2023-01-26 16:42:54 +0300
commit9f52f905a7752f2580018263fee59093b9f6cb10 (patch)
treeff506af98960762437c2d4bb396500dab6b63c70
parenteab9392c527647bbcce377bf3bb3d1cebdf4f70c (diff)
downloadydb-9f52f905a7752f2580018263fee59093b9f6cb10.tar.gz
Add noop pragma KqpPushOlapProcess for backward compatibility
-rw-r--r--ydb/core/kqp/provider/yql_kikimr_settings.cpp2
-rw-r--r--ydb/core/kqp/provider/yql_kikimr_settings.h3
-rw-r--r--ydb/core/kqp/ut/olap/kqp_olap_ut.cpp14
3 files changed, 19 insertions, 0 deletions
diff --git a/ydb/core/kqp/provider/yql_kikimr_settings.cpp b/ydb/core/kqp/provider/yql_kikimr_settings.cpp
index ba0d5420246..4bf25f7e7bd 100644
--- a/ydb/core/kqp/provider/yql_kikimr_settings.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_settings.cpp
@@ -42,6 +42,8 @@ TKikimrConfiguration::TKikimrConfiguration() {
REGISTER_SETTING(*this, _KqpEnableSpilling);
REGISTER_SETTING(*this, _KqpDisableLlvmForUdfStages);
+ REGISTER_SETTING(*this, KqpPushOlapProcess);
+
/* Compile time */
REGISTER_SETTING(*this, _CommitPerShardKeysSizeLimitBytes);
REGISTER_SETTING(*this, _DefaultCluster);
diff --git a/ydb/core/kqp/provider/yql_kikimr_settings.h b/ydb/core/kqp/provider/yql_kikimr_settings.h
index e3d77b239b6..dd83e5e766e 100644
--- a/ydb/core/kqp/provider/yql_kikimr_settings.h
+++ b/ydb/core/kqp/provider/yql_kikimr_settings.h
@@ -31,6 +31,9 @@ struct TKikimrSettings {
NCommon::TConfSetting<bool, false> _KqpEnableSpilling;
NCommon::TConfSetting<bool, false> _KqpDisableLlvmForUdfStages;
+ /* No op just to avoid errors in Cloud Logging until they remove this from their queries */
+ NCommon::TConfSetting<bool, false> KqpPushOlapProcess;
+
/* Compile time */
NCommon::TConfSetting<ui64, false> _CommitPerShardKeysSizeLimitBytes;
NCommon::TConfSetting<TString, false> _DefaultCluster;
diff --git a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
index 063f5d1864b..578571493af 100644
--- a/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
+++ b/ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
@@ -3836,6 +3836,20 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
b << "------------------------------------------------" << Endl;
UNIT_ASSERT_C(falsePositive.empty() && falseNegative.empty(), b);
}
+
+ Y_UNIT_TEST(NoErrorOnLegacyPragma) {
+ TAggregationTestCase testCase;
+ testCase.SetQuery(R"(
+ PRAGMA Kikimr.KqpPushOlapProcess = "false";
+ SELECT id, resource_id FROM `/Root/tableWithNulls`
+ WHERE
+ level = 5;
+ )")
+ .SetExpectedReply("[[[5];#]]")
+ .AddExpectedPlanOptions("KqpOlapFilter");
+
+ TestTableWithNulls({ testCase });
+ }
}
} // namespace NKqp