Skip to content

Commit f8a532d

Browse files
gridnevvvitgridnevvvit
authored
remove enable prepared ddl flag (#14260)
1 parent a03d73e commit f8a532d

File tree

15 files changed

+28
-115
lines changed

15 files changed

+28
-115
lines changed

‎ydb/core/kqp/compile_service/kqp_compile_actor.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,6 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
632632
kqpConfig.EnableKqpDataQueryStreamLookup = serviceConfig.GetEnableKqpDataQueryStreamLookup();
633633
kqpConfig.EnableKqpScanQueryStreamIdxLookupJoin = serviceConfig.GetEnableKqpScanQueryStreamIdxLookupJoin();
634634
kqpConfig.EnableKqpDataQueryStreamIdxLookupJoin = serviceConfig.GetEnableKqpDataQueryStreamIdxLookupJoin();
635-
kqpConfig.EnablePreparedDdl = serviceConfig.GetEnablePreparedDdl();
636635
kqpConfig.EnableSequences = serviceConfig.GetEnableSequences();
637636
kqpConfig.EnableColumnsWithDefault = serviceConfig.GetEnableColumnsWithDefault();
638637
kqpConfig.BindingsMode = RemapBindingsMode(serviceConfig.GetBindingsMode());

‎ydb/core/kqp/host/kqp_gateway_proxy.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -550,10 +550,6 @@ static TFuture<TResult> PrepareSuccess() {
550550
}
551551

552552
bool IsDdlPrepareAllowed(TKikimrSessionContext& sessionCtx) {
553-
if (!sessionCtx.Config().EnablePreparedDdl) {
554-
return false;
555-
}
556-
557553
auto queryType = sessionCtx.Query().Type;
558554
if (queryType != EKikimrQueryType::Query && queryType != EKikimrQueryType::Script) {
559555
return false;
@@ -2617,7 +2613,7 @@ class TKqpGatewayProxy : public IKikimrGateway {
26172613

26182614
auto& config = *op.MutableConfig();
26192615

2620-
2616+
26212617
auto& params = *config.MutableSrcConnectionParams();
26222618
if (const auto& connectionString = settings.Settings.ConnectionString) {
26232619
const auto parseResult = NYdb::ParseConnectionString(*connectionString);

‎ydb/core/kqp/provider/yql_kikimr_settings.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ struct TKikimrConfiguration : public TKikimrSettings, public NCommon::TSettingDi
158158
bool EnableKqpDataQueryStreamLookup = false;
159159
bool EnableKqpScanQueryStreamIdxLookupJoin = false;
160160
bool EnableKqpDataQueryStreamIdxLookupJoin = false;
161-
bool EnablePreparedDdl = false;
162161
bool EnableSequences = false;
163162
bool EnableColumnsWithDefault = false;
164163
NSQLTranslation::EBindingsMode BindingsMode = NSQLTranslation::EBindingsMode::ENABLED;

‎ydb/core/kqp/ut/federated_query/common/common.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ namespace NKikimr::NKqp::NFederatedQueryTest {
4141
if (!appConfig) {
4242
appConfig.emplace();
4343
}
44-
appConfig->MutableTableServiceConfig()->SetEnablePreparedDdl(true);
4544

4645
auto settings = TKikimrSettings();
4746

‎ydb/core/kqp/ut/opt/kqp_not_null_ut.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void CreateTableWithMultishardIndex(Tests::TClient& client, NKikimrSchemeOp::EIn
3333
void TestUpdateWithoutChangingNotNullColumn(TSession& session) {
3434
{ /* init table */
3535
const auto query = Q_(R"(
36-
UPSERT INTO t (id, val, created_on) VALUES
36+
UPSERT INTO t (id, val, created_on) VALUES
3737
(123, 'xxx', 1);
3838
)");
3939

@@ -583,7 +583,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
583583

584584
auto result = session.ExecuteSchemeQuery(q1).ExtractValueSync();
585585
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
586-
586+
587587
const auto q2 = Q_(R"(
588588
CREATE TABLE `/Root/TestInsert` (
589589
Key Uint64,
@@ -871,7 +871,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
871871
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_BAD_COLUMN_TYPE), result.GetIssues().ToString());
872872
}
873873
}
874-
874+
875875
Y_UNIT_TEST(UpdateTable_DontChangeNotNull) {
876876
auto settings = TKikimrSettings()
877877
.SetWithSampleTables(false);
@@ -964,7 +964,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
964964
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
965965
CompareYson(R"([[1u;1u;123u;"b"]])", FormatResultSetYson(result.GetResultSet(0)));
966966
}
967-
967+
968968
{ /* same fk */
969969
const auto query = Q_(R"(
970970
UPSERT INTO `/Root/MultiShardIndexed` (key, fk, fk2, value) VALUES
@@ -996,7 +996,6 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
996996

997997
Y_UNIT_TEST(UpdateTable_UniqIndexPg) {
998998
NKikimrConfig::TAppConfig appConfig;
999-
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
1000999
auto setting = NKikimrKqp::TKqpSetting();
10011000
auto serverSettings = TKikimrSettings()
10021001
.SetAppConfig(appConfig)
@@ -1025,7 +1024,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
10251024
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
10261025
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
10271026
}
1028-
{
1027+
{
10291028
auto result = db.ExecuteQuery(R"(
10301029
UPDATE t SET value = 100 WHERE id = 1;
10311030
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
@@ -1036,7 +1035,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
10361035
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
10371036
CompareYson(R"([["1";"100";"label1_1";"label2_1";"1"];["2";"2";"label1_2";"label2_2";"2"]])", FormatResultSetYson(result.GetResultSet(0)));
10381037
}
1039-
{
1038+
{
10401039
auto result = db.ExecuteQuery(R"(
10411040
UPDATE t SET label2 = 'label2_1' WHERE id = 1;
10421041
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
@@ -1047,7 +1046,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
10471046
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
10481047
CompareYson(R"([["1";"100";"label1_1";"label2_1";"1"];["2";"2";"label1_2";"label2_2";"2"]])", FormatResultSetYson(result.GetResultSet(0)));
10491048
}
1050-
{
1049+
{
10511050
auto result = db.ExecuteQuery(R"(
10521051
UPDATE t SET side = id + 1, label = 'new_label';
10531052
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
@@ -1058,7 +1057,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
10581057
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
10591058
CompareYson(R"([["1";"100";"new_label";"label2_1";"2"];["2";"2";"new_label";"label2_2";"3"]])", FormatResultSetYson(result.GetResultSet(0)));
10601059
}
1061-
{
1060+
{
10621061
auto result = db.ExecuteQuery(R"(
10631062
UPDATE t SET value = 100, label = 'new_label' WHERE id = 2;
10641063
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
@@ -1092,9 +1091,9 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
10921091
auto result = session.ExecuteSchemeQuery(query).ExtractValueSync();
10931092
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
10941093
}
1095-
{
1094+
{
10961095
const auto query = Q_(R"(
1097-
UPSERT INTO t (id, val, created_on) VALUES
1096+
UPSERT INTO t (id, val, created_on) VALUES
10981097
(123, 'xxx', 1),
10991098
(124, 'yyy', 2);
11001099
)");
@@ -1114,10 +1113,10 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
11141113
)", TTxControl::BeginTx().CommitTx()).ExtractValueSync();
11151114
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
11161115
CompareYson(R"([])", FormatResultSetYson(result.GetResultSet(0)));
1117-
}
1116+
}
11181117
{
11191118
const auto query = Q_(R"(
1120-
UPSERT INTO t (id, val, created_on) VALUES
1119+
UPSERT INTO t (id, val, created_on) VALUES
11211120
(123, 'xxx', 1),
11221121
(124, 'yyy', 2);
11231122
)");
@@ -1137,7 +1136,7 @@ Y_UNIT_TEST_SUITE(KqpNotNullColumns) {
11371136
)", TTxControl::BeginTx().CommitTx()).ExtractValueSync();
11381137
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
11391138
CompareYson(R"([[11u;124u;["abc"]]])", FormatResultSetYson(result.GetResultSet(0)));
1140-
}
1139+
}
11411140
}
11421141

11431142
Y_UNIT_TEST(UpdateNotNullPg) {

0 commit comments

Comments
 (0)