Skip to content

Commit 1e75e58

Browse files
spuchinspuchin
authored
Merge b4dc4e1 into 494165b 
2 parents 494165b + b4dc4e1 commit 1e75e58

File tree

4 files changed

+36
-17
lines changed

4 files changed

+36
-17
lines changed

‎ydb/core/kqp/ut/pg/kqp_pg_ut.cpp‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
12561256
Y_UNIT_TEST(InsertFromSelect_Serial) {
12571257
NKikimrConfig::TAppConfig appConfig;
12581258
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
1259+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
12591260
auto setting = NKikimrKqp::TKqpSetting();
12601261
auto serverSettings = TKikimrSettings()
12611262
.SetAppConfig(appConfig)
@@ -1439,7 +1440,12 @@ Y_UNIT_TEST_SUITE(KqpPg) {
14391440
}
14401441

14411442
Y_UNIT_TEST(Returning) {
1442-
TKikimrRunner kikimr(NKqp::TKikimrSettings().SetWithSampleTables(false));
1443+
NKikimrConfig::TAppConfig appConfig;
1444+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
1445+
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
1446+
1447+
TKikimrRunner kikimr(NKqp::TKikimrSettings().SetAppConfig(appConfig)
1448+
.SetWithSampleTables(false));
14431449

14441450
auto client = kikimr.GetTableClient();
14451451
auto session = client.CreateSession().GetValueSync().GetSession();
@@ -1598,7 +1604,11 @@ Y_UNIT_TEST_SUITE(KqpPg) {
15981604
}
15991605

16001606
Y_UNIT_TEST(CreateTableSerialColumns) {
1601-
TKikimrRunner kikimr(NKqp::TKikimrSettings().SetWithSampleTables(false).SetEnableNotNullDataColumns(true));
1607+
NKikimrConfig::TAppConfig appConfig;
1608+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
1609+
1610+
TKikimrRunner kikimr(NKqp::TKikimrSettings().SetAppConfig(appConfig)
1611+
.SetWithSampleTables(false).SetEnableNotNullDataColumns(true));
16021612
auto client = kikimr.GetTableClient();
16031613
auto session = client.CreateSession().GetValueSync().GetSession();
16041614
{
@@ -2074,7 +2084,8 @@ Y_UNIT_TEST_SUITE(KqpPg) {
20742084

20752085
Y_UNIT_TEST(CreateTempTableSerial) {
20762086
NKikimrConfig::TAppConfig appConfig;
2077-
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);;
2087+
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
2088+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
20782089
auto setting = NKikimrKqp::TKqpSetting();
20792090
auto serverSettings = TKikimrSettings()
20802091
.SetAppConfig(appConfig)
@@ -3287,6 +3298,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
32873298
Y_UNIT_TEST(Insert_Serial) {
32883299
NKikimrConfig::TAppConfig appConfig;
32893300
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3301+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
32903302
auto setting = NKikimrKqp::TKqpSetting();
32913303
auto serverSettings = TKikimrSettings()
32923304
.SetAppConfig(appConfig)
@@ -3323,6 +3335,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
33233335
Y_UNIT_TEST(InsertNoTargetColumns_Serial) {
33243336
NKikimrConfig::TAppConfig appConfig;
33253337
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3338+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
33263339
auto setting = NKikimrKqp::TKqpSetting();
33273340
auto serverSettings = TKikimrSettings()
33283341
.SetAppConfig(appConfig)
@@ -3358,6 +3371,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
33583371
Y_UNIT_TEST(InsertValuesFromTableWithDefault) {
33593372
NKikimrConfig::TAppConfig appConfig;
33603373
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3374+
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
33613375
auto setting = NKikimrKqp::TKqpSetting();
33623376
auto serverSettings = TKikimrSettings()
33633377
.SetAppConfig(appConfig)
@@ -3393,6 +3407,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
33933407
Y_UNIT_TEST(InsertValuesFromTableWithDefaultBool) {
33943408
NKikimrConfig::TAppConfig appConfig;
33953409
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3410+
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
33963411
auto setting = NKikimrKqp::TKqpSetting();
33973412
auto serverSettings = TKikimrSettings()
33983413
.SetAppConfig(appConfig)
@@ -3428,6 +3443,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
34283443
Y_UNIT_TEST(InsertValuesFromTableWithDefaultText) {
34293444
NKikimrConfig::TAppConfig appConfig;
34303445
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3446+
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
34313447
auto setting = NKikimrKqp::TKqpSetting();
34323448
auto serverSettings = TKikimrSettings()
34333449
.SetAppConfig(appConfig)
@@ -3463,6 +3479,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
34633479
Y_UNIT_TEST(InsertValuesFromTableWithDefaultTextNotNull) {
34643480
NKikimrConfig::TAppConfig appConfig;
34653481
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3482+
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
34663483
auto setting = NKikimrKqp::TKqpSetting();
34673484
auto serverSettings = TKikimrSettings()
34683485
.SetAppConfig(appConfig)
@@ -3536,6 +3553,7 @@ Y_UNIT_TEST_SUITE(KqpPg) {
35363553
Y_UNIT_TEST(InsertNoTargetColumns_SerialNotNull) {
35373554
NKikimrConfig::TAppConfig appConfig;
35383555
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
3556+
appConfig.MutableTableServiceConfig()->SetEnableSequences(true);
35393557
auto setting = NKikimrKqp::TKqpSetting();
35403558
auto serverSettings = TKikimrSettings()
35413559
.SetAppConfig(appConfig)

‎ydb/core/kqp/ut/scheme/kqp_constraints_ut.cpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
291291
Y_UNIT_TEST(AlterTableAddColumnWithDefaultValue) {
292292
NKikimrConfig::TAppConfig appConfig;
293293
appConfig.MutableTableServiceConfig()->SetEnableSequences(false);
294+
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
294295
appConfig.MutableFeatureFlags()->SetEnableAddColumsWithDefaults(true);
295296
auto serverSettings = TKikimrSettings().SetAppConfig(appConfig);
296297
TKikimrRunner kikimr(serverSettings);
@@ -345,7 +346,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
345346
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
346347
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
347348
result.GetIssues().ToString());
348-
}
349+
}
349350

350351
{
351352
TString query = R"(
@@ -412,7 +413,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
412413
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
413414
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
414415
result.GetIssues().ToString());
415-
}
416+
}
416417
}
417418

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

443444
Y_UNIT_TEST(DefaultValuesForTableNegative4) {
@@ -463,7 +464,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
463464
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
464465
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR,
465466
result.GetIssues().ToString());
466-
}
467+
}
467468
}
468469

469470
Y_UNIT_TEST(IndexedTableAndNotNullColumn) {
@@ -506,7 +507,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
506507

507508
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
508509
result.GetIssues().ToString());
509-
if (result.GetResultSets().size() > 0)
510+
if (result.GetResultSets().size() > 0)
510511
return NYdb::FormatResultSetYson(result.GetResultSet(0));
511512
return "";
512513
};
@@ -538,7 +539,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
538539
]
539540
)");
540541

541-
542+
542543
fQuery(R"(
543544
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value, Value2) VALUES (2, "New", 2);
544545
)");
@@ -551,7 +552,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
551552

552553
fQuery(R"(
553554
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value) VALUES (2, "OldNew");
554-
)");
555+
)");
555556

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

