Skip to content

Commit b85082d

Browse files
authored
Merge b2d116a into c7ef100
2 parents c7ef100 + b2d116a commit b85082d

File tree

282 files changed

+1491
-638
lines changed

Some content is hidden

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

282 files changed

+1491
-638
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ namespace Ydb::Cms {
2121
class ScaleRecommenderPolicies_ScaleRecommenderPolicy_TargetTrackingPolicy;
2222
} // namespace Ydb::Cms
2323

24-
namespace NYdb::inline V3::NCms {
24+
namespace NYdb {
25+
inline namespace Dev {
26+
namespace NCms {
2527

2628
struct TListDatabasesSettings : public TOperationRequestSettings<TListDatabasesSettings> {};
2729

@@ -210,4 +212,6 @@ class TCmsClient {
210212
std::shared_ptr<TImpl> Impl_;
211213
};
212214

213-
} // namespace NYdb::inline V3::NCms
215+
}
216+
}
217+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/common_client/settings.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#include <optional>
1010

11-
namespace NYdb::inline V3 {
11+
namespace NYdb {
12+
inline namespace Dev {
1213

1314
using TCertificateAndPrivateKey = std::pair<std::string, std::string>;
1415

@@ -58,4 +59,5 @@ struct TCommonClientSettingsBase : public TCommonClientSettings {
5859

5960
TCommonClientSettings GetClientSettingsFromConnectionString(const std::string& connectionString);
6061

61-
} // namespace NYdb
62+
}
63+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/common_client/ssl_credentials.h

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

3+
#include <ydb-cpp-sdk/type_switcher.h>
4+
35
#include <string>
46

5-
namespace NYdb::inline V3 {
7+
namespace NYdb {
8+
inline namespace Dev {
69

710
struct TSslCredentials {
811
bool IsEnabled = false;
@@ -23,4 +26,5 @@ struct TSslCredentials {
2326
}
2427
};
2528

26-
} // namespace NYdb
29+
}
30+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/config/config.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
#include <memory>
1010
#include <string>
1111

12-
namespace NYdb::inline V3::NConfig {
12+
namespace NYdb {
13+
inline namespace Dev {
14+
namespace NConfig {
1315

1416
struct TReplaceConfigSettings : public NYdb::TOperationRequestSettings<TReplaceConfigSettings> {
1517
FLUENT_SETTING_FLAG(DryRun);
@@ -118,3 +120,5 @@ class TConfigClient {
118120
};
119121

120122
}
123+
}
124+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace Coordination {
1212
}
1313
}
1414

15-
namespace NYdb::inline V3 {
15+
namespace NYdb {
16+
inline namespace Dev {
1617

1718
namespace NScheme {
1819
struct TPermissions;
@@ -368,3 +369,4 @@ class TSession {
368369

369370
}
370371
}
372+
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
#include <ydb/public/api/grpc/draft/ydb_datastreams_v1.pb.h>
66

7-
namespace NYdb::inline V3::NDataStreams::V1 {
7+
namespace NYdb {
8+
inline namespace Dev {
9+
namespace NDataStreams::V1 {
810

911
template<class TProtoResult>
1012
class TProtoResultWrapper : public NYdb::TStatus {
@@ -371,3 +373,5 @@ namespace NYdb::inline V3::NDataStreams::V1 {
371373
};
372374

373375
}
376+
}
377+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/debug/client.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
#include <ydb-cpp-sdk/client/driver/driver.h>
44

5-
namespace NYdb::inline V3::NDebug {
5+
namespace NYdb {
6+
inline namespace Dev {
7+
namespace NDebug {
68

79
////////////////////////////////////////////////////////////////////////////////
810

@@ -96,4 +98,6 @@ class TDebugClient {
9698
std::shared_ptr<TImpl> Impl_;
9799
};
98100

99-
} // namespace NYdb::V3::NDebug
101+
}
102+
}
103+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/discovery/discovery.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace Discovery {
1212
} // namespace Discovery
1313
} // namespace Ydb
1414

15-
namespace NYdb::inline V3 {
15+
namespace NYdb {
16+
inline namespace Dev {
1617
namespace NDiscovery {
1718

1819
////////////////////////////////////////////////////////////////////////////////
@@ -140,5 +141,6 @@ class TDiscoveryClient {
140141
std::shared_ptr<TImpl> Impl_;
141142
};
142143

143-
} // namespace NDiscovery
144-
} // namespace NYdb
144+
}
145+
}
146+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/draft/ydb_dynamic_config.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
#include <memory>
1010

11-
namespace NYdb::inline V3::NDynamicConfig {
11+
namespace NYdb {
12+
inline namespace Dev {
13+
namespace NDynamicConfig {
1214

1315
struct TGetConfigResult : public TStatus {
1416
TGetConfigResult(
@@ -262,4 +264,6 @@ class TDynamicConfigClient {
262264
std::shared_ptr<TImpl> Impl_;
263265
};
264266

265-
} // namespace NYdb::NDynamicConfig
267+
}
268+
}
269+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/draft/ydb_replication.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ namespace Ydb::Replication {
1414
class DescribeReplicationResult_Stats;
1515
}
1616

17-
namespace NYdb::inline V3 {
18-
class TProtoAccessor;
19-
}
17+
namespace NYdb {
18+
inline namespace Dev {
19+
20+
class TProtoAccessor;
2021

21-
namespace NYdb::inline V3::NReplication {
22+
namespace NReplication {
2223

2324
class TDescribeReplicationResult;
2425
using TAsyncDescribeReplicationResult = NThreading::TFuture<TDescribeReplicationResult>;
@@ -163,7 +164,7 @@ class TReplicationDescription {
163164
};
164165

165166
class TDescribeReplicationResult: public NScheme::TDescribePathResult {
166-
friend class NYdb::V3::TProtoAccessor;
167+
friend class NYdb::TProtoAccessor;
167168
const Ydb::Replication::DescribeReplicationResult& GetProto() const;
168169

169170
public:
@@ -188,4 +189,6 @@ class TReplicationClient {
188189
std::shared_ptr<TImpl> Impl_;
189190
};
190191

191-
} // namespace NYdb::V3::NReplication
192+
}
193+
}
194+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/draft/ydb_scripting.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#include <ydb-cpp-sdk/client/table/table.h>
44
#include <ydb/public/api/protos/ydb_query.pb.h>
55

6-
namespace NYdb::inline V3 {
6+
namespace NYdb {
7+
inline namespace Dev {
78
namespace NScripting {
89

910
class TExecuteYqlResult : public TStatus {
@@ -151,5 +152,6 @@ class TScriptingClient {
151152
std::shared_ptr<TImpl> Impl_;
152153
};
153154

154-
} // namespace NScripting
155-
} // namespace NYdb
155+
}
156+
}
157+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/draft/ydb_view.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ namespace Ydb::View {
77
class DescribeViewResult;
88
}
99

10-
namespace NYdb::inline V3 {
11-
class TProtoAccessor;
12-
}
10+
namespace NYdb {
11+
inline namespace Dev {
12+
13+
class TProtoAccessor;
1314

14-
namespace NYdb::inline V3::NView {
15+
namespace NView {
1516

1617
class TDescribeViewResult;
1718
using TAsyncDescribeViewResult = NThreading::TFuture<TDescribeViewResult>;
@@ -31,7 +32,7 @@ class TViewDescription {
3132
};
3233

3334
class TDescribeViewResult : public NScheme::TDescribePathResult {
34-
friend class NYdb::V3::TProtoAccessor;
35+
friend class NYdb::TProtoAccessor;
3536
const Ydb::View::DescribeViewResult& GetProto() const;
3637

3738
public:
@@ -55,4 +56,6 @@ class TViewClient {
5556
std::shared_ptr<TImpl> Impl_;
5657
};
5758

58-
} // namespace NYdb::V3::NView
59+
}
60+
}
61+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/driver/driver.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313

1414
////////////////////////////////////////////////////////////////////////////////
1515

16-
namespace NYdb::inline V3 {
16+
namespace NYdb {
17+
inline namespace Dev {
1718

1819
class TGRpcConnectionsImpl;
1920

@@ -147,4 +148,5 @@ class TDriver {
147148
std::shared_ptr<TGRpcConnectionsImpl> Impl_;
148149
};
149150

150-
} // namespace NYdb
151+
}
152+
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#pragma once
22

3-
namespace NYdb::inline V3 {
3+
#include <ydb-cpp-sdk/type_switcher.h>
4+
5+
namespace NYdb {
6+
inline namespace Dev {
47

58
class TDriver;
69
class TDriverConfig;
710

8-
} // namespace NYdb
11+
}
12+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/export/export.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#include <ydb-cpp-sdk/client/types/operation/operation.h>
55
#include <ydb-cpp-sdk/client/types/s3_settings.h>
66

7-
namespace NYdb::inline V3 {
7+
namespace NYdb {
8+
inline namespace Dev {
89
namespace NExport {
910

1011
/// Common
@@ -122,5 +123,6 @@ class TExportClient {
122123
std::shared_ptr<TImpl> Impl_;
123124
};
124125

125-
} // namespace NExport
126-
} // namespace NYdb
126+
}
127+
}
128+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/extension_common/extension.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class ListEndpointsResult;
1212
}
1313
}
1414

15-
namespace NYdb::inline V3 {
15+
namespace NYdb {
16+
inline namespace Dev {
1617

1718
class IExtensionApi {
1819
public:
@@ -69,4 +70,5 @@ void TDriver::AddExtension(typename TExtension::TParams params) {
6970
api->SelfRegister(*this);
7071
}
7172

72-
} // namespace NYdb
73+
}
74+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/extensions/discovery_mutator/discovery_mutator.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
#include <ydb-cpp-sdk/client/extension_common/extension.h>
44

5-
namespace NDiscoveryMutator::inline V3 {
5+
namespace NDiscoveryMutator {
6+
inline namespace Dev {
67

78
class TDiscoveryMutator: public NYdb::IExtension {
89
public:
@@ -26,4 +27,5 @@ class TDiscoveryMutator: public NYdb::IExtension {
2627
}
2728
};
2829

29-
} // namespace NDiscoveryMutator
30+
}
31+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
#include <library/cpp/monlib/service/pages/mon_page.h>
99
#include <library/cpp/monlib/service/monservice.h>
1010

11-
namespace NSolomonStatExtension::inline V3 {
11+
namespace NSolomonStatExtension {
12+
inline namespace Dev {
1213

1314
class TSolomonStatPullExtension: public NYdb::IExtension {
1415
public:
@@ -54,4 +55,5 @@ class TSolomonStatPullExtension: public NYdb::IExtension {
5455
TIntrusivePtr<TSolomonStatPage> Page_;
5556
};
5657

57-
} // namespace NSolomonStatExtension
58+
}
59+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
#include <library/cpp/monlib/metrics/metric_registry.h>
66

7-
namespace NSolomonStatExtension::inline V3 {
7+
namespace NSolomonStatExtension {
8+
inline namespace Dev {
89

910
template <typename TMetricRegistryPtr>
1011
class TMetricRegistryConnector: public NYdb::IExtension {
@@ -68,4 +69,5 @@ inline void AddMetricRegistry(NYdb::TDriver& driver, TAtomicSharedPtr<NMonitorin
6869
driver.AddExtension<TConnector>(TConnector::TParams(ptr));
6970
}
7071

71-
} // namespace NSolomonStatExtension
72+
}
73+
}

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/federated_topic/federated_topic.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
#include <unordered_set>
1010

11-
namespace NYdb::inline V3::NFederatedTopic {
11+
namespace NYdb {
12+
inline namespace Dev {
13+
namespace NFederatedTopic {
1214

1315
using NTopic::TPrintable;
1416
using TDbInfo = Ydb::FederationDiscovery::DatabaseInfo;
@@ -523,9 +525,9 @@ class TFederatedTopicClient {
523525
std::shared_ptr<TImpl> Impl_;
524526
};
525527

526-
} // namespace NYdb::NFederatedTopic
528+
}
527529

528-
namespace NYdb::inline V3::NTopic {
530+
namespace NTopic {
529531

530532
using namespace NFederatedTopic;
531533

@@ -551,3 +553,5 @@ template<>
551553
void TPrintable<NFederatedTopic::TReadSessionEvent::TFederated<NFederatedTopic::TReadSessionEvent::TPartitionSessionClosedEvent>>::DebugString(TStringBuilder& res, bool) const;
552554

553555
}
556+
}
557+
}

0 commit comments

Comments
 (0)