Merge b2d116a into c7ef100

Author: Gazizonoki

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

@@ -21,7 +21,9 @@ namespace Ydb::Cms {
     class ScaleRecommenderPolicies_ScaleRecommenderPolicy_TargetTrackingPolicy;
 } // namespace Ydb::Cms
 
-namespace NYdb::inline V3::NCms {
+namespace NYdb {
+inline namespace Dev {
+namespace NCms {
 
 struct TListDatabasesSettings : public TOperationRequestSettings<TListDatabasesSettings> {};
 
@@ -210,4 +212,6 @@ class TCmsClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NYdb::inline V3::NCms
+}
+}
+}

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

@@ -8,7 +8,8 @@
 
 #include <optional>
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 
 using TCertificateAndPrivateKey = std::pair<std::string, std::string>;
 
@@ -58,4 +59,5 @@ struct TCommonClientSettingsBase : public TCommonClientSettings {
 
 TCommonClientSettings GetClientSettingsFromConnectionString(const std::string& connectionString);
 
-} // namespace NYdb
+}
+}

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

@@ -1,8 +1,11 @@
 #pragma once
 
+#include <ydb-cpp-sdk/type_switcher.h>
+
 #include <string>
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 
 struct TSslCredentials {
     bool IsEnabled = false;
@@ -23,4 +26,5 @@ struct TSslCredentials {
     }
 };
 
-} // namespace NYdb
+}
+}

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

@@ -9,7 +9,9 @@
 #include <memory>
 #include <string>
 
-namespace NYdb::inline V3::NConfig {
+namespace NYdb {
+inline namespace Dev {
+namespace NConfig {
 
 struct TReplaceConfigSettings : public NYdb::TOperationRequestSettings<TReplaceConfigSettings> {
     FLUENT_SETTING_FLAG(DryRun);
@@ -118,3 +120,5 @@ class TConfigClient {
 };
 
 }
+}
+}

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

@@ -12,7 +12,8 @@ namespace Coordination {
 }
 }
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 
 namespace NScheme {
 struct TPermissions;
@@ -368,3 +369,4 @@ class TSession {
 
 }
 }
+}

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

@@ -4,7 +4,9 @@
 
 #include <ydb/public/api/grpc/draft/ydb_datastreams_v1.pb.h>
 
-namespace NYdb::inline V3::NDataStreams::V1 {
+namespace NYdb {
+inline namespace Dev {
+namespace NDataStreams::V1 {
 
     template<class TProtoResult>
     class TProtoResultWrapper : public NYdb::TStatus {
@@ -371,3 +373,5 @@ namespace NYdb::inline V3::NDataStreams::V1 {
     };
 
 }
+}
+}

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

@@ -2,7 +2,9 @@
 
 #include <ydb-cpp-sdk/client/driver/driver.h>
 
-namespace NYdb::inline V3::NDebug {
+namespace NYdb {
+inline namespace Dev {
+namespace NDebug {
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -96,4 +98,6 @@ class TDebugClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NYdb::V3::NDebug
+}
+}
+}

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

@@ -12,7 +12,8 @@ namespace Discovery {
 } // namespace Discovery
 } // namespace Ydb
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 namespace NDiscovery {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -140,5 +141,6 @@ class TDiscoveryClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NDiscovery
-} // namespace NYdb
+}
+}
+}

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

@@ -8,7 +8,9 @@
 
 #include <memory>
 
