Skip to content

Commit 73d507d

Browse files
StekPerepolnenmarsaly79
StekPerepolnen
authored and
marsaly79
committed
KIKIMR-20321 viewer tests asan fix (ydb-platform#525)
KIKIMR-20231/asan-fix
1 parent 1b31b89 commit 73d507d

File tree

14 files changed

+53
-52
lines changed

14 files changed

+53
-52
lines changed

‎ydb/core/kqp/executer_actor/ut/kqp_executer_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TIntrusivePtr<IKqpGateway> MakeIcGateway(const TKikimrRunner& kikimr) {
4343
auto actorSystem = kikimr.GetTestServer().GetRuntime()->GetAnyNodeActorSystem();
4444
return CreateKikimrIcGateway(TString(DefaultKikimrClusterName), "/Root", TKqpGatewaySettings(),
4545
actorSystem, kikimr.GetTestServer().GetRuntime()->GetNodeId(0),
46-
TAlignedPagePoolCounters(), kikimr.GetTestServer().GetSettings().AppConfig.GetQueryServiceConfig());
46+
TAlignedPagePoolCounters(), kikimr.GetTestServer().GetSettings().AppConfig->GetQueryServiceConfig());
4747
}
4848

4949
[[maybe_unused]]

‎ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ TIntrusivePtr<IKqpGateway> GetIcGateway(Tests::TServer& server) {
7575

7676
std::shared_ptr<NYql::IKikimrGateway::IKqpTableMetadataLoader> loader = std::make_shared<TKqpTableMetadataLoader>(server.GetRuntime()->GetAnyNodeActorSystem(),TIntrusivePtr<NYql::TKikimrConfiguration>(nullptr), false);
7777
return CreateKikimrIcGateway(TestCluster, NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY, "/Root", std::move(loader), server.GetRuntime()->GetAnyNodeActorSystem(),
78-
server.GetRuntime()->GetNodeId(0), counters, server.GetSettings().AppConfig.GetQueryServiceConfig());
78+
server.GetRuntime()->GetNodeId(0), counters, server.GetSettings().AppConfig->GetQueryServiceConfig());
7979
}
8080

