Skip to content

Disable KQP feature flags for stable branch. #1885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Disable KQP feature flags for stable branch. #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
711c1c8
Disable KQP feature flags for stable branch.
spuchin Feb 13, 2024
b4dc4e1
Fix tests.
spuchin Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions ydb/core/kqp/ut/pg/kqp_pg_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertFromSelect_Serial) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -1439,7 +1440,12 @@ Y_UNIT_TEST_SUITE(KqpPg) {
}

Y_UNIT_TEST(Returning) {
TKikimrRunner kikimr(NKqp::TKikimrSettings().SetWithSampleTables(false));
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);

TKikimrRunner kikimr(NKqp::TKikimrSettings().SetAppConfig(appConfig)
.SetWithSampleTables(false));

auto client = kikimr.GetTableClient();
auto session = client.CreateSession().GetValueSync().GetSession();
Expand Down Expand Up @@ -1598,7 +1604,11 @@ Y_UNIT_TEST_SUITE(KqpPg) {
}

Y_UNIT_TEST(CreateTableSerialColumns) {
TKikimrRunner kikimr(NKqp::TKikimrSettings().SetWithSampleTables(false).SetEnableNotNullDataColumns(true));
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);

TKikimrRunner kikimr(NKqp::TKikimrSettings().SetAppConfig(appConfig)
.SetWithSampleTables(false).SetEnableNotNullDataColumns(true));
auto client = kikimr.GetTableClient();
auto session = client.CreateSession().GetValueSync().GetSession();
{
Expand Down Expand Up @@ -2074,7 +2084,8 @@ Y_UNIT_TEST_SUITE(KqpPg) {

Y_UNIT_TEST(CreateTempTableSerial) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3287,6 +3298,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(Insert_Serial) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3323,6 +3335,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertNoTargetColumns_Serial) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3358,6 +3371,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertValuesFromTableWithDefault) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3393,6 +3407,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertValuesFromTableWithDefaultBool) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3428,6 +3443,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertValuesFromTableWithDefaultText) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3463,6 +3479,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertValuesFromTableWithDefaultTextNotNull) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down Expand Up @@ -3536,6 +3553,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
Y_UNIT_TEST(InsertNoTargetColumns_SerialNotNull) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
Expand Down
23 changes: 12 additions & 11 deletions ydb/core/kqp/ut/scheme/kqp_constraints_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
Y_UNIT_TEST(AlterTableAddColumnWithDefaultValue) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableSequences(false);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
appConfig.MutableFeatureFlags()->SetEnableAddColumsWithDefaults(true);
auto serverSettings = TKikimrSettings().SetAppConfig(appConfig);
TKikimrRunner kikimr(serverSettings);
Expand Down Expand Up @@ -345,7 +346,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
}
}

{
TString query = R"(
Expand Down Expand Up @@ -412,7 +413,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
}
}
}

Y_UNIT_TEST(DefaultValuesForTableNegative3) {
Expand All @@ -437,7 +438,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(),
"Default expr Key is nullable or optional, but column has not null constraint");
}
}
}

Y_UNIT_TEST(DefaultValuesForTableNegative4) {
Expand All @@ -463,7 +464,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR,
result.GetIssues().ToString());
}
}
}

Y_UNIT_TEST(IndexedTableAndNotNullColumn) {
Expand Down Expand Up @@ -506,7 +507,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {

UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
if (result.GetResultSets().size() > 0)
if (result.GetResultSets().size() > 0)
return NYdb::FormatResultSetYson(result.GetResultSet(0));
return "";
};
Expand Down Expand Up @@ -538,7 +539,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
]
)");


fQuery(R"(
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value, Value2) VALUES (2, "New", 2);
)");
Expand All @@ -551,7 +552,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {

fQuery(R"(
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value) VALUES (2, "OldNew");
)");
)");

fQuery(R"(
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value) VALUES (3, "BrandNew");
Expand Down Expand Up @@ -715,7 +716,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {

UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
if (result.GetResultSets().size() > 0)
if (result.GetResultSets().size() > 0)
return NYdb::FormatResultSetYson(result.GetResultSet(0));
return "";
};
Expand Down Expand Up @@ -760,7 +761,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
]
)");


fQuery(R"(
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value, Value2) VALUES (2, "New", 2);
)");
Expand All @@ -773,7 +774,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {

fQuery(R"(
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value) VALUES (2, "OldNew");
)");
)");

fQuery(R"(
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value) VALUES (3, "BrandNew");
Expand All @@ -788,4 +789,4 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
}

}
} // namespace NKikimr::NKqp
} // namespace NKikimr::NKqp
2 changes: 1 addition & 1 deletion ydb/core/protos/feature_flags.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ message TFeatureFlags {
optional bool EnableSeparationComputeActorsFromRead = 90 [default = false];
optional bool EnablePQConfigTransactionsAtSchemeShard = 91 [default = false];
optional bool EnableScriptExecutionOperations = 92 [default = false];
optional bool EnableImplicitQueryParameterTypes = 93 [default = true];
optional bool EnableImplicitQueryParameterTypes = 93 [default = false];
optional bool EnableForceImmediateEffectsExecution = 94 [default = false];
optional bool EnableTopicSplitMerge = 95 [default = false];
optional bool EnableChangefeedDynamoDBStreamsFormat = 96 [default = true];
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/protos/table_service_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ message TTableServiceConfig {
optional bool EnableKqpImmediateEffects = 38 [default = true];
optional bool EnableSequentialReads = 39 [default = true];
optional bool EnablePreparedDdl = 42 [default = false];
optional bool EnableSequences = 43 [default = true];
optional bool EnableSequences = 43 [default = false];
optional bool EnableAsyncComputationPatternCompilation = 48 [default = true];
optional TCompileComputationPatternServiceConfig CompileComputationPatternServiceConfig = 47;

Expand Down Expand Up @@ -266,7 +266,7 @@ message TTableServiceConfig {
}
optional EIndexAutoChooseMode IndexAutoChooseMode = 50 [default = DISABLED];

optional bool EnableColumnsWithDefault = 51 [default = true];
optional bool EnableColumnsWithDefault = 51 [default = false];

optional bool EnableAstCache = 52 [default = false];
optional bool EnablePgConstsToParams = 53 [default = false];
Expand Down