From 5edd22d4fac0bca4f03034e670461714a17d683e Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Fri, 31 May 2024 13:20:23 +0300 Subject: [PATCH] fix windows build --- ydb/core/tx/columnshard/test_helper/helper.cpp | 7 +++++-- ydb/core/tx/columnshard/test_helper/ya.make | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ydb/core/tx/columnshard/test_helper/helper.cpp b/ydb/core/tx/columnshard/test_helper/helper.cpp index fc8fea56e84c..d3dfd613a689 100644 --- a/ydb/core/tx/columnshard/test_helper/helper.cpp +++ b/ydb/core/tx/columnshard/test_helper/helper.cpp @@ -7,7 +7,9 @@ #include #include #include +#ifndef KIKIMR_DISABLE_S3_OPS #include +#endif namespace NKikimr::NArrow::NTest { @@ -80,12 +82,13 @@ std::shared_ptr TTestStoragesManager::DoB return std::make_shared(storageId, NActors::TActorId(), TabletInfo, 1, SharedBlobsManager->GetStorageManagerGuarantee(TBase::DefaultStorageId)); } else if (storageId == TBase::MemoryStorageId) { +#ifndef KIKIMR_DISABLE_S3_OPS Singleton()->SetSecretKey("fakeSecret"); return std::make_shared(storageId, NActors::TActorId(), std::make_shared("fakeBucket", "fakeSecret"), SharedBlobsManager->GetStorageManagerGuarantee(storageId)); - } else { - return nullptr; +#endif } + return nullptr; } } \ No newline at end of file diff --git a/ydb/core/tx/columnshard/test_helper/ya.make b/ydb/core/tx/columnshard/test_helper/ya.make index b75f43de54f9..a900deb266db 100644 --- a/ydb/core/tx/columnshard/test_helper/ya.make +++ b/ydb/core/tx/columnshard/test_helper/ya.make @@ -5,7 +5,6 @@ PEERDIR( contrib/libs/apache/arrow ydb/library/actors/core ydb/core/tx/columnshard/blobs_action/bs - ydb/core/tx/columnshard/blobs_action/tier ydb/core/tx/columnshard ydb/core/wrappers ) @@ -16,6 +15,16 @@ SRCS( columnshard_ut_common.cpp ) +IF (OS_WINDOWS) + CFLAGS( + -DKIKIMR_DISABLE_S3_OPS + ) +ELSE() + PEERDIR( + ydb/core/tx/columnshard/blobs_action/tier + ) +ENDIF() + YQL_LAST_ABI_VERSION() END()