Add EnablePgSyntax (#8796)

shnikd · web-flow · commit 33b9933362dc · 2024-09-06T00:32:55.000+03:00
diff --git a/ydb/core/kqp/compile_service/kqp_compile_actor.cpp b/ydb/core/kqp/compile_service/kqp_compile_actor.cpp
@@ -146,7 +146,8 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
             .SetIsEnableExternalDataSources(AppData(ctx)->FeatureFlags.GetEnableExternalDataSources())
             .SetIsEnablePgConstsToParams(Config->EnablePgConstsToParams)
             .SetApplicationName(ApplicationName)
-            .SetQueryParameters(QueryId.QueryParameterTypes);
+            .SetQueryParameters(QueryId.QueryParameterTypes)
+            .SetIsEnablePgSyntax(AppData(ctx)->FeatureFlags.GetEnablePgSyntax());
 
         return ParseStatements(QueryId.Text, QueryId.Settings.Syntax, QueryId.IsSql(), settingsBuilder, PerStatementResult);
     }
diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp
@@ -1226,7 +1226,8 @@ class TKqpHost : public IKqpHost {
                 .SetIsEnableExternalDataSources(SessionCtx->Config().FeatureFlags.GetEnableExternalDataSources())
                 .SetIsEnablePgConstsToParams(SessionCtx->Config().EnablePgConstsToParams)
                 .SetQueryParameters(query.ParameterTypes)
-                .SetApplicationName(ApplicationName);
+                .SetApplicationName(ApplicationName)
+                .SetIsEnablePgSyntax(SessionCtx->Config().FeatureFlags.GetEnablePgSyntax());
             auto astRes = ParseQuery(query.Text, isSql, sqlVersion, TypesCtx->DeprecatedSQL, ctx, settingsBuilder, result.KeepInCache, result.CommandTagName);
             if (astRes.ActualSyntaxType == NYql::ESyntaxType::Pg) {
                 SessionCtx->Config().IndexAutoChooserMode = NKikimrConfig::TTableServiceConfig_EIndexAutoChooseMode::TTableServiceConfig_EIndexAutoChooseMode_MAX_USED_PREFIX;
diff --git a/ydb/core/kqp/host/kqp_translate.cpp b/ydb/core/kqp/host/kqp_translate.cpp
@@ -86,6 +86,7 @@ NSQLTranslation::TTranslationSettings TKqpTranslationSettingsBuilder::Build(NYql
         settings.SaveWorldDependencies = true;
     }
 
+    settings.PGDisable = !IsEnablePgSyntax;
     settings.InferSyntaxVersion = true;
     settings.V0ForceDisable = false;
     settings.WarnOnV0 = false;
diff --git a/ydb/core/kqp/host/kqp_translate.h b/ydb/core/kqp/host/kqp_translate.h
@@ -62,6 +62,11 @@ class TKqpTranslationSettingsBuilder {
         return *this;
     }
 
+    TKqpTranslationSettingsBuilder& SetIsEnablePgSyntax(bool value) {
+        IsEnablePgSyntax = value;
+        return *this;
+    }
+
 private:
     const NYql::EKikimrQueryType QueryType;
     const ui16 KqpYqlSyntaxVersion;
@@ -73,6 +78,7 @@ class TKqpTranslationSettingsBuilder {
     TString KqpTablePathPrefix = {};
     bool IsEnableExternalDataSources = false;
     bool IsEnablePgConstsToParams = false;
+    bool IsEnablePgSyntax = false;
     TMaybe<bool> SqlAutoCommit = {};
     TGUCSettings::TPtr GUCSettings;
     TMaybe<TString> ApplicationName = {};
diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.cpp b/ydb/core/kqp/ut/common/kqp_ut_common.cpp
@@ -132,6 +132,7 @@ TKikimrRunner::TKikimrRunner(const TKikimrSettings& settings) {
     ServerSettings->SetEnableUniqConstraint(true);
     ServerSettings->SetUseRealThreads(settings.UseRealThreads);
     ServerSettings->SetEnableTablePgTypes(true);
+    ServerSettings->SetEnablePgSyntax(true);
     ServerSettings->S3ActorsFactory = settings.S3ActorsFactory;
 
     if (settings.Storage) {
diff --git a/ydb/core/kqp/ut/pg/kqp_pg_ut.cpp b/ydb/core/kqp/ut/pg/kqp_pg_ut.cpp
@@ -4685,7 +4685,8 @@ Y_UNIT_TEST_SUITE(KqpPg) {
         ui16 mbusport = tp.GetPort(2134);
         auto settings = Tests::TServerSettings(mbusport)
             .SetDomainName("Root")
-            .SetUseRealThreads(false);
+            .SetUseRealThreads(false)
+            .SetEnablePgSyntax(true);
 
         Tests::TServer::TPtr server = new Tests::TServer(settings);
 
diff --git a/ydb/core/protos/feature_flags.proto b/ydb/core/protos/feature_flags.proto
@@ -148,4 +148,5 @@ message TFeatureFlags {
     optional bool EnableChangefeedsOnIndexTables = 134 [default = false];
     optional bool EnableResourcePoolsCounters = 135 [default = false];
     optional bool EnableOptionalColumnsInColumnShard = 136 [default = false];
+    optional bool EnablePgSyntax = 139 [default = true];
 }
diff --git a/ydb/core/testlib/basics/feature_flags.h b/ydb/core/testlib/basics/feature_flags.h
@@ -62,6 +62,7 @@ class TTestFeatureFlagsHolder {
     FEATURE_FLAG_SETTER(EnableTableDatetime64)
     FEATURE_FLAG_SETTER(EnableResourcePools)
     FEATURE_FLAG_SETTER(EnableChangefeedsOnIndexTables)
+    FEATURE_FLAG_SETTER(EnablePgSyntax)
 
     #undef FEATURE_FLAG_SETTER
 };
diff --git a/ydb/library/yql/sql/settings/translation_settings.cpp b/ydb/library/yql/sql/settings/translation_settings.cpp
@@ -57,6 +57,7 @@ namespace NSQLTranslation {
         , InferSyntaxVersion(false)
         , V0Behavior(EV0Behavior::Disable)
         , V0ForceDisable(InTestEnvironment())
+        , PGDisable(false)
         , WarnOnV0(true)
         , V0WarnAsError(ISqlFeaturePolicy::MakeAlwaysDisallow())
         , DqDefaultAuto(ISqlFeaturePolicy::MakeAlwaysDisallow())
diff --git a/ydb/library/yql/sql/settings/translation_settings.h b/ydb/library/yql/sql/settings/translation_settings.h
@@ -105,6 +105,7 @@ namespace NSQLTranslation {
         bool InferSyntaxVersion;
         EV0Behavior V0Behavior;
         bool V0ForceDisable;
+        bool PGDisable;
         bool WarnOnV0;
         ISqlFeaturePolicy::TPtr V0WarnAsError;
         ISqlFeaturePolicy::TPtr DqDefaultAuto;
diff --git a/ydb/library/yql/sql/sql.cpp b/ydb/library/yql/sql/sql.cpp
@@ -34,6 +34,12 @@ namespace NSQLTranslation {
             return result;
         }
 
+        if (parsedSettings.PgParser && parsedSettings.PGDisable) {
+            result.Issues.AddIssue(NYql::YqlIssue(NYql::TPosition(), NYql::TIssuesIds::DEFAULT_ERROR,
+                "PG syntax is disabled"));
+            return result;
+        }
+
         if (parsedSettings.PgParser) {
             return NSQLTranslationPG::PGToYql(query, parsedSettings, stmtParseInfo);
         }
@@ -184,6 +190,12 @@ namespace NSQLTranslation {
             return {};
         }
 
+        if (parsedSettings.PgParser && parsedSettings.PGDisable) {
+            issues.AddIssue(NYql::YqlIssue(NYql::TPosition(), NYql::TIssuesIds::DEFAULT_ERROR,
+                "PG syntax is disabled"));
+            return result;
+        }
+
         if (parsedSettings.PgParser) {
             return NSQLTranslationPG::PGToYqlStatements(query, parsedSettings, stmtParseInfo);
         }
diff --git a/ydb/tests/fq/yt/cfg/kqprun_config.conf b/ydb/tests/fq/yt/cfg/kqprun_config.conf
@@ -1,6 +1,7 @@
 FeatureFlags {
   EnableExternalDataSources: true
   EnableScriptExecutionOperations: true
+  EnablePgSyntax: true
 }
 
 QueryServiceConfig {
diff --git a/ydb/tests/functional/postgresql/test_postgres.py b/ydb/tests/functional/postgresql/test_postgres.py
@@ -69,7 +69,7 @@ def setup_class(cls):
                 'KQP_COMPILE_REQUEST': LogLevels.DEBUG,
                 'KQP_PROXY': LogLevels.DEBUG
             },
-            extra_feature_flags=['enable_table_pg_types', 'enable_temp_tables'],
+            extra_feature_flags=['enable_table_pg_types', 'enable_temp_tables', 'enable_pg_syntax'],
             pgwire_port=cls.pgport
         ))
         cls.cluster.start()
diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py
@@ -395,6 +395,7 @@ def __init__(
             self.yaml_config["table_service_config"]["index_auto_choose_mode"] = 'max_used_prefix'
             self.yaml_config["feature_flags"]['enable_temp_tables'] = True
             self.yaml_config["feature_flags"]['enable_table_pg_types'] = True
+            self.yaml_config['feature_flags']['enable_pg_syntax'] = True
             self.yaml_config['feature_flags']['enable_uniq_constraint'] = True
 
             # https://github.com/ydb-platform/ydb/issues/5152

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,8 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {`
`146`	`146`	`.SetIsEnableExternalDataSources(AppData(ctx)->FeatureFlags.GetEnableExternalDataSources())`
`147`	`147`	`.SetIsEnablePgConstsToParams(Config->EnablePgConstsToParams)`
`148`	`148`	`.SetApplicationName(ApplicationName)`
`149`		`- .SetQueryParameters(QueryId.QueryParameterTypes);`
	`149`	`+ .SetQueryParameters(QueryId.QueryParameterTypes)`
	`150`	`+ .SetIsEnablePgSyntax(AppData(ctx)->FeatureFlags.GetEnablePgSyntax());`
`150`	`151`
`151`	`152`	`return ParseStatements(QueryId.Text, QueryId.Settings.Syntax, QueryId.IsSql(), settingsBuilder, PerStatementResult);`
`152`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ NSQLTranslation::TTranslationSettings TKqpTranslationSettingsBuilder::Build(NYql`
`86`	`86`	`settings.SaveWorldDependencies = true;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ settings.PGDisable = !IsEnablePgSyntax;`
`89`	`90`	`settings.InferSyntaxVersion = true;`
`90`	`91`	`settings.V0ForceDisable = false;`
`91`	`92`	`settings.WarnOnV0 = false;`
Original file line number	Diff line number	Diff line change
`@@ -148,4 +148,5 @@ message TFeatureFlags {`
`148`	`148`	`optional bool EnableChangefeedsOnIndexTables = 134 [default = false];`
`149`	`149`	`optional bool EnableResourcePoolsCounters = 135 [default = false];`
`150`	`150`	`optional bool EnableOptionalColumnsInColumnShard = 136 [default = false];`
	`151`	`+ optional bool EnablePgSyntax = 139 [default = true];`
`151`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,12 @@ namespace NSQLTranslation {`
`34`	`34`	`return result;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ if (parsedSettings.PgParser && parsedSettings.PGDisable) {`
	`38`	`+ result.Issues.AddIssue(NYql::YqlIssue(NYql::TPosition(), NYql::TIssuesIds::DEFAULT_ERROR,`
	`39`	`+ "PG syntax is disabled"));`
	`40`	`+ return result;`
	`41`	`+ }`
	`42`	`+`
`37`	`43`	`if (parsedSettings.PgParser) {`
`38`	`44`	`return NSQLTranslationPG::PGToYql(query, parsedSettings, stmtParseInfo);`
`39`	`45`	`}`
`@@ -184,6 +190,12 @@ namespace NSQLTranslation {`
`184`	`190`	`return {};`
`185`	`191`	`}`
`186`	`192`
	`193`	`+ if (parsedSettings.PgParser && parsedSettings.PGDisable) {`
	`194`	`+ issues.AddIssue(NYql::YqlIssue(NYql::TPosition(), NYql::TIssuesIds::DEFAULT_ERROR,`
	`195`	`+ "PG syntax is disabled"));`
	`196`	`+ return result;`
	`197`	`+ }`
	`198`	`+`
`187`	`199`	`if (parsedSettings.PgParser) {`
`188`	`200`	`return NSQLTranslationPG::PGToYqlStatements(query, parsedSettings, stmtParseInfo);`
`189`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`FeatureFlags {`
`2`	`2`	`EnableExternalDataSources: true`
`3`	`3`	`EnableScriptExecutionOperations: true`
	`4`	`+ EnablePgSyntax: true`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`QueryServiceConfig {`