Skip to content

Commit be644f0

Browse files
authored
Conditionally compile the code that uses AWS to pass windows build (#8966)
1 parent 4ab249f commit be644f0

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,13 @@
244244

245245
#include <util/system/hostname.h>
246246

247+
#ifndef KIKIMR_DISABLE_S3_OPS
247248
#include <aws/core/Aws.h>
249+
#endif
248250

249251
namespace {
250252

253+
#ifndef KIKIMR_DISABLE_S3_OPS
251254
struct TAwsApiGuard {
252255
TAwsApiGuard() {
253256
Aws::InitAPI(Options);
@@ -260,6 +263,7 @@ struct TAwsApiGuard {
260263
private:
261264
Aws::SDKOptions Options;
262265
};
266+
#endif
263267

264268
}
265269

@@ -2065,8 +2069,8 @@ void TMemoryControllerInitializer::InitializeServices(
20652069
mergeResourceBrokerConfigs(Config.GetResourceBrokerConfig());
20662070
}
20672071

2068-
auto* actor = NMemory::CreateMemoryController(TDuration::Seconds(1), ProcessMemoryInfoProvider,
2069-
Config.GetMemoryControllerConfig(), resourceBrokerSelfConfig,
2072+
auto* actor = NMemory::CreateMemoryController(TDuration::Seconds(1), ProcessMemoryInfoProvider,
2073+
Config.GetMemoryControllerConfig(), resourceBrokerSelfConfig,
20702074
appData->Counters);
20712075
setup->LocalServices.emplace_back(
20722076
NMemory::MakeMemoryControllerId(0),
@@ -2782,6 +2786,7 @@ void TGraphServiceInitializer::InitializeServices(NActors::TActorSystemSetup* se
27822786
TActorSetupCmd(NGraph::CreateGraphService(appData->TenantName), TMailboxType::HTSwap, appData->UserPoolId));
27832787
}
27842788

2789+
#ifndef KIKIMR_DISABLE_S3_OPS
27852790
TAwsApiInitializer::TAwsApiInitializer(IGlobalObjectStorage& globalObjects)
27862791
: GlobalObjects(globalObjects)
27872792
{
@@ -2792,6 +2797,7 @@ void TAwsApiInitializer::InitializeServices(NActors::TActorSystemSetup* setup, c
27922797
Y_UNUSED(appData);
27932798
GlobalObjects.AddGlobalObject(std::make_shared<TAwsApiGuard>());
27942799
}
2800+
#endif
27952801

27962802
} // namespace NKikimrServicesInitializers
27972803
} // namespace NKikimr

ydb/core/driver_lib/run/kikimr_services_initializers.h

+2
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ class TGraphServiceInitializer : public IKikimrServicesInitializer {
625625
void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override;
626626
};
627627

628+
#ifndef KIKIMR_DISABLE_S3_OPS
628629
class TAwsApiInitializer : public IServiceInitializer {
629630
IGlobalObjectStorage& GlobalObjects;
630631

@@ -633,6 +634,7 @@ class TAwsApiInitializer : public IServiceInitializer {
633634

634635
void InitializeServices(NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) override;
635636
};
637+
#endif
636638

637639
} // namespace NKikimrServicesInitializers
638640
} // namespace NKikimr

ydb/core/driver_lib/run/run.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1676,9 +1676,11 @@ TIntrusivePtr<TServiceInitializersList> TKikimrRunner::CreateServiceInitializers
16761676
sil->AddServiceInitializer(new TGraphServiceInitializer(runConfig));
16771677
}
16781678

1679+
#ifndef KIKIMR_DISABLE_S3_OPS
16791680
if (serviceMask.EnableAwsService) {
16801681
sil->AddServiceInitializer(new TAwsApiInitializer(*this));
16811682
}
1683+
#endif
16821684

16831685
return sil;
16841686
}

ydb/core/driver_lib/run/ya.make

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
LIBRARY(run)
22

3+
IF (OS_WINDOWS)
4+
CFLAGS(
5+
-DKIKIMR_DISABLE_S3_OPS
6+
)
7+
ELSE()
8+
PEERDIR(
9+
contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core
10+
)
11+
ENDIF()
12+
313
SRCS(
414
auto_config_initializer.cpp
515
config.cpp
@@ -21,7 +31,6 @@ SRCS(
2131
)
2232

2333
PEERDIR(
24-
contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core
2534
contrib/libs/protobuf
2635
ydb/library/actors/core
2736
ydb/library/actors/dnsresolver

0 commit comments

Comments
 (0)