-namespace NYdb::inline V3::NDynamicConfig {
+namespace NYdb {
+inline namespace Dev {
+namespace NDynamicConfig {
 
 struct TGetConfigResult : public TStatus {
     TGetConfigResult(
@@ -262,4 +264,6 @@ class TDynamicConfigClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NYdb::NDynamicConfig
+}
+}
+}

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

@@ -14,11 +14,12 @@ namespace Ydb::Replication {
     class DescribeReplicationResult_Stats;
 }
 
-namespace NYdb::inline V3 {
-    class TProtoAccessor;
-}
+namespace NYdb {
+inline namespace Dev {
+
+class TProtoAccessor;
 
-namespace NYdb::inline V3::NReplication {
+namespace NReplication {
 
 class TDescribeReplicationResult;
 using TAsyncDescribeReplicationResult = NThreading::TFuture<TDescribeReplicationResult>;
@@ -163,7 +164,7 @@ class TReplicationDescription {
 };
 
 class TDescribeReplicationResult: public NScheme::TDescribePathResult {
-    friend class NYdb::V3::TProtoAccessor;
+    friend class NYdb::TProtoAccessor;
     const Ydb::Replication::DescribeReplicationResult& GetProto() const;
 
 public:
@@ -188,4 +189,6 @@ class TReplicationClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NYdb::V3::NReplication
+}
+}
+}

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

@@ -3,7 +3,8 @@
 #include <ydb-cpp-sdk/client/table/table.h>
 #include <ydb/public/api/protos/ydb_query.pb.h>
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 namespace NScripting {
 
 class TExecuteYqlResult : public TStatus {
@@ -151,5 +152,6 @@ class TScriptingClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NScripting
-} // namespace NYdb
+}
+}
+}

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

@@ -7,11 +7,12 @@ namespace Ydb::View {
     class DescribeViewResult;
 }
 
-namespace NYdb::inline V3 {
-    class TProtoAccessor;
-}
+namespace NYdb {
+inline namespace Dev {
+
+class TProtoAccessor;
 
-namespace NYdb::inline V3::NView {
+namespace NView {
 
 class TDescribeViewResult;
 using TAsyncDescribeViewResult = NThreading::TFuture<TDescribeViewResult>;
@@ -31,7 +32,7 @@ class TViewDescription {
 };
 
 class TDescribeViewResult : public NScheme::TDescribePathResult {
-    friend class NYdb::V3::TProtoAccessor;
+    friend class NYdb::TProtoAccessor;
     const Ydb::View::DescribeViewResult& GetProto() const;
 
 public:
@@ -55,4 +56,6 @@ class TViewClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NYdb::V3::NView
+}
+}
+}

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

@@ -13,7 +13,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 
 class TGRpcConnectionsImpl;
 
@@ -147,4 +148,5 @@ class TDriver {
     std::shared_ptr<TGRpcConnectionsImpl> Impl_;
 };
 
-} // namespace NYdb
+}
+}

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

@@ -1,8 +1,12 @@
 #pragma once
 
-namespace NYdb::inline V3 {
+#include <ydb-cpp-sdk/type_switcher.h>
+
+namespace NYdb {
+inline namespace Dev {
 
 class TDriver;
 class TDriverConfig;
 
-}  // namespace NYdb
+}
+}

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

@@ -4,7 +4,8 @@
 #include <ydb-cpp-sdk/client/types/operation/operation.h>
 #include <ydb-cpp-sdk/client/types/s3_settings.h>
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 namespace NExport {
 
 /// Common
@@ -122,5 +123,6 @@ class TExportClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NExport
-} // namespace NYdb
+}
+}
+}

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

@@ -12,7 +12,8 @@ class ListEndpointsResult;
 }
 }
 
-namespace NYdb::inline V3 {
+namespace NYdb {
+inline namespace Dev {
 
 class IExtensionApi {
 public:
@@ -69,4 +70,5 @@ void TDriver::AddExtension(typename TExtension::TParams params) {
         api->SelfRegister(*this);
 }
 
-} // namespace NYdb
+}
+}

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

@@ -2,7 +2,8 @@
 
 #include <ydb-cpp-sdk/client/extension_common/extension.h>
 
-namespace NDiscoveryMutator::inline V3 {
+namespace NDiscoveryMutator {
+inline namespace Dev {
 
 class TDiscoveryMutator: public NYdb::IExtension {
 public:
@@ -26,4 +27,5 @@ class TDiscoveryMutator: public NYdb::IExtension {
     }
 };
 
-} // namespace NDiscoveryMutator
+}
+}

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

@@ -8,7 +8,8 @@
 #include <library/cpp/monlib/service/pages/mon_page.h>
 #include <library/cpp/monlib/service/monservice.h>
 
-namespace NSolomonStatExtension::inline V3 {
+namespace NSolomonStatExtension {
+inline namespace Dev {
 
 class TSolomonStatPullExtension: public NYdb::IExtension {
 public:
@@ -54,4 +55,5 @@ class TSolomonStatPullExtension: public NYdb::IExtension {
     TIntrusivePtr<TSolomonStatPage> Page_;
 };
 
-} // namespace NSolomonStatExtension
+}
+}

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

@@ -4,7 +4,8 @@
 
 #include <library/cpp/monlib/metrics/metric_registry.h>
 
-namespace NSolomonStatExtension::inline V3 {
+namespace NSolomonStatExtension {
+inline namespace Dev {
 
 template <typename TMetricRegistryPtr>
 class TMetricRegistryConnector: public NYdb::IExtension {
@@ -68,4 +69,5 @@ inline void AddMetricRegistry(NYdb::TDriver& driver, TAtomicSharedPtr<NMonitorin
     driver.AddExtension<TConnector>(TConnector::TParams(ptr));
 }
 
-} // namespace NSolomonStatExtension
+}
+}

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

@@ -8,7 +8,9 @@
 
 #include <unordered_set>
 
-namespace NYdb::inline V3::NFederatedTopic {
+namespace NYdb {
+inline namespace Dev {
+namespace NFederatedTopic {
 
 using NTopic::TPrintable;
 using TDbInfo = Ydb::FederationDiscovery::DatabaseInfo;
@@ -523,9 +525,9 @@ class TFederatedTopicClient {
     std::shared_ptr<TImpl> Impl_;
 };
 
-} // namespace NYdb::NFederatedTopic
+}
 
-namespace NYdb::inline V3::NTopic {
+namespace NTopic {
 
 using namespace NFederatedTopic;
 
@@ -551,3 +553,5 @@ template<>
 void TPrintable<NFederatedTopic::TReadSessionEvent::TFederated<NFederatedTopic::TReadSessionEvent::TPartitionSessionClosedEvent>>::DebugString(TStringBuilder& res, bool) const;
 
 }
+}
+}