Skip to content

Commit 5b88568

Browse files
GazizonokiGazizonoki
committed
Fix build
1 parent ddb0461 commit 5b88568

File tree

198 files changed

+2865
-2835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+2865
-2835
lines changed

‎include/ydb-cpp-sdk/client/cms/cms.h‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#pragma once
22

33
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/type_switcher.h>
45

5-
namespace Ydb::Cms {
6+
YDB_PROTOS_NAMESPACE {
7+
namespace Cms {
68
class CreateDatabaseRequest;
79
class ListDatabasesResult;
810
class GetDatabaseStatusResult;
@@ -19,15 +21,16 @@ namespace Ydb::Cms {
1921
class ScaleRecommenderPolicies;
2022
class ScaleRecommenderPolicies_ScaleRecommenderPolicy;
2123
class ScaleRecommenderPolicies_ScaleRecommenderPolicy_TargetTrackingPolicy;
22-
} // namespace Ydb::Cms
24+
} // namespace Cms
25+
}
2326

2427
namespace NYdb::inline V3::NCms {
2528

2629
struct TListDatabasesSettings : public TOperationRequestSettings<TListDatabasesSettings> {};
2730

2831
class TListDatabasesResult : public TStatus {
2932
public:
30-
TListDatabasesResult(TStatus&& status, const Ydb::Cms::ListDatabasesResult& proto);
33+
TListDatabasesResult(TStatus&& status, const NYdbProtos::Cms::ListDatabasesResult& proto);
3134
const std::vector<std::string>& GetPaths() const;
3235
private:
3336
std::vector<std::string> Paths_;
@@ -48,15 +51,15 @@ enum class EState {
4851

4952
struct TStorageUnits {
5053
TStorageUnits() = default;
51-
TStorageUnits(const Ydb::Cms::StorageUnits& proto);
54+
TStorageUnits(const NYdbProtos::Cms::StorageUnits& proto);
5255

5356
std::string UnitKind;
5457
std::uint64_t Count;
5558
};
5659

5760
struct TComputationalUnits {
5861
TComputationalUnits() = default;
59-
TComputationalUnits(const Ydb::Cms::ComputationalUnits& proto);
62+
TComputationalUnits(const NYdbProtos::Cms::ComputationalUnits& proto);
6063

6164
std::string UnitKind;
6265
std::string AvailabilityZone;
@@ -65,7 +68,7 @@ struct TComputationalUnits {
6568

6669
struct TAllocatedComputationalUnit {
6770
TAllocatedComputationalUnit() = default;
68-
TAllocatedComputationalUnit(const Ydb::Cms::AllocatedComputationalUnit& proto);
71+
TAllocatedComputationalUnit(const NYdbProtos::Cms::AllocatedComputationalUnit& proto);
6972

7073
std::string Host;
7174
std::uint32_t Port;
@@ -74,7 +77,7 @@ struct TAllocatedComputationalUnit {
7477

7578
struct TResources {
7679
TResources() = default;
77-
TResources(const Ydb::Cms::Resources& proto);
80+
TResources(const NYdbProtos::Cms::Resources& proto);
7881

7982
std::vector<TStorageUnits> StorageUnits;
8083
std::vector<TComputationalUnits> ComputationalUnits;
@@ -86,38 +89,38 @@ struct TSharedResources : public TResources {
8689

8790
struct TServerlessResources {
8891
TServerlessResources() = default;
89-
TServerlessResources(const Ydb::Cms::ServerlessResources& proto);
92+
TServerlessResources(const NYdbProtos::Cms::ServerlessResources& proto);
9093

9194
std::string SharedDatabasePath;
9295
};
9396

9497
struct TSchemaOperationQuotas {
9598
struct TLeakyBucket {
9699
TLeakyBucket() = default;
97-
TLeakyBucket(const Ydb::Cms::SchemaOperationQuotas_LeakyBucket& proto);
100+
TLeakyBucket(const NYdbProtos::Cms::SchemaOperationQuotas_LeakyBucket& proto);
98101

99102
double BucketSize = 1;
100103
std::uint64_t BucketSeconds = 2;
101104
};
102105

103106
TSchemaOperationQuotas() = default;
104-
TSchemaOperationQuotas(const Ydb::Cms::SchemaOperationQuotas& proto);
107+
TSchemaOperationQuotas(const NYdbProtos::Cms::SchemaOperationQuotas& proto);
105108

106109
std::vector<TLeakyBucket> LeakyBucketQuotas;
107110
};
108111

109112
struct TDatabaseQuotas {
110113
struct TStorageQuotas {
111114
TStorageQuotas() = default;
112-
TStorageQuotas(const Ydb::Cms::DatabaseQuotas_StorageQuotas& proto);
115+
TStorageQuotas(const NYdbProtos::Cms::DatabaseQuotas_StorageQuotas& proto);
113116

114117
std::string UnitKind;
115118
std::uint64_t DataSizeHardQuota;
116119
std::uint64_t DataSizeSoftQuota;
117120
};
118121

119122
TDatabaseQuotas() = default;
120-
TDatabaseQuotas(const Ydb::Cms::DatabaseQuotas& proto);
123+
TDatabaseQuotas(const NYdbProtos::Cms::DatabaseQuotas& proto);
121124

122125
std::uint64_t DataSizeHardQuota;
123126
std::uint64_t DataSizeSoftQuota;
@@ -131,21 +134,21 @@ struct TTargetTrackingPolicy {
131134
using TAverageCpuUtilizationPercent = std::uint32_t;
132135

133136
TTargetTrackingPolicy() = default;
134-
TTargetTrackingPolicy(const Ydb::Cms::ScaleRecommenderPolicies_ScaleRecommenderPolicy_TargetTrackingPolicy& proto);
137+
TTargetTrackingPolicy(const NYdbProtos::Cms::ScaleRecommenderPolicies_ScaleRecommenderPolicy_TargetTrackingPolicy& proto);
135138

136139
std::variant<std::monostate, TAverageCpuUtilizationPercent> Target;
137140
};
138141

139142
struct TScaleRecommenderPolicy {
140143
TScaleRecommenderPolicy() = default;
141-
TScaleRecommenderPolicy(const Ydb::Cms::ScaleRecommenderPolicies_ScaleRecommenderPolicy& proto);
144+
TScaleRecommenderPolicy(const NYdbProtos::Cms::ScaleRecommenderPolicies_ScaleRecommenderPolicy& proto);
142145

143146
std::variant<std::monostate, TTargetTrackingPolicy> Policy;
144147
};
145148

146149
struct TScaleRecommenderPolicies {
147150
TScaleRecommenderPolicies() = default;
148-
TScaleRecommenderPolicies(const Ydb::Cms::ScaleRecommenderPolicies& proto);
151+
TScaleRecommenderPolicies(const NYdbProtos::Cms::ScaleRecommenderPolicies& proto);
149152

150153
std::vector<TScaleRecommenderPolicy> Policies;
151154
};
@@ -154,7 +157,7 @@ using TResourcesKind = std::variant<std::monostate, TResources, TSharedResources
154157

155158
class TGetDatabaseStatusResult : public TStatus {
156159
public:
157-
TGetDatabaseStatusResult(TStatus&& status, const Ydb::Cms::GetDatabaseStatusResult& proto);
160+
TGetDatabaseStatusResult(TStatus&& status, const NYdbProtos::Cms::GetDatabaseStatusResult& proto);
158161

159162
const std::string& GetPath() const;
160163
EState GetState() const;
@@ -167,7 +170,7 @@ class TGetDatabaseStatusResult : public TStatus {
167170
const TScaleRecommenderPolicies& GetScaleRecommenderPolicies() const;
168171

169172
// Fills CreateDatabaseRequest proto from this database status
170-
void SerializeTo(Ydb::Cms::CreateDatabaseRequest& request) const;
173+
void SerializeTo(NYdbProtos::Cms::CreateDatabaseRequest& request) const;
171174

172175
private:
173176
std::string Path_;
@@ -185,10 +188,10 @@ using TAsyncGetDatabaseStatusResult = NThreading::TFuture<TGetDatabaseStatusResu
185188

186189
struct TCreateDatabaseSettings : public TOperationRequestSettings<TCreateDatabaseSettings> {
187190
TCreateDatabaseSettings() = default;
188-
explicit TCreateDatabaseSettings(const Ydb::Cms::CreateDatabaseRequest& request);
191+
explicit TCreateDatabaseSettings(const NYdbProtos::Cms::CreateDatabaseRequest& request);
189192

190193
// Fills CreateDatabaseRequest proto from this settings
191-
void SerializeTo(Ydb::Cms::CreateDatabaseRequest& request) const;
194+
void SerializeTo(NYdbProtos::Cms::CreateDatabaseRequest& request) const;
192195

193196
FLUENT_SETTING(TResourcesKind, ResourcesKind);
194197
FLUENT_SETTING(TSchemaOperationQuotas, SchemaOperationQuotas);

‎include/ydb-cpp-sdk/client/coordination/coordination.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#pragma once
22

33
#include <ydb-cpp-sdk/client/driver/driver.h>
4+
#include <ydb-cpp-sdk/type_switcher.h>
45

5-
namespace Ydb {
6+
YDB_PROTOS_NAMESPACE {
67
namespace Coordination {
78
class Config;
89
class CreateNodeRequest;
@@ -97,7 +98,7 @@ enum class ERateLimiterCountersMode {
9798
//! Represents coordination node description
9899
class TNodeDescription {
99100
public:
100-
TNodeDescription(const Ydb::Coordination::DescribeNodeResult& desc);
101+
TNodeDescription(const NYdbProtos::Coordination::DescribeNodeResult& desc);
101102

102103
const std::optional<TDuration>& GetSelfCheckPeriod() const;
103104
const std::optional<TDuration>& GetSessionGracePeriod() const;
@@ -107,9 +108,9 @@ class TNodeDescription {
107108

108109
const std::string& GetOwner() const;
109110
const std::vector<NScheme::TPermissions>& GetEffectivePermissions() const;
110-
const Ydb::Coordination::DescribeNodeResult& GetProto() const;
111+
const NYdbProtos::Coordination::DescribeNodeResult& GetProto() const;
111112

112-
void SerializeTo(Ydb::Coordination::CreateNodeRequest& creationRequest) const;
113+
void SerializeTo(NYdbProtos::Coordination::CreateNodeRequest& creationRequest) const;
113114

114115
private:
115116
struct TImpl;
@@ -123,7 +124,7 @@ class TSemaphoreSession {
123124
public:
124125
TSemaphoreSession();
125126

126-
TSemaphoreSession(const Ydb::Coordination::SemaphoreSession& desc);
127+
TSemaphoreSession(const NYdbProtos::Coordination::SemaphoreSession& desc);
127128

128129
uint64_t GetOrderId() const { return OrderId_; }
129130
uint64_t GetSessionId() const { return SessionId_; }
@@ -146,7 +147,7 @@ class TSemaphoreDescription {
146147
public:
147148
TSemaphoreDescription();
148149

149-
TSemaphoreDescription(const Ydb::Coordination::SemaphoreDescription& desc);
150+
TSemaphoreDescription(const NYdbProtos::Coordination::SemaphoreDescription& desc);
150151

151152
const std::string& GetName() const { return Name_; }
152153
const std::string& GetData() const { return Data_; }
@@ -195,7 +196,7 @@ struct TNodeSettings : public TOperationRequestSettings<TDerived> {
195196

196197
struct TCreateNodeSettings : public TNodeSettings<TCreateNodeSettings> {
197198
TCreateNodeSettings() = default;
198-
TCreateNodeSettings(const Ydb::Coordination::Config& config);
199+
TCreateNodeSettings(const NYdbProtos::Coordination::Config& config);
199200
};
200201
struct TAlterNodeSettings : public TNodeSettings<TAlterNodeSettings> { };
201202
struct TDropNodeSettings : public TOperationRequestSettings<TDropNodeSettings> { };

‎include/ydb-cpp-sdk/client/datastreams/datastreams.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,36 @@ namespace NYdb::inline V3::NDataStreams::V1 {
3333
ESM_ON_DEMAND = 2,
3434
};
3535

36-
using TCreateStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::CreateStreamResult>;
37-
using TDeleteStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::DeleteStreamResult>;
38-
using TDescribeStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::DescribeStreamResult>;
39-
using TPutRecordResult = TProtoResultWrapper<Ydb::DataStreams::V1::PutRecordResult>;
40-
using TRegisterStreamConsumerResult = TProtoResultWrapper<Ydb::DataStreams::V1::RegisterStreamConsumerResult>;
41-
using TDeregisterStreamConsumerResult = TProtoResultWrapper<Ydb::DataStreams::V1::DeregisterStreamConsumerResult>;
42-
using TDescribeStreamConsumerResult = TProtoResultWrapper<Ydb::DataStreams::V1::DescribeStreamConsumerResult>;
43-
using TListStreamsResult = TProtoResultWrapper<Ydb::DataStreams::V1::ListStreamsResult>;
44-
using TListShardsResult = TProtoResultWrapper<Ydb::DataStreams::V1::ListShardsResult>;
45-
using TPutRecordsResult = TProtoResultWrapper<Ydb::DataStreams::V1::PutRecordsResult>;
46-
using TGetRecordsResult = TProtoResultWrapper<Ydb::DataStreams::V1::GetRecordsResult>;
47-
using TGetShardIteratorResult = TProtoResultWrapper<Ydb::DataStreams::V1::GetShardIteratorResult>;
48-
// using TSubscribeToShardResult = TProtoResultWrapper<Ydb::DataStreams::V1::SubscribeToShardResult>;
49-
using TDescribeLimitsResult = TProtoResultWrapper<Ydb::DataStreams::V1::DescribeLimitsResult>;
50-
using TDescribeStreamSummaryResult = TProtoResultWrapper<Ydb::DataStreams::V1::DescribeStreamSummaryResult>;
51-
using TDecreaseStreamRetentionPeriodResult = TProtoResultWrapper<Ydb::DataStreams::V1::DecreaseStreamRetentionPeriodResult>;
52-
using TIncreaseStreamRetentionPeriodResult = TProtoResultWrapper<Ydb::DataStreams::V1::IncreaseStreamRetentionPeriodResult>;
53-
using TUpdateShardCountResult = TProtoResultWrapper<Ydb::DataStreams::V1::UpdateShardCountResult>;
54-
using TUpdateStreamModeResult = TProtoResultWrapper<Ydb::DataStreams::V1::UpdateStreamModeResult>;
55-
using TListStreamConsumersResult = TProtoResultWrapper<Ydb::DataStreams::V1::ListStreamConsumersResult>;
56-
using TAddTagsToStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::AddTagsToStreamResult>;
57-
using TDisableEnhancedMonitoringResult = TProtoResultWrapper<Ydb::DataStreams::V1::DisableEnhancedMonitoringResult>;
58-
using TEnableEnhancedMonitoringResult = TProtoResultWrapper<Ydb::DataStreams::V1::EnableEnhancedMonitoringResult>;
59-
using TListTagsForStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::ListTagsForStreamResult>;
60-
using TMergeShardsResult = TProtoResultWrapper<Ydb::DataStreams::V1::MergeShardsResult>;
61-
using TRemoveTagsFromStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::RemoveTagsFromStreamResult>;
62-
using TSplitShardResult = TProtoResultWrapper<Ydb::DataStreams::V1::SplitShardResult>;
63-
using TStartStreamEncryptionResult = TProtoResultWrapper<Ydb::DataStreams::V1::StartStreamEncryptionResult>;
64-
using TStopStreamEncryptionResult = TProtoResultWrapper<Ydb::DataStreams::V1::StopStreamEncryptionResult>;
65-
using TUpdateStreamResult = TProtoResultWrapper<Ydb::DataStreams::V1::UpdateStreamResult>;
36+
using TCreateStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::CreateStreamResult>;
37+
using TDeleteStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DeleteStreamResult>;
38+
using TDescribeStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DescribeStreamResult>;
39+
using TPutRecordResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::PutRecordResult>;
40+
using TRegisterStreamConsumerResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::RegisterStreamConsumerResult>;
41+
using TDeregisterStreamConsumerResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DeregisterStreamConsumerResult>;
42+
using TDescribeStreamConsumerResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DescribeStreamConsumerResult>;
43+
using TListStreamsResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::ListStreamsResult>;
44+
using TListShardsResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::ListShardsResult>;
45+
using TPutRecordsResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::PutRecordsResult>;
46+
using TGetRecordsResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::GetRecordsResult>;
47+
using TGetShardIteratorResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::GetShardIteratorResult>;
48+
// using TSubscribeToShardResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::SubscribeToShardResult>;
49+
using TDescribeLimitsResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DescribeLimitsResult>;
50+
using TDescribeStreamSummaryResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DescribeStreamSummaryResult>;
51+
using TDecreaseStreamRetentionPeriodResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DecreaseStreamRetentionPeriodResult>;
52+
using TIncreaseStreamRetentionPeriodResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::IncreaseStreamRetentionPeriodResult>;
53+
using TUpdateShardCountResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::UpdateShardCountResult>;
54+
using TUpdateStreamModeResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::UpdateStreamModeResult>;
55+
using TListStreamConsumersResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::ListStreamConsumersResult>;
56+
using TAddTagsToStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::AddTagsToStreamResult>;
57+
using TDisableEnhancedMonitoringResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::DisableEnhancedMonitoringResult>;
58+
using TEnableEnhancedMonitoringResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::EnableEnhancedMonitoringResult>;
59+
using TListTagsForStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::ListTagsForStreamResult>;
60+
using TMergeShardsResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::MergeShardsResult>;
61+
using TRemoveTagsFromStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::RemoveTagsFromStreamResult>;
62+
using TSplitShardResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::SplitShardResult>;
63+
using TStartStreamEncryptionResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::StartStreamEncryptionResult>;
64+
using TStopStreamEncryptionResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::StopStreamEncryptionResult>;
65+
using TUpdateStreamResult = TProtoResultWrapper<NYdbProtos::DataStreams::V1::UpdateStreamResult>;
6666

6767
using TAsyncCreateStreamResult = NThreading::TFuture<TCreateStreamResult>;
6868
using TAsyncDeleteStreamResult = NThreading::TFuture<TDeleteStreamResult>;
@@ -128,7 +128,7 @@ namespace NYdb::inline V3::NDataStreams::V1 {
128128
, DownUtilizationPercent_(0)
129129
, UpUtilizationPercent_(0) {
130130
}
131-
TAutoPartitioningSettings(const Ydb::DataStreams::V1::AutoPartitioningSettings& settings);
131+
TAutoPartitioningSettings(const NYdbProtos::DataStreams::V1::AutoPartitioningSettings& settings);
132132
TAutoPartitioningSettings(EAutoPartitioningStrategy strategy, TDuration stabilizationWindow, uint64_t downUtilizationPercent, uint64_t upUtilizationPercent)
133133
: Strategy_(strategy)
134134
, StabilizationWindow_(stabilizationWindow)
@@ -153,7 +153,7 @@ namespace NYdb::inline V3::NDataStreams::V1 {
153153
friend struct TPartitioningSettingsBuilder<TUpdateStreamSettings>;
154154
public:
155155
TPartitioningSettings() : MinActivePartitions_(0), MaxActivePartitions_(0), AutoPartitioningSettings_(){}
156-
TPartitioningSettings(const Ydb::DataStreams::V1::PartitioningSettings& settings);
156+
TPartitioningSettings(const NYdbProtos::DataStreams::V1::PartitioningSettings& settings);
157157
TPartitioningSettings(uint64_t minActivePartitions, uint64_t maxActivePartitions, TAutoPartitioningSettings autoscalingSettings = {})
158158
: MinActivePartitions_(minActivePartitions)
159159
, MaxActivePartitions_(maxActivePartitions)
@@ -334,10 +334,10 @@ namespace NYdb::inline V3::NDataStreams::V1 {
334334
TAsyncDescribeStreamResult DescribeStream(const std::string& path, TDescribeStreamSettings settings = TDescribeStreamSettings());
335335
TAsyncPutRecordResult PutRecord(const std::string& path, const TDataRecord& record, TPutRecordSettings settings = TPutRecordSettings());
336336
TAsyncListStreamsResult ListStreams(TListStreamsSettings settings = TListStreamsSettings());
337-
TAsyncListShardsResult ListShards(const std::string& path, const Ydb::DataStreams::V1::ShardFilter& shardFilter, TListShardsSettings settings = TListShardsSettings());
337+
TAsyncListShardsResult ListShards(const std::string& path, const NYdbProtos::DataStreams::V1::ShardFilter& shardFilter, TListShardsSettings settings = TListShardsSettings());
338338
TAsyncPutRecordsResult PutRecords(const std::string& path, const std::vector<TDataRecord>& records, TPutRecordsSettings settings = TPutRecordsSettings());
339339
TAsyncGetRecordsResult GetRecords(const std::string& shardIterator, TGetRecordsSettings settings = TGetRecordsSettings());
340-
TAsyncGetShardIteratorResult GetShardIterator(const std::string& path, const std::string& shardId, Ydb::DataStreams::V1::ShardIteratorType shardIteratorTypeStr,
340+
TAsyncGetShardIteratorResult GetShardIterator(const std::string& path, const std::string& shardId, NYdbProtos::DataStreams::V1::ShardIteratorType shardIteratorTypeStr,
341341
TGetShardIteratorSettings settings = TGetShardIteratorSettings());
342342
// TAsyncSubscribeToShardResult SubscribeToShard(TSubscribeToShardSettings settings = TSubscribeToShardSettings());
343343
TAsyncDescribeLimitsResult DescribeLimits(TDescribeLimitsSettings settings = TDescribeLimitsSettings());

0 commit comments

Comments
 (0)