Merge 5edd22d into a4e2878

ydb-platform · May 31, 2024 · ab77202 · ab77202
2 parents a4e2878 + 5edd22d
commit ab77202
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ydb/core/tx/columnshard/test_helper/helper.cpp b/ydb/core/tx/columnshard/test_helper/helper.cpp
@@ -7,7 +7,9 @@
 #include <ydb/library/actors/core/log.h>
 #include <ydb/core/wrappers/fake_storage_config.h>
 #include <ydb/core/wrappers/fake_storage.h>
+#ifndef KIKIMR_DISABLE_S3_OPS
 #include <ydb/core/tx/columnshard/blobs_action/tier/storage.h>
+#endif
 
 namespace NKikimr::NArrow::NTest {
 
@@ -80,12 +82,13 @@ std::shared_ptr<NKikimr::NOlap::IBlobsStorageOperator> TTestStoragesManager::DoB
         return std::make_shared<NOlap::NBlobOperations::NBlobStorage::TOperator>(storageId, NActors::TActorId(), TabletInfo,
             1, SharedBlobsManager->GetStorageManagerGuarantee(TBase::DefaultStorageId));
     } else if (storageId == TBase::MemoryStorageId) {
+#ifndef KIKIMR_DISABLE_S3_OPS
         Singleton<NWrappers::NExternalStorage::TFakeExternalStorage>()->SetSecretKey("fakeSecret");
         return std::make_shared<NOlap::NBlobOperations::NTier::TOperator>(storageId, NActors::TActorId(), std::make_shared<NWrappers::NExternalStorage::TFakeExternalStorageConfig>("fakeBucket", "fakeSecret"),
             SharedBlobsManager->GetStorageManagerGuarantee(storageId));
-    } else {
-        return nullptr;
+#endif
     }
+    return nullptr;
 }
 
 }
diff --git 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()