diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.cpp b/ydb/core/kqp/ut/common/kqp_ut_common.cpp index 9a298ef4eba5..11de0b37da9e 100644 --- a/ydb/core/kqp/ut/common/kqp_ut_common.cpp +++ b/ydb/core/kqp/ut/common/kqp_ut_common.cpp @@ -122,7 +122,6 @@ TKikimrRunner::TKikimrRunner(const TKikimrSettings& settings) { appConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false); ServerSettings->SetAppConfig(appConfig); ServerSettings->SetFeatureFlags(settings.FeatureFlags); - ServerSettings->FeatureFlags.SetEnableImmediateWritingOnBulkUpsert(true); ServerSettings->SetNodeCount(settings.NodeCount); ServerSettings->SetEnableKqpSpilling(enableSpilling); ServerSettings->SetEnableDataColumnForIndexTable(true); diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.h b/ydb/core/kqp/ut/common/kqp_ut_common.h index b993db17210b..313191817895 100644 --- a/ydb/core/kqp/ut/common/kqp_ut_common.h +++ b/ydb/core/kqp/ut/common/kqp_ut_common.h @@ -98,7 +98,6 @@ struct TKikimrSettings: public TTestFeatureFlagsHolder { exchangerSettings->SetMaxDelayMs(10); AppConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false); FeatureFlags.SetEnableSparsedColumns(true); - FeatureFlags.SetEnableImmediateWritingOnBulkUpsert(true); FeatureFlags.SetEnableWritePortionsOnInsert(true); FeatureFlags.SetEnableParameterizedDecimal(true); FeatureFlags.SetEnableTopicAutopartitioningForCDC(true); diff --git a/ydb/core/kqp/ut/olap/write_ut.cpp b/ydb/core/kqp/ut/olap/write_ut.cpp index c339990668bd..6d13f7802dcd 100644 --- a/ydb/core/kqp/ut/olap/write_ut.cpp +++ b/ydb/core/kqp/ut/olap/write_ut.cpp @@ -24,7 +24,6 @@ Y_UNIT_TEST_SUITE(KqpOlapWrite) { auto settings = TKikimrSettings().SetWithSampleTables(false); TKikimrRunner kikimr(settings); - kikimr.GetTestServer().GetRuntime()->GetAppData().FeatureFlags.SetEnableImmediateWritingOnBulkUpsert(true); kikimr.GetTestServer().GetRuntime()->GetAppData().FeatureFlags.SetEnableWritePortionsOnInsert(true); TLocalHelper(kikimr).CreateTestOlapTable(); Tests::NCommon::TLoggerInit(kikimr) diff --git a/ydb/core/protos/feature_flags.proto b/ydb/core/protos/feature_flags.proto index 32137545f946..451da4bcd7a4 100644 --- a/ydb/core/protos/feature_flags.proto +++ b/ydb/core/protos/feature_flags.proto @@ -157,7 +157,7 @@ message TFeatureFlags { optional bool EnableExternalDataSourcesOnServerless = 143 [default = true]; optional bool EnableSparsedColumns = 144 [default = false]; optional bool EnableParameterizedDecimal = 145 [default = false]; - optional bool EnableImmediateWritingOnBulkUpsert = 146 [default = false]; + optional bool EnableImmediateWritingOnBulkUpsert = 146 [default = true]; optional bool EnableInsertWriteIdSpecialColumnCompatibility = 147 [default = false]; optional bool EnableTopicAutopartitioningForCDC = 148 [default = false]; optional bool EnableWritePortionsOnInsert = 149 [default = false]; diff --git a/ydb/core/testlib/test_client.h b/ydb/core/testlib/test_client.h index 31af8c606eb3..3e6762c2c100 100644 --- a/ydb/core/testlib/test_client.h +++ b/ydb/core/testlib/test_client.h @@ -252,7 +252,6 @@ namespace Tests { AppConfig->MutableHiveConfig()->SetObjectImbalanceToBalance(100); AppConfig->MutableColumnShardConfig()->SetDisabledOnSchemeShard(false); FeatureFlags.SetEnableSeparationComputeActorsFromRead(true); - FeatureFlags.SetEnableImmediateWritingOnBulkUpsert(true); FeatureFlags.SetEnableWritePortionsOnInsert(true); }