summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanmorozov333 <[email protected]>2024-02-22 16:36:06 +0300
committerGitHub <[email protected]>2024-02-22 16:36:06 +0300
commitadac6e1562cc23214908455872f3d0c8f18d6df3 (patch)
treeb746dfb2faf7669449e67e5c88b6f34c51a7d240
parent24621b1ae7a9dbee904b3ddd54392d3c87f6c1e0 (diff)
fix windows build (#2167)
-rw-r--r--ydb/core/tx/columnshard/blobs_action/storages_manager/ya.make11
-rw-r--r--ydb/core/tx/columnshard/blobs_action/ya.make11
-rw-r--r--ydb/core/tx/columnshard/data_sharing/manager/sessions.cpp2
3 files changed, 10 insertions, 14 deletions
diff --git a/ydb/core/tx/columnshard/blobs_action/storages_manager/ya.make b/ydb/core/tx/columnshard/blobs_action/storages_manager/ya.make
index 23ea9c903a2..b79b6720608 100644
--- a/ydb/core/tx/columnshard/blobs_action/storages_manager/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/storages_manager/ya.make
@@ -7,7 +7,16 @@ SRCS(
PEERDIR(
ydb/core/tx/columnshard/data_sharing/manager
ydb/core/tx/columnshard/blobs_action/bs
- ydb/core/tx/columnshard/blobs_action/tier
)
+IF (OS_WINDOWS)
+ CFLAGS(
+ -DKIKIMR_DISABLE_S3_OPS
+ )
+ELSE()
+ PEERDIR(
+ ydb/core/tx/columnshard/blobs_action/tier
+ )
+ENDIF()
+
END()
diff --git a/ydb/core/tx/columnshard/blobs_action/ya.make b/ydb/core/tx/columnshard/blobs_action/ya.make
index 1d687a58a41..e40c02ad703 100644
--- a/ydb/core/tx/columnshard/blobs_action/ya.make
+++ b/ydb/core/tx/columnshard/blobs_action/ya.make
@@ -11,21 +11,10 @@ PEERDIR(
ydb/core/tablet_flat
ydb/core/tx/tiering
ydb/core/tx/columnshard/blobs_action/abstract
- ydb/core/tx/columnshard/blobs_action/bs
ydb/core/tx/columnshard/blobs_action/counters
ydb/core/tx/columnshard/blobs_action/transaction
ydb/core/tx/columnshard/blobs_action/events
ydb/core/tx/columnshard/blobs_action/protos
)
-IF (OS_WINDOWS)
- CFLAGS(
- -DKIKIMR_DISABLE_S3_OPS
- )
-ELSE()
- PEERDIR(
- ydb/core/tx/columnshard/blobs_action/tier
- )
-ENDIF()
-
END()
diff --git a/ydb/core/tx/columnshard/data_sharing/manager/sessions.cpp b/ydb/core/tx/columnshard/data_sharing/manager/sessions.cpp
index 318f848f981..ac2dee83945 100644
--- a/ydb/core/tx/columnshard/data_sharing/manager/sessions.cpp
+++ b/ydb/core/tx/columnshard/data_sharing/manager/sessions.cpp
@@ -48,7 +48,6 @@ bool TSessionsManager::Load(NTable::TDatabase& database, const TColumnEngineForL
}
while (!rowset.EndOfSet()) {
- const TString& sessionId = rowset.GetValue<Schema::SourceSessions::SessionId>();
auto session = std::make_shared<TSourceSession>((TTabletId)index->GetTabletId());
NKikimrColumnShardDataSharingProto::TSourceSession protoSession;
@@ -77,7 +76,6 @@ bool TSessionsManager::Load(NTable::TDatabase& database, const TColumnEngineForL
}
while (!rowset.EndOfSet()) {
- const TString& sessionId = rowset.GetValue<Schema::DestinationSessions::SessionId>();
auto session = std::make_shared<TDestinationSession>();
NKikimrColumnShardDataSharingProto::TDestinationSession protoSession;