Skip to content

Commit 44b7587

Browse files
zverevgenyzverevgeny
authored
Disable column store by default (#13841)
1 parent f58d015 commit 44b7587

File tree

10 files changed

+44
-31
lines changed

10 files changed

+44
-31
lines changed

‎ydb/core/kqp/ut/common/kqp_ut_common.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ struct TKikimrSettings: public TTestFeatureFlagsHolder<TKikimrSettings> {
104104
FeatureFlags.SetEnableParameterizedDecimal(true);
105105
FeatureFlags.SetEnableTopicAutopartitioningForCDC(true);
106106
FeatureFlags.SetEnableFollowerStats(true);
107+
FeatureFlags.SetEnableColumnStore(true);
107108
}
108109

109110
TKikimrSettings& SetAppConfig(const NKikimrConfig::TAppConfig& value) { AppConfig = value; return *this; }

‎ydb/core/kqp/ut/olap/blobs_sharing_ut.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "helpers/typed_local.h"
33
#include "helpers/writer.h"
44

5+
#include <algorithm>
56
#include <ydb/core/base/tablet_pipecache.h>
67
#include <ydb/core/tx/columnshard/common/snapshot.h>
78
#include <ydb/core/tx/columnshard/data_sharing/common/context/context.h>
@@ -71,6 +72,7 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
7172
TKikimrSettings GetKikimrSettings() {
7273
NKikimrConfig::TFeatureFlags featureFlags;
7374
featureFlags.SetEnableAlterShardingInColumnShard(true);
75+
featureFlags.SetEnableColumnStore(true);
7476
return TKikimrSettings().SetWithSampleTables(false).SetFeatureFlags(featureFlags);
7577
}
7678

‎ydb/core/protos/feature_flags.proto‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,5 @@ message TFeatureFlags {
187187
optional bool EnableExportChecksums = 162 [default = false];
188188
optional bool EnableTopicTransfer = 163 [default = false];
189189
optional bool EnableViewExport = 164 [default = false];
190+
optional bool EnableColumnStore = 165 [default = false];
190191
}

‎ydb/core/testlib/test_client.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ namespace Tests {
284284
FeatureFlags.SetEnableSeparationComputeActorsFromRead(true);
285285
FeatureFlags.SetEnableWritePortionsOnInsert(true);
286286
FeatureFlags.SetEnableFollowerStats(true);
287+
FeatureFlags.SetEnableColumnStore(true);
287288
}
288289

289290
TServerSettings(const TServerSettings& settings) = default;

‎ydb/core/tx/schemeshard/olap/operations/create_store.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,9 @@ class TCreateOlapStore: public TSubOperation {
330330
TEvSchemeShard::EStatus status = NKikimrScheme::StatusAccepted;
331331
auto result = MakeHolder<TProposeResponse>(status, ui64(OperationId.GetTxId()), ui64(ssId));
332332

333-
if (AppData()->ColumnShardConfig.GetDisabledOnSchemeShard() && context.SS->OlapStores.empty()) {
333+
if (!AppDataVerified().FeatureFlags.GetEnableColumnStore()) {
334334
result->SetError(NKikimrScheme::StatusPreconditionFailed,
335-
"OLAP schema operations are not supported");
335+
"Column stores are not supported");
336336
return result;
337337
}
338338

‎ydb/core/tx/schemeshard/ut_helpers/test_env.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ NSchemeShardUT_Private::TTestEnv::TTestEnv(TTestActorRuntime& runtime, const TTe
530530
app.FeatureFlags.SetEnablePublicApiExternalBlobs(true);
531531
app.FeatureFlags.SetEnableTableDatetime64(true);
532532
app.FeatureFlags.SetEnableVectorIndex(true);
533+
app.FeatureFlags.SetEnableColumnStore(true);
533534
app.SetEnableMoveIndex(opts.EnableMoveIndex_);
534535
app.SetEnableChangefeedInitialScan(opts.EnableChangefeedInitialScan_);
535536
app.SetEnableNotNullDataColumns(opts.EnableNotNullDataColumns_);

‎ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,19 @@ std::vector<TString> ScanQuerySelect(
124124
return ScanQuerySelectSimple(client, tablePath, ydbSchema);
125125
}
126126

127+
128+
NKikimrConfig::TAppConfig GetAppConfig() {
129+
NKikimrConfig::TAppConfig appConfig;
130+
appConfig.MutableFeatureFlags()->SetEnableColumnStore(true);
131+
return appConfig;
132+
}
133+
127134
}
128135

129136
Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
130137

131138
Y_UNIT_TEST(UpsertArrowBatch) {
132-
NKikimrConfig::TAppConfig appConfig;
133-
TKikimrWithGrpcAndRootSchema server(appConfig);
139+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
134140
server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
135141

136142
TTestOlap::CreateTable(*server.ServerSettings);
@@ -214,8 +220,7 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
214220
}
215221

216222
Y_UNIT_TEST(UpsertArrowDupField) {
217-
NKikimrConfig::TAppConfig appConfig;
218-
TKikimrWithGrpcAndRootSchema server(appConfig);
223+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
219224
server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
220225

221226
ui16 grpc = server.GetPort();
@@ -282,8 +287,7 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
282287
}
283288

284289
void ParquetImportBug(bool columnTable) {
285-
NKikimrConfig::TAppConfig appConfig;
286-
TKikimrWithGrpcAndRootSchema server(appConfig);
290+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
287291
server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
288292

289293
ui16 grpc = server.GetPort();
@@ -387,8 +391,7 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
387391
}
388392

389393
Y_UNIT_TEST(UpsertCsvBug) {
390-
NKikimrConfig::TAppConfig appConfig;
391-
TKikimrWithGrpcAndRootSchema server(appConfig);
394+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
392395
server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
393396

394397
ui16 grpc = server.GetPort();
@@ -574,8 +577,7 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
574577
}
575578

576579
Y_UNIT_TEST(UpsertCSV) {
577-
NKikimrConfig::TAppConfig appConfig;
578-
TKikimrWithGrpcAndRootSchema server(appConfig);
580+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
579581
server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
580582

581583
TTestOlap::CreateTable(*server.ServerSettings); // 2 shards

‎ydb/services/ydb/ydb_logstore_ut.cpp‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ TVector<TString> TestSchemaKey() {
5151
return {"timestamp", "resource_type", "resource_id", "uid"};
5252
}
5353

54+
NKikimrConfig::TAppConfig GetAppConfig() {
55+
NKikimrConfig::TAppConfig appConfig;
56+
appConfig.MutableFeatureFlags()->SetEnableColumnStore(true);
57+
return appConfig;
58+
}
59+
5460
}
5561

5662
Y_UNIT_TEST_SUITE(YdbLogStore) {
@@ -69,8 +75,7 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
6975
}
7076

7177
void CreateDropStore(EPrimitiveType pkField) {
72-
NKikimrConfig::TAppConfig appConfig;
73-
TKikimrWithGrpcAndRootSchema server(appConfig);
78+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
7479
EnableDebugLogs(server);
7580

7681
auto connection = ConnectToServer(server);
@@ -128,8 +133,7 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
128133
}
129134

130135
Y_UNIT_TEST(LogStoreNegative) {
131-
NKikimrConfig::TAppConfig appConfig;
132-
TKikimrWithGrpcAndRootSchema server(appConfig);
136+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
133137
EnableDebugLogs(server);
134138

135139
auto connection = ConnectToServer(server);
@@ -192,8 +196,7 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
192196
}
193197

194198
Y_UNIT_TEST(Dirs) {
195-
NKikimrConfig::TAppConfig appConfig;
196-
TKikimrWithGrpcAndRootSchema server(appConfig);
199+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
197200
EnableDebugLogs(server);
198201

199202
auto connection = ConnectToServer(server);
@@ -249,8 +252,7 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
249252
}
250253

251254
void CreateDropTable(EPrimitiveType pkField) {
252-
NKikimrConfig::TAppConfig appConfig;
253-
TKikimrWithGrpcAndRootSchema server(appConfig);
255+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
254256
EnableDebugLogs(server);
255257

256258
auto connection = ConnectToServer(server);
@@ -402,8 +404,7 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
402404
}
403405

404406
Y_UNIT_TEST(AlterLogStore) {
405-
NKikimrConfig::TAppConfig appConfig;
406-
TKikimrWithGrpcAndRootSchema server(appConfig);
407+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
407408
EnableDebugLogs(server);
408409

409410
auto connection = ConnectToServer(server);

‎ydb/services/ydb/ydb_olapstore_ut.cpp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ static constexpr const char* testShardingVariants[] = {
3939
R"(["timestamp", "uid"])",
4040
R"(["timestamp", "resource_type", "resource_id", "uid"])"
4141
};
42+
43+
NKikimrConfig::TAppConfig GetAppConfig() {
44+
NKikimrConfig::TAppConfig appConfig;
45+
appConfig.MutableFeatureFlags()->SetEnableColumnStore(true);
46+
return appConfig;
47+
}
48+
4249
}
4350

4451
Y_UNIT_TEST_SUITE(YdbOlapStore) {
@@ -321,8 +328,7 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
321328

322329
template<bool NotNull>
323330
void TestBulkUpsert(EPrimitiveType pkFirstType) {
324-
NKikimrConfig::TAppConfig appConfig;
325-
TKikimrWithGrpcAndRootSchema server(appConfig);
331+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
326332
EnableDebugLogs(server);
327333

328334
TClient annoyingClient(*server.ServerSettings);
@@ -383,8 +389,8 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
383389

384390
template<bool NotNull>
385391
void TestManyTables(const TString& sharding) {
386-
NKikimrConfig::TAppConfig appConfig;
387-
TKikimrWithGrpcAndRootSchema server(appConfig);
392+
393+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
388394
EnableDebugLogs(server);
389395

390396
auto connection = ConnectToServer(server);
@@ -421,8 +427,7 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
421427

422428
template<bool NotNull>
423429
void TestDuplicateRows(const TString& sharding) {
424-
NKikimrConfig::TAppConfig appConfig;
425-
TKikimrWithGrpcAndRootSchema server(appConfig);
430+
TKikimrWithGrpcAndRootSchema server(GetAppConfig());
426431
EnableDebugLogs(server);
427432

428433
auto connection = ConnectToServer(server);
@@ -474,8 +479,7 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
474479

475480
template<bool NotNull>
476481
void TestQuery(const TString& query, const TString& sharding) {
477-
NKikimrConfig::TAppConfig appConfig;
478-
TKikimrWithGrpcAndRootSchema server(appConfig, {}, {}, false, nullptr);
482+
TKikimrWithGrpcAndRootSchema server(GetAppConfig(), {}, {}, false, nullptr);
479483

480484
auto connection = ConnectToServer(server);
481485

‎ydb/tests/olap/scenario/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(self, endpoint, database):
3131
self._database = database
3232
self._mon_port = 8765
3333
else:
34-
config = KikimrConfigGenerator()
34+
config = KikimrConfigGenerator(extra_feature_flags=["enable_column_store"])
3535
cluster = KiKiMR(configurator=config)
3636
cluster.start()
3737
node = cluster.nodes[1]

0 commit comments

Comments
 (0)