From 628c6302a48549ea07588796ece74383784c6ed6 Mon Sep 17 00:00:00 2001 From: Daniil Demin Date: Mon, 9 Sep 2024 08:09:25 +0000 Subject: [PATCH] Conditionally compile the code that uses AWS to pass windows build --- .../driver_lib/run/kikimr_services_initializers.cpp | 10 ++++++++-- .../driver_lib/run/kikimr_services_initializers.h | 2 ++ ydb/core/driver_lib/run/run.cpp | 2 ++ ydb/core/driver_lib/run/ya.make | 11 ++++++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp index 4a58f7f35b68..414cf6a0815f 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp @@ -244,10 +244,13 @@ #include +#ifndef KIKIMR_DISABLE_S3_OPS #include +#endif namespace { +#ifndef KIKIMR_DISABLE_S3_OPS struct TAwsApiGuard { TAwsApiGuard() { Aws::InitAPI(Options); @@ -260,6 +263,7 @@ struct TAwsApiGuard { private: Aws::SDKOptions Options; }; +#endif } @@ -2065,8 +2069,8 @@ void TMemoryControllerInitializer::InitializeServices( mergeResourceBrokerConfigs(Config.GetResourceBrokerConfig()); } - auto* actor = NMemory::CreateMemoryController(TDuration::Seconds(1), ProcessMemoryInfoProvider, - Config.GetMemoryControllerConfig(), resourceBrokerSelfConfig, + auto* actor = NMemory::CreateMemoryController(TDuration::Seconds(1), ProcessMemoryInfoProvider, + Config.GetMemoryControllerConfig(), resourceBrokerSelfConfig, appData->Counters); setup->LocalServices.emplace_back( NMemory::MakeMemoryControllerId(0), @@ -2782,6 +2786,7 @@ void TGraphServiceInitializer::InitializeServices(NActors::TActorSystemSetup* se TActorSetupCmd(NGraph::CreateGraphService(appData->TenantName), TMailboxType::HTSwap, appData->UserPoolId)); } +#ifndef KIKIMR_DISABLE_S3_OPS TAwsApiInitializer::TAwsApiInitializer(IGlobalObjectStorage& globalObjects) : GlobalObjects(globalObjects) { @@ -2792,6 +2797,7 @@ void TAwsApiInitializer::InitializeServices(NActors::TActorSystemSetup* setup, c Y_UNUSED(appData); GlobalObjects.AddGlobalObject(std::make_shared()); } +#endif } // namespace NKikimrServicesInitializers } // namespace NKikimr diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h index 95a5cfc18ae1..44a20f28a224 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.h +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.h @@ -625,6 +625,7 @@ class TGraphServiceInitializer : public IKikimrServicesInitializer { void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override; }; +#ifndef KIKIMR_DISABLE_S3_OPS class TAwsApiInitializer : public IServiceInitializer { IGlobalObjectStorage& GlobalObjects; @@ -633,6 +634,7 @@ class TAwsApiInitializer : public IServiceInitializer { void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override; }; +#endif } // namespace NKikimrServicesInitializers } // namespace NKikimr diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp index 664dbe03af88..0294726d28ff 100644 --- a/ydb/core/driver_lib/run/run.cpp +++ b/ydb/core/driver_lib/run/run.cpp @@ -1676,9 +1676,11 @@ TIntrusivePtr TKikimrRunner::CreateServiceInitializers sil->AddServiceInitializer(new TGraphServiceInitializer(runConfig)); } +#ifndef KIKIMR_DISABLE_S3_OPS if (serviceMask.EnableAwsService) { sil->AddServiceInitializer(new TAwsApiInitializer(*this)); } +#endif return sil; } diff --git a/ydb/core/driver_lib/run/ya.make b/ydb/core/driver_lib/run/ya.make index 30a23d8f6528..7abed44c3dd4 100644 --- a/ydb/core/driver_lib/run/ya.make +++ b/ydb/core/driver_lib/run/ya.make @@ -1,5 +1,15 @@ LIBRARY(run) +IF (OS_WINDOWS) + CFLAGS( + -DKIKIMR_DISABLE_S3_OPS + ) +ELSE() + PEERDIR( + contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core + ) +ENDIF() + SRCS( auto_config_initializer.cpp config.cpp @@ -21,7 +31,6 @@ SRCS( ) PEERDIR( - contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core contrib/libs/protobuf ydb/library/actors/core ydb/library/actors/dnsresolver