Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/core/kqp/executer_actor/ut/kqp_executer_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ TIntrusivePtr<IKqpGateway> MakeIcGateway(const TKikimrRunner& kikimr) {
auto actorSystem = kikimr.GetTestServer().GetRuntime()->GetAnyNodeActorSystem();
return CreateKikimrIcGateway(TString(DefaultKikimrClusterName), "/Root", TKqpGatewaySettings(),
actorSystem, kikimr.GetTestServer().GetRuntime()->GetNodeId(0),
TAlignedPagePoolCounters(), kikimr.GetTestServer().GetSettings().AppConfig.GetQueryServiceConfig());
TAlignedPagePoolCounters(), kikimr.GetTestServer().GetSettings().AppConfig->GetQueryServiceConfig());
}

[[maybe_unused]]
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ TIntrusivePtr<IKqpGateway> GetIcGateway(Tests::TServer& server) {

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

void TestListPathCommon(TIntrusivePtr<IKikimrGateway> gateway) {
Expand Down Expand Up @@ -307,7 +307,7 @@ Y_UNIT_TEST_SUITE(KikimrIcGateway) {
auto createSecretQueryResult = session.ExecuteSchemeQuery(createSecretQuery).GetValueSync();
UNIT_ASSERT_C(createSecretQueryResult.GetStatus() == NYdb::EStatus::SUCCESS, createSecretQueryResult.GetIssues().ToString());
}

Y_UNIT_TEST(TestLoadServiceAccountSecretValueFromExternalDataSourceMetadata) {
TKikimrRunner kikimr;
kikimr.GetTestServer().GetRuntime()->GetAppData(0).FeatureFlags.SetEnableExternalDataSources(true);
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/proxy_service/kqp_proxy_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Y_UNIT_TEST_SUITE(KqpProxy) {
ui16 mbusport = tp.GetPort(2134);
auto settings = Tests::TServerSettings(mbusport).SetDomainName("Root").SetUseRealThreads(false);
// set small compilation timeout to avoid long timer creation
settings.AppConfig.MutableTableServiceConfig()->SetCompileTimeoutMs(400);
settings.AppConfig->MutableTableServiceConfig()->SetCompileTimeoutMs(400);

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

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ TIntrusivePtr<NKqp::IKqpGateway> GetIcGateway(Tests::TServer& server) {
counters->TxProxyMon = new NTxProxy::TTxProxyMon(server.GetRuntime()->GetAppData(0).Counters);
std::shared_ptr<NYql::IKikimrGateway::IKqpTableMetadataLoader> loader = std::make_shared<TKqpTableMetadataLoader>(server.GetRuntime()->GetAnyNodeActorSystem(),TIntrusivePtr<NYql::TKikimrConfiguration>(nullptr),false);
return NKqp::CreateKikimrIcGateway(TestCluster, NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY, "/Root", std::move(loader), server.GetRuntime()->GetAnyNodeActorSystem(),
server.GetRuntime()->GetNodeId(0), counters, server.GetSettings().AppConfig.GetQueryServiceConfig());
server.GetRuntime()->GetNodeId(0), counters, server.GetSettings().AppConfig->GetQueryServiceConfig());
}

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

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

{
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();

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

auto result = session.ExecuteDataQuery(R"(
Expand Down Expand Up @@ -5831,7 +5831,7 @@ Y_UNIT_TEST_SUITE(KqpOlapScheme) {

Y_UNIT_TEST(TenThousandColumns) {
using namespace NArrow;

TKikimrSettings runnerSettings;
runnerSettings.WithSampleTables = false;
TTestHelper testHelper(runnerSettings);
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/sys_view/ut_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ TTestEnv::TTestEnv(ui32 staticNodes, ui32 dynamicNodes, ui32 storagePools, ui32
Settings->AddStoragePool(poolName, TString("/Root:") + poolName, 2);
}

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

Server = new Tests::TServer(*Settings);
Server->EnableGRpc(grpcPort);
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/sys_view/ut_kqp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ Y_UNIT_TEST_SUITE(SystemView) {

TYsonFieldChecker check(ysonString, 29);

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

check.Uint64GreaterOrEquals(0); // CPUTime
check.Uint64GreaterOrEquals(0); // CompileCPUTime
Expand Down
46 changes: 23 additions & 23 deletions ydb/core/testlib/test_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,14 @@ namespace Tests {
appData.PQConfig.MergeFrom(Settings->PQConfig);
appData.PQClusterDiscoveryConfig.MergeFrom(Settings->PQClusterDiscoveryConfig);
appData.NetClassifierConfig.MergeFrom(Settings->NetClassifierConfig);
appData.StreamingConfig.MergeFrom(Settings->AppConfig.GetGRpcConfig().GetStreamingConfig());
appData.EnforceUserTokenRequirement = Settings->AppConfig.GetDomainsConfig().GetSecurityConfig().GetEnforceUserTokenRequirement();
appData.DomainsConfig.MergeFrom(Settings->AppConfig.GetDomainsConfig());
appData.ColumnShardConfig.MergeFrom(Settings->AppConfig.GetColumnShardConfig());
appData.StreamingConfig.MergeFrom(Settings->AppConfig->GetGRpcConfig().GetStreamingConfig());
appData.EnforceUserTokenRequirement = Settings->AppConfig->GetDomainsConfig().GetSecurityConfig().GetEnforceUserTokenRequirement();
appData.DomainsConfig.MergeFrom(Settings->AppConfig->GetDomainsConfig());
appData.ColumnShardConfig.MergeFrom(Settings->AppConfig->GetColumnShardConfig());
appData.PersQueueGetReadSessionsInfoWorkerFactory = Settings->PersQueueGetReadSessionsInfoWorkerFactory.get();
appData.DataStreamsAuthFactory = Settings->DataStreamsAuthFactory.get();
appData.PersQueueMirrorReaderFactory = Settings->PersQueueMirrorReaderFactory.get();
appData.HiveConfig.MergeFrom(Settings->AppConfig.GetHiveConfig());
appData.HiveConfig.MergeFrom(Settings->AppConfig->GetHiveConfig());

appData.DynamicNameserviceConfig = new TDynamicNameserviceConfig;
auto dnConfig = appData.DynamicNameserviceConfig;
Expand Down Expand Up @@ -315,11 +315,11 @@ namespace Tests {

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

const size_t proxyCount = Max(ui32{1}, Settings->AppConfig.GetGRpcConfig().GetGRpcProxyCount());
const size_t proxyCount = Max(ui32{1}, Settings->AppConfig->GetGRpcConfig().GetGRpcProxyCount());
TVector<TActorId> grpcRequestProxies;
grpcRequestProxies.reserve(proxyCount);
for (size_t i = 0; i < proxyCount; ++i) {
auto grpcRequestProxy = NGRpcService::CreateGRpcRequestProxy(Settings->AppConfig);
auto grpcRequestProxy = NGRpcService::CreateGRpcRequestProxy(*Settings->AppConfig);
auto grpcRequestProxyId = system->Register(grpcRequestProxy, TMailboxType::ReadAsFilled);
system->RegisterLocalService(NGRpcService::CreateGRpcRequestProxyId(), grpcRequestProxyId);
grpcRequestProxies.push_back(grpcRequestProxyId);
Expand Down Expand Up @@ -353,7 +353,7 @@ namespace Tests {
}

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

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

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

Expand All @@ -851,7 +851,7 @@ namespace Tests {

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

auto httpProxyActorId = NFq::MakeYqlAnalyticsHttpProxyId();
Runtime->RegisterService(
Expand Down Expand Up @@ -888,17 +888,17 @@ namespace Tests {
);
}

IActor* kqpProxyService = NKqp::CreateKqpProxyService(Settings->AppConfig.GetLogConfig(),
Settings->AppConfig.GetTableServiceConfig(),
Settings->AppConfig.GetQueryServiceConfig(),
Settings->AppConfig.GetMetadataProviderConfig(),
IActor* kqpProxyService = NKqp::CreateKqpProxyService(Settings->AppConfig->GetLogConfig(),
Settings->AppConfig->GetTableServiceConfig(),
Settings->AppConfig->GetQueryServiceConfig(),
Settings->AppConfig->GetMetadataProviderConfig(),
TVector<NKikimrKqp::TKqpSetting>(Settings->KqpSettings),
nullptr, std::move(kqpProxySharedResources),
federatedQuerySetupFactory);
TActorId kqpProxyServiceId = Runtime->Register(kqpProxyService, nodeIdx);
Runtime->RegisterService(NKqp::MakeKqpProxyID(Runtime->GetNodeId(nodeIdx)), kqpProxyServiceId, nodeIdx);

IActor* scriptFinalizeService = NKqp::CreateKqpFinalizeScriptService(Settings->AppConfig.GetQueryServiceConfig().GetFinalizeScriptServiceConfig(), Settings->AppConfig.GetMetadataProviderConfig(), federatedQuerySetupFactory);
IActor* scriptFinalizeService = NKqp::CreateKqpFinalizeScriptService(Settings->AppConfig->GetQueryServiceConfig().GetFinalizeScriptServiceConfig(), Settings->AppConfig->GetMetadataProviderConfig(), federatedQuerySetupFactory);
TActorId scriptFinalizeServiceId = Runtime->Register(scriptFinalizeService, nodeIdx);
Runtime->RegisterService(NKqp::MakeKqpFinalizeScriptServiceId(Runtime->GetNodeId(nodeIdx)), scriptFinalizeServiceId, nodeIdx);
}
Expand Down Expand Up @@ -1013,14 +1013,14 @@ namespace Tests {
Runtime->RegisterService(MakePollerActorId(), actorId, nodeIdx);
}

if (Settings->AppConfig.GetKafkaProxyConfig().GetEnableKafkaProxy()) {
if (Settings->AppConfig->GetKafkaProxyConfig().GetEnableKafkaProxy()) {
NKafka::TListenerSettings settings;
settings.Port = Settings->AppConfig.GetKafkaProxyConfig().GetListeningPort();
if (Settings->AppConfig.GetKafkaProxyConfig().HasSslCertificate()) {
settings.SslCertificatePem = Settings->AppConfig.GetKafkaProxyConfig().GetSslCertificate();
settings.Port = Settings->AppConfig->GetKafkaProxyConfig().GetListeningPort();
if (Settings->AppConfig->GetKafkaProxyConfig().HasSslCertificate()) {
settings.SslCertificatePem = Settings->AppConfig->GetKafkaProxyConfig().GetSslCertificate();
}

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

Expand Down Expand Up @@ -1061,7 +1061,7 @@ namespace Tests {
{
auto& controlPlaneStorageConfig = *protoConfig.MutableControlPlaneStorage();
controlPlaneStorageConfig.SetEnabled(true);
controlPlaneStorageConfig.SetUseInMemory(Settings->AppConfig.GetFederatedQueryConfig().GetControlPlaneStorage().GetUseInMemory());
controlPlaneStorageConfig.SetUseInMemory(Settings->AppConfig->GetFederatedQueryConfig().GetControlPlaneStorage().GetUseInMemory());
auto& storage = *controlPlaneStorageConfig.MutableStorage();
storage.SetEndpoint(endpoint);
storage.SetTablePrefix(prefix);
Expand Down
23 changes: 12 additions & 11 deletions ydb/core/testlib/test_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ namespace Tests {
TDuration KeepSnapshotTimeout = TDuration::Zero();
ui64 ChangesQueueItemsLimit = 0;
ui64 ChangesQueueBytesLimit = 0;
NKikimrConfig::TAppConfig AppConfig;
std::shared_ptr<NKikimrConfig::TAppConfig> AppConfig;
std::shared_ptr<TKikimrRunConfig> KikimrRunConfig;
NKikimrConfig::TCompactionConfig CompactionConfig;
TMap<ui32, TString> NodeKeys;
Expand Down Expand Up @@ -167,8 +167,8 @@ namespace Tests {
TServerSettings& SetEnableNodeBroker(bool value) { EnableNodeBroker = value; return *this; }
TServerSettings& SetEnableConfigsDispatcher(bool value) { EnableConfigsDispatcher = value; return *this; }
TServerSettings& SetUseRealThreads(bool value) { UseRealThreads = value; return *this; }
TServerSettings& SetAppConfig(const NKikimrConfig::TAppConfig value) { AppConfig = value; return *this; }
TServerSettings& InitKikimrRunConfig() { KikimrRunConfig = std::make_shared<TKikimrRunConfig>(AppConfig); return *this; }
TServerSettings& SetAppConfig(const NKikimrConfig::TAppConfig& value) { AppConfig = std::make_shared<NKikimrConfig::TAppConfig>(value); return *this; }
TServerSettings& InitKikimrRunConfig() { KikimrRunConfig = std::make_shared<TKikimrRunConfig>(*AppConfig); return *this; }
TServerSettings& SetKeyFor(ui32 nodeId, TString keyValue) { NodeKeys[nodeId] = keyValue; return *this; }
TServerSettings& SetEnableKqpSpilling(bool value) { EnableKqpSpilling = value; return *this; }
TServerSettings& SetEnableForceFollowers(bool value) { EnableForceFollowers = value; return *this; }
Expand Down Expand Up @@ -219,14 +219,15 @@ namespace Tests {
, PQConfig(pqConfig)
{
AddStoragePool("test", "/" + DomainName + ":test");
AppConfig.MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetParallelScanningAvailable(true);
AppConfig.MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetShardSplitFactor(16);
AppConfig.MutableHiveConfig()->SetWarmUpBootWaitingPeriod(10);
AppConfig.MutableHiveConfig()->SetMaxNodeUsageToKick(100);
AppConfig.MutableHiveConfig()->SetMinCounterScatterToBalance(100);
AppConfig.MutableHiveConfig()->SetMinScatterToBalance(100);
AppConfig.MutableHiveConfig()->SetObjectImbalanceToBalance(100);
AppConfig.MutableColumnShardConfig()->SetDisabledOnSchemeShard(false);
AppConfig = std::make_shared<NKikimrConfig::TAppConfig>();
AppConfig->MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetParallelScanningAvailable(true);
AppConfig->MutableTableServiceConfig()->MutableResourceManager()->MutableShardsScanningPolicy()->SetShardSplitFactor(16);
AppConfig->MutableHiveConfig()->SetWarmUpBootWaitingPeriod(10);
AppConfig->MutableHiveConfig()->SetMaxNodeUsageToKick(100);
AppConfig->MutableHiveConfig()->SetMinCounterScatterToBalance(100);
AppConfig->MutableHiveConfig()->SetMinScatterToBalance(100);
AppConfig->MutableHiveConfig()->SetObjectImbalanceToBalance(100);
AppConfig->MutableColumnShardConfig()->SetDisabledOnSchemeShard(false);
FeatureFlags.SetEnableSeparationComputeActorsFromRead(true);
}

Expand Down
4 changes: 2 additions & 2 deletions ydb/core/viewer/viewer_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ Y_UNIT_TEST_SUITE(Viewer) {

void ChangeListNodes(TEvInterconnect::TEvNodesInfo::TPtr* ev, int nodesTotal) {
auto& nodes = (*ev)->Get()->Nodes;

auto sample = nodes[0];
nodes.clear();

Expand Down Expand Up @@ -444,7 +444,7 @@ Y_UNIT_TEST_SUITE(Viewer) {
Ctest << "BASE_PERF = " << BASE_PERF << Endl;

#ifndef SANITIZER_TYPE
#if !defined(NDEBUG) || defined(_hardening_enabled_)
#if !defined(NDEBUG) || defined(_hardening_enabled_)
UNIT_ASSERT_VALUES_EQUAL_C(timer.Passed() < 30 * BASE_PERF, true, "timer = " << timer.Passed() << ", limit = " << 30 * BASE_PERF);
#else
UNIT_ASSERT_VALUES_EQUAL_C(timer.Passed() < 10 * BASE_PERF, true, "timer = " << timer.Passed() << ", limit = " << 10 * BASE_PERF);
Expand Down
2 changes: 1 addition & 1 deletion ydb/public/lib/deprecated/kicli/cpp_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Tests::TServer StartupKikimr(NGRpcProxy::TGRpcClientConfig& clientConfig,

auto settings = Tests::TServerSettings(msgbusPort);
settings.SetLogBackend(logBackend);
settings.AppConfig.CopyFrom(config);
settings.AppConfig->CopyFrom(config);
settings.SetEnableSystemViews(false);

Tests::TServer Server(settings);
Expand Down
Loading