8181
void TestListPathCommon(TIntrusivePtr<IKikimrGateway> gateway) {
@@ -307,7 +307,7 @@ Y_UNIT_TEST_SUITE(KikimrIcGateway) {
307307
auto createSecretQueryResult = session.ExecuteSchemeQuery(createSecretQuery).GetValueSync();
308308
UNIT_ASSERT_C(createSecretQueryResult.GetStatus() == NYdb::EStatus::SUCCESS, createSecretQueryResult.GetIssues().ToString());
309309
}
310-
310+
311311
Y_UNIT_TEST(TestLoadServiceAccountSecretValueFromExternalDataSourceMetadata) {
312312
TKikimrRunner kikimr;
313313
kikimr.GetTestServer().GetRuntime()->GetAppData(0).FeatureFlags.SetEnableExternalDataSources(true);

‎ydb/core/kqp/proxy_service/kqp_proxy_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Y_UNIT_TEST_SUITE(KqpProxy) {
164164
ui16 mbusport = tp.GetPort(2134);
165165
auto settings = Tests::TServerSettings(mbusport).SetDomainName("Root").SetUseRealThreads(false);
166166
// set small compilation timeout to avoid long timer creation
167-
settings.AppConfig.MutableTableServiceConfig()->SetCompileTimeoutMs(400);
167+
settings.AppConfig->MutableTableServiceConfig()->SetCompileTimeoutMs(400);
168168

169169
Tests::TServer::TPtr server = new Tests::TServer(settings);
170170

‎ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ TIntrusivePtr<NKqp::IKqpGateway> GetIcGateway(Tests::TServer& server) {
3636
counters->TxProxyMon = new NTxProxy::TTxProxyMon(server.GetRuntime()->GetAppData(0).Counters);
3737
std::shared_ptr<NYql::IKikimrGateway::IKqpTableMetadataLoader> loader = std::make_shared<TKqpTableMetadataLoader>(server.GetRuntime()->GetAnyNodeActorSystem(),TIntrusivePtr<NYql::TKikimrConfiguration>(nullptr),false);
3838
return NKqp::CreateKikimrIcGateway(TestCluster, NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY, "/Root", std::move(loader), server.GetRuntime()->GetAnyNodeActorSystem(),
39-
server.GetRuntime()->GetNodeId(0), counters, server.GetSettings().AppConfig.GetQueryServiceConfig());
39+
server.GetRuntime()->GetNodeId(0), counters, server.GetSettings().AppConfig->GetQueryServiceConfig());
4040
}
4141

4242
TIntrusivePtr<IKqpHost> CreateKikimrQueryProcessor(TIntrusivePtr<IKqpGateway> gateway,
@@ -1162,7 +1162,7 @@ Y_UNIT_TEST_SUITE(KqpIndexes) {
11621162
auto session = db.CreateSession().GetValueSync().GetSession();
11631163

11641164
const auto& config = kikimr.GetTestServer().GetSettings().AppConfig;
1165-
auto& tableSettings = config.GetTableServiceConfig();
1165+
auto& tableSettings = config->GetTableServiceConfig();
11661166
bool useSchemeCacheMeta = tableSettings.GetUseSchemeCacheMetadata();
11671167

11681168
{

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
2828
auto db = kikimr.GetTableClient();
2929
auto session = db.CreateSession().GetValueSync().GetSession();
3030

31-
auto& tableSettings = kikimr.GetTestServer().GetSettings().AppConfig.GetTableServiceConfig();
31+
auto& tableSettings = kikimr.GetTestServer().GetSettings().AppConfig->GetTableServiceConfig();
3232
bool useSchemeCacheMeta = tableSettings.GetUseSchemeCacheMetadata();
3333

3434
auto result = session.ExecuteDataQuery(R"(
@@ -5831,7 +5831,7 @@ Y_UNIT_TEST_SUITE(KqpOlapScheme) {
58315831

58325832
Y_UNIT_TEST(TenThousandColumns) {
58335833
using namespace NArrow;
5834-
5834+
58355835
TKikimrSettings runnerSettings;
58365836
runnerSettings.WithSampleTables = false;
58375837
TTestHelper testHelper(runnerSettings);

‎ydb/core/sys_view/ut_common.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ TTestEnv::TTestEnv(ui32 staticNodes, ui32 dynamicNodes, ui32 storagePools, ui32
5151
Settings->AddStoragePool(poolName, TString("/Root:") + poolName, 2);
5252
}
5353

54-
Settings->AppConfig.MutableTableServiceConfig()->SetEnableKqpDataQuerySourceRead(!disableSources);
55-
Settings->AppConfig.MutableHiveConfig()->AddBalancerIgnoreTabletTypes(NKikimrTabletBase::TTabletTypes::SysViewProcessor);
54+
Settings->AppConfig->MutableTableServiceConfig()->SetEnableKqpDataQuerySourceRead(!disableSources);
55+
Settings->AppConfig->MutableHiveConfig()->AddBalancerIgnoreTabletTypes(NKikimrTabletBase::TTabletTypes::SysViewProcessor);
5656

5757
Server = new Tests::TServer(*Settings);
5858
Server->EnableGRpc(grpcPort);

‎ydb/core/sys_view/ut_kqp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ Y_UNIT_TEST_SUITE(SystemView) {
602602

603603
TYsonFieldChecker check(ysonString, 29);
604604

605-
bool iterators = env.GetSettings()->AppConfig.GetTableServiceConfig().GetEnableKqpDataQuerySourceRead();
605+
bool iterators = env.GetSettings()->AppConfig->GetTableServiceConfig().GetEnableKqpDataQuerySourceRead();
606606

607607
check.Uint64GreaterOrEquals(0); // CPUTime
608608
check.Uint64GreaterOrEquals(0); // CompileCPUTime

‎ydb/core/testlib/test_client.cpp

+23-23
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ namespace Tests {
239239
appData.PQConfig.MergeFrom(Settings->PQConfig);
240240
appData.PQClusterDiscoveryConfig.MergeFrom(Settings->PQClusterDiscoveryConfig);
241241
appData.NetClassifierConfig.MergeFrom(Settings->NetClassifierConfig);
242-
appData.StreamingConfig.MergeFrom(Settings->AppConfig.GetGRpcConfig().GetStreamingConfig());
243-
appData.EnforceUserTokenRequirement = Settings->AppConfig.GetDomainsConfig().GetSecurityConfig().GetEnforceUserTokenRequirement();
244-
appData.DomainsConfig.MergeFrom(Settings->AppConfig.GetDomainsConfig());
245-
appData.ColumnShardConfig.MergeFrom(Settings->AppConfig.GetColumnShardConfig());
242+
appData.StreamingConfig.MergeFrom(Settings->AppConfig->GetGRpcConfig().GetStreamingConfig());
243+
appData.EnforceUserTokenRequirement = Settings->AppConfig->GetDomainsConfig().GetSecurityConfig().GetEnforceUserTokenRequirement();
244+
appData.DomainsConfig.MergeFrom(Settings->AppConfig->GetDomainsConfig());
245+
appData.ColumnShardConfig.MergeFrom(Settings->AppConfig->GetColumnShardConfig());
246246
appData.PersQueueGetReadSessionsInfoWorkerFactory = Settings->PersQueueGetReadSessionsInfoWorkerFactory.get();
247247
appData.DataStreamsAuthFactory = Settings->DataStreamsAuthFactory.get();
248248
appData.PersQueueMirrorReaderFactory = Settings->PersQueueMirrorReaderFactory.get();
249-
appData.HiveConfig.MergeFrom(Settings->AppConfig.GetHiveConfig());
249+
appData.HiveConfig.MergeFrom(Settings->AppConfig->GetHiveConfig());
250250

251251
appData.DynamicNameserviceConfig = new TDynamicNameserviceConfig;
252252
auto dnConfig = appData.DynamicNameserviceConfig;
@@ -315,11 +315,11 @@ namespace Tests {
315315

316316
Cerr << "TServer::EnableGrpc on GrpcPort " << options.Port << ", node " << system->NodeId << Endl;
317317

318-
const size_t proxyCount = Max(ui32{1}, Settings->AppConfig.GetGRpcConfig().GetGRpcProxyCount());
318+
const size_t proxyCount = Max(ui32{1}, Settings->AppConfig->GetGRpcConfig().GetGRpcProxyCount());
319319
TVector<TActorId> grpcRequestProxies;
320320
grpcRequestProxies.reserve(proxyCount);
321321
for (size_t i = 0; i < proxyCount; ++i) {
322-
auto grpcRequestProxy = NGRpcService::CreateGRpcRequestProxy(Settings->AppConfig);
322+
auto grpcRequestProxy = NGRpcService::CreateGRpcRequestProxy(*Settings->AppConfig);
323323
auto grpcRequestProxyId = system->Register(grpcRequestProxy, TMailboxType::ReadAsFilled);
324324
system->RegisterLocalService(NGRpcService::CreateGRpcRequestProxyId(), grpcRequestProxyId);
325325
grpcRequestProxies.push_back(grpcRequestProxyId);
@@ -353,7 +353,7 @@ namespace Tests {
353353
}
354354

355355
if (!options.SslData.Empty()) {
356-
grpcService->SetDynamicNodeAuthParams(NKikimr::GetDynamicNodeAuthorizationParams(Settings->AppConfig.GetClientCertificateAuthorization()));
356+
grpcService->SetDynamicNodeAuthParams(NKikimr::GetDynamicNodeAuthorizationParams(Settings->AppConfig->GetClientCertificateAuthorization()));
357357
}
358358

359359
auto future = grpcService->Prepare(
@@ -390,7 +390,7 @@ namespace Tests {
390390
GRpcServer->AddService(new NGRpcService::TGRpcCmsService(system, counters, grpcRequestProxies[0], true));
391391
auto discoveryService = new NGRpcService::TGRpcDiscoveryService(system, counters, grpcRequestProxies[0], true);
392392
if (!options.SslData.Empty()) {
393-
discoveryService->SetDynamicNodeAuthParams(NKikimr::GetDynamicNodeAuthorizationParams(Settings->AppConfig.GetClientCertificateAuthorization()));
393+
discoveryService->SetDynamicNodeAuthParams(NKikimr::GetDynamicNodeAuthorizationParams(Settings->AppConfig->GetClientCertificateAuthorization()));
394394
}
395395
GRpcServer->AddService(discoveryService);
396396
GRpcServer->AddService(new NGRpcService::TGRpcYdbClickhouseInternalService(system, counters, appData.InFlightLimiterRegistry, grpcRequestProxies[0], true));
@@ -746,7 +746,7 @@ namespace Tests {
746746
Runtime->RegisterService(MakeTenantPoolRootID(), poolId, nodeIdx);
747747
if (Settings->EnableConfigsDispatcher) {
748748
// We overwrite icb settings here to save behavior when configs dispatcher are enabled
749-
NKikimrConfig::TAppConfig initial = Settings->AppConfig;
749+
NKikimrConfig::TAppConfig initial = *Settings->AppConfig;
750750
if (!initial.HasImmediateControlsConfig()) {
751751
initial.MutableImmediateControlsConfig()->CopyFrom(Settings->Controls);
752752
}
@@ -839,7 +839,7 @@ namespace Tests {
839839
auto kqpProxySharedResources = std::make_shared<NKqp::TKqpProxySharedResources>();
840840

841841
IActor* kqpRmService = NKqp::CreateKqpResourceManagerActor(
842-
Settings->AppConfig.GetTableServiceConfig().GetResourceManager(), nullptr, {}, kqpProxySharedResources);
842+
Settings->AppConfig->GetTableServiceConfig().GetResourceManager(), nullptr, {}, kqpProxySharedResources);
843843
TActorId kqpRmServiceId = Runtime->Register(kqpRmService, nodeIdx);
844844
Runtime->RegisterService(NKqp::MakeKqpRmServiceID(Runtime->GetNodeId(nodeIdx)), kqpRmServiceId, nodeIdx);
845845

@@ -851,7 +851,7 @@ namespace Tests {
851851

852852
std::shared_ptr<NKikimr::NKqp::IKqpFederatedQuerySetupFactory> federatedQuerySetupFactory = Settings->FederatedQuerySetupFactory;
853853
if (Settings->InitializeFederatedQuerySetupFactory) {
854-
const auto& queryServiceConfig = Settings->AppConfig.GetQueryServiceConfig();
854+
const auto& queryServiceConfig = Settings->AppConfig->GetQueryServiceConfig();
855855

856856
auto httpProxyActorId = NFq::MakeYqlAnalyticsHttpProxyId();
857857
Runtime->RegisterService(
@@ -888,17 +888,17 @@ namespace Tests {
888888
);
889889
}
890890

891-
IActor* kqpProxyService = NKqp::CreateKqpProxyService(Settings->AppConfig.GetLogConfig(),
892-
Settings->AppConfig.GetTableServiceConfig(),
893-
Settings->AppConfig.GetQueryServiceConfig(),
894-
Settings->AppConfig.GetMetadataProviderConfig(),
891+
IActor* kqpProxyService = NKqp::CreateKqpProxyService(Settings->AppConfig->GetLogConfig(),
892+
Settings->AppConfig->GetTableServiceConfig(),
893+
Settings->AppConfig->GetQueryServiceConfig(),
894+
Settings->AppConfig->GetMetadataProviderConfig(),
895895
TVector<NKikimrKqp::TKqpSetting>(Settings->KqpSettings),
896896
nullptr, std::move(kqpProxySharedResources),
897897
federatedQuerySetupFactory);
898898
TActorId kqpProxyServiceId = Runtime->Register(kqpProxyService, nodeIdx);
899899
Runtime->RegisterService(NKqp::MakeKqpProxyID(Runtime->GetNodeId(nodeIdx)), kqpProxyServiceId, nodeIdx);
900900

901-
IActor* scriptFinalizeService = NKqp::CreateKqpFinalizeScriptService(Settings->AppConfig.GetQueryServiceConfig().GetFinalizeScriptServiceConfig(), Settings->AppConfig.GetMetadataProviderConfig(), federatedQuerySetupFactory);
901+
IActor* scriptFinalizeService = NKqp::CreateKqpFinalizeScriptService(Settings->AppConfig->GetQueryServiceConfig().GetFinalizeScriptServiceConfig(), Settings->AppConfig->GetMetadataProviderConfig(), federatedQuerySetupFactory);
902902
TActorId scriptFinalizeServiceId = Runtime->Register(scriptFinalizeService, nodeIdx);
903903
Runtime->RegisterService(NKqp::MakeKqpFinalizeScriptServiceId(Runtime->GetNodeId(nodeIdx)), scriptFinalizeServiceId, nodeIdx);
904904
}
@@ -1013,14 +1013,14 @@ namespace Tests {
10131013
Runtime->RegisterService(MakePollerActorId(), actorId, nodeIdx);
10141014
}
10151015

1016-
if (Settings->AppConfig.GetKafkaProxyConfig().GetEnableKafkaProxy()) {
1016+
if (Settings->AppConfig->GetKafkaProxyConfig().GetEnableKafkaProxy()) {
10171017
NKafka::TListenerSettings settings;
1018-
settings.Port = Settings->AppConfig.GetKafkaProxyConfig().GetListeningPort();
1019-
if (Settings->AppConfig.GetKafkaProxyConfig().HasSslCertificate()) {
1020-
settings.SslCertificatePem = Settings->AppConfig.GetKafkaProxyConfig().GetSslCertificate();
1018+
settings.Port = Settings->AppConfig->GetKafkaProxyConfig().GetListeningPort();
1019+
if (Settings->AppConfig->GetKafkaProxyConfig().HasSslCertificate()) {
1020+
settings.SslCertificatePem = Settings->AppConfig->GetKafkaProxyConfig().GetSslCertificate();
10211021
}
10221022

1023-
IActor* actor = NKafka::CreateKafkaListener(MakePollerActorId(), settings, Settings->AppConfig.GetKafkaProxyConfig());
1023+
IActor* actor = NKafka::CreateKafkaListener(MakePollerActorId(), settings, Settings->AppConfig->GetKafkaProxyConfig());
10241024
TActorId actorId = Runtime->Register(actor, nodeIdx);
10251025
Runtime->RegisterService(TActorId{}, actorId, nodeIdx);
10261026

@@ -1061,7 +1061,7 @@ namespace Tests {
10611061
{
10621062
auto& controlPlaneStorageConfig = *protoConfig.MutableControlPlaneStorage();
10631063
controlPlaneStorageConfig.SetEnabled(true);
1064-
controlPlaneStorageConfig.SetUseInMemory(Settings->AppConfig.GetFederatedQueryConfig().GetControlPlaneStorage().GetUseInMemory());
1064+
controlPlaneStorageConfig.SetUseInMemory(Settings->AppConfig->GetFederatedQueryConfig().GetControlPlaneStorage().GetUseInMemory());
10651065
auto& storage = *controlPlaneStorageConfig.MutableStorage();
10661066
storage.SetEndpoint(endpoint);
10671067
storage.SetTablePrefix(prefix);

‎ydb/core/testlib/test_client.h

+12-11
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ namespace Tests {
127127
TDuration KeepSnapshotTimeout = TDuration::Zero();
128128
ui64 ChangesQueueItemsLimit = 0;
129129
ui64 ChangesQueueBytesLimit = 0;
130-
NKikimrConfig::TAppConfig AppConfig;
130+
std::shared_ptr<NKikimrConfig::TAppConfig> AppConfig;
131131
std::shared_ptr<TKikimrRunConfig> KikimrRunConfig;
132132
NKikimrConfig::TCompactionConfig CompactionConfig;
133133
TMap<ui32, TString> NodeKeys;
@@ -167,8 +167,8 @@ namespace Tests {
167167
TServerSettings& SetEnableNodeBroker(bool value) { EnableNodeBroker = value; return *this; }
168168
TServerSettings& SetEnableConfigsDispatcher(bool value) { EnableConfigsDispatcher = value; return *this; }
169169
TServerSettings& SetUseRealThreads(bool value) { UseRealThreads = value; return *this; }
170-
TServerSettings& SetAppConfig(const NKikimrConfig::TAppConfig value) { AppConfig = value; return *this; }
171-
TServerSettings& InitKikimrRunConfig() { KikimrRunConfig = std::make_shared<TKikimrRunConfig>(AppConfig); return *this; }
170+
TServerSettings& SetAppConfig(const NKikimrConfig::TAppConfig& value) { AppConfig = std::make_shared<NKikimrConfig::TAppConfig>(value); return *this; }
171+
TServerSettings& InitKikimrRunConfig() { KikimrRunConfig = std::make_shared<TKikimrRunConfig>(*AppConfig); return *this; }
172172
TServerSettings& SetKeyFor(ui32 nodeId, TString keyValue) { NodeKeys[nodeId] = keyValue; return *this; }
173173
TServerSettings& SetEnableKqpSpilling(bool value) { EnableKqpSpilling = value; return *this; }
174174
TServerSettings& SetEnableForceFollowers(bool value) { EnableForceFollowers = value; return *this; }
@@ -219,14 +219,15 @@ namespace Tests {
219219
, PQConfig(pqConfig)
220220
{
221221
AddStoragePool("test", "/" + DomainName + ":test");
222-
AppConfig.MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetParallelScanningAvailable(true);
223-
AppConfig.MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetShardSplitFactor(16);
224-
AppConfig.MutableHiveConfig()->SetWarmUpBootWaitingPeriod(10);
225-
AppConfig.MutableHiveConfig()->SetMaxNodeUsageToKick(100);
226-
AppConfig.MutableHiveConfig()->SetMinCounterScatterToBalance(100);
227-
AppConfig.MutableHiveConfig()->SetMinScatterToBalance(100);
228-
AppConfig.MutableHiveConfig()->SetObjectImbalanceToBalance(100);
229-
AppConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false);
222+
AppConfig = std::make_shared<NKikimrConfig::TAppConfig>();
223+
AppConfig->MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetParallelScanningAvailable(true);
224+
AppConfig->MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetShardSplitFactor(16);
225+
AppConfig->MutableHiveConfig()->SetWarmUpBootWaitingPeriod(10);
226+
AppConfig->MutableHiveConfig()->SetMaxNodeUsageToKick(100);
227+
AppConfig->MutableHiveConfig()->SetMinCounterScatterToBalance(100);
228+
AppConfig->MutableHiveConfig()->SetMinScatterToBalance(100);
229+
AppConfig->MutableHiveConfig()->SetObjectImbalanceToBalance(100);
230+
AppConfig->MutableColumnShardConfig()->SetDisabledOnSchemeShard(false);
230231
FeatureFlags.SetEnableSeparationComputeActorsFromRead(true);
231232
}
232233

‎ydb/core/viewer/viewer_ut.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Y_UNIT_TEST_SUITE(Viewer) {
264264

265265
void ChangeListNodes(TEvInterconnect::TEvNodesInfo::TPtr* ev, int nodesTotal) {
266266
auto& nodes = (*ev)->Get()->Nodes;
267-
267+
268268
auto sample = nodes[0];
269269
nodes.clear();
270270

@@ -444,7 +444,7 @@ Y_UNIT_TEST_SUITE(Viewer) {
444444
Ctest << "BASE_PERF = " << BASE_PERF << Endl;
445445

446446
#ifndef SANITIZER_TYPE
447-
#if !defined(NDEBUG) || defined(_hardening_enabled_)
447+
#if !defined(NDEBUG) || defined(_hardening_enabled_)
448448
UNIT_ASSERT_VALUES_EQUAL_C(timer.Passed() < 30 * BASE_PERF, true, "timer = " << timer.Passed() << ", limit = " << 30 * BASE_PERF);
449449
#else
450450
UNIT_ASSERT_VALUES_EQUAL_C(timer.Passed() < 10 * BASE_PERF, true, "timer = " << timer.Passed() << ", limit = " << 10 * BASE_PERF);

‎ydb/public/lib/deprecated/kicli/cpp_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Tests::TServer StartupKikimr(NGRpcProxy::TGRpcClientConfig& clientConfig,
3939

4040
auto settings = Tests::TServerSettings(msgbusPort);
4141
settings.SetLogBackend(logBackend);
42-
settings.AppConfig.CopyFrom(config);
42+
settings.AppConfig->CopyFrom(config);
4343
settings.SetEnableSystemViews(false);
4444

4545
Tests::TServer Server(settings);

0 commit comments

Comments
 (0)