716717
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
717718
result.GetIssues().ToString());
718-
if (result.GetResultSets().size() > 0)
719+
if (result.GetResultSets().size() > 0)
719720
return NYdb::FormatResultSetYson(result.GetResultSet(0));
720721
return "";
721722
};
@@ -760,7 +761,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
760761
]
761762
)");
762763

763-
764+
764765
fQuery(R"(
765766
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value, Value2) VALUES (2, "New", 2);
766767
)");
@@ -773,7 +774,7 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
773774

774775
fQuery(R"(
775776
UPSERT INTO `/Root/AlterTableAddNotNullColumn` (Key, Value) VALUES (2, "OldNew");
776-
)");
777+
)");
777778

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

790791
}
791-
} // namespace NKikimr::NKqp
792+
} // namespace NKikimr::NKqp

‎ydb/core/protos/feature_flags.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ message TFeatureFlags {
105105
optional bool EnableSeparationComputeActorsFromRead = 90 [default = false];
106106
optional bool EnablePQConfigTransactionsAtSchemeShard = 91 [default = false];
107107
optional bool EnableScriptExecutionOperations = 92 [default = false];
108-
optional bool EnableImplicitQueryParameterTypes = 93 [default = true];
108+
optional bool EnableImplicitQueryParameterTypes = 93 [default = false];
109109
optional bool EnableForceImmediateEffectsExecution = 94 [default = false];
110110
optional bool EnableTopicSplitMerge = 95 [default = false];
111111
optional bool EnableChangefeedDynamoDBStreamsFormat = 96 [default = true];

‎ydb/core/protos/table_service_config.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ message TTableServiceConfig {
235235
optional bool EnableKqpImmediateEffects = 38 [default = true];
236236
optional bool EnableSequentialReads = 39 [default = true];
237237
optional bool EnablePreparedDdl = 42 [default = false];
238-
optional bool EnableSequences = 43 [default = true];
238+
optional bool EnableSequences = 43 [default = false];
239239
optional bool EnableAsyncComputationPatternCompilation = 48 [default = true];
240240
optional TCompileComputationPatternServiceConfig CompileComputationPatternServiceConfig = 47;
241241

@@ -266,7 +266,7 @@ message TTableServiceConfig {
266266
}
267267
optional EIndexAutoChooseMode IndexAutoChooseMode = 50 [default = DISABLED];
268268

269-
optional bool EnableColumnsWithDefault = 51 [default = true];
269+
optional bool EnableColumnsWithDefault = 51 [default = false];
270270

271271
optional bool EnableAstCache = 52 [default = false];
272272
optional bool EnablePgConstsToParams = 53 [default = false];

0 commit comments

Comments
 (0)