Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix windows build #5072

Merged
merged 1 commit into from
May 31, 2024
Merged

fix windows build #5072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions ydb/core/tx/columnshard/test_helper/helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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;
}

}
11 changes: 10 additions & 1 deletion ydb/core/tx/columnshard/test_helper/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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()
Expand Down
Loading