Skip to content

Commit ec90ced

Browse files
committed
Change C++ SDK namespace from V3 to Dev (#15478)
1 parent 78e8100 commit ec90ced

Some content is hidden

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

59 files changed

+162
-89
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class TReplicationDescription {
163163
};
164164

165165
class TDescribeReplicationResult: public NScheme::TDescribePathResult {
166-
friend class NYdb::V3::TProtoAccessor;
166+
friend class NYdb::TProtoAccessor;
167167
const Ydb::Replication::DescribeReplicationResult& GetProto() const;
168168

169169
public:
@@ -188,4 +188,4 @@ class TReplicationClient {
188188
std::shared_ptr<TImpl> Impl_;
189189
};
190190

191-
} // namespace NYdb::V3::NReplication
191+
} // namespace NYdb::NReplication

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TViewDescription {
3131
};
3232

3333
class TDescribeViewResult : public NScheme::TDescribePathResult {
34-
friend class NYdb::V3::TProtoAccessor;
34+
friend class NYdb::TProtoAccessor;
3535
const Ydb::View::DescribeViewResult& GetProto() const;
3636

3737
public:
@@ -55,4 +55,4 @@ class TViewClient {
5555
std::shared_ptr<TImpl> Impl_;
5656
};
5757

58-
} // namespace NYdb::V3::NView
58+
} // namespace NYdb::NView

include/ydb-cpp-sdk/client/monitoring/monitoring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct TSelfCheckSettings : public TOperationRequestSettings<TSelfCheckSettings>
3333
};
3434

3535
class TSelfCheckResult : public TStatus {
36-
friend class NYdb::V3::TProtoAccessor;
36+
friend class NYdb::TProtoAccessor;
3737
public:
3838
TSelfCheckResult(TStatus&& status, Ydb::Monitoring::SelfCheckResult&& result);
3939
private:

include/ydb-cpp-sdk/client/params/params.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TParams {
4343
friend class NExperimental::TStreamQueryClient;
4444
friend class NQuery::TExecQueryImpl;
4545
friend class NQuery::TQueryClient;
46-
friend class NYdb::V3::TProtoAccessor;
46+
friend class NYdb::TProtoAccessor;
4747
public:
4848
bool Empty() const;
4949

include/ydb-cpp-sdk/client/query/client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,4 @@ class TExecuteQueryResult : public TStatus {
267267
std::optional<TTransaction> Transaction_;
268268
};
269269

270-
} // namespace NYdb::V3::NQuery
270+
} // namespace NYdb::NQuery

include/ydb-cpp-sdk/client/query/query.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,4 @@ class TFetchScriptResultsResult : public TStatus {
185185
using TAsyncFetchScriptResultsResult = NThreading::TFuture<TFetchScriptResultsResult>;
186186
using TAsyncExecuteQueryResult = NThreading::TFuture<TExecuteQueryResult>;
187187

188-
} // namespace NYdb::V3::NQuery
188+
} // namespace NYdb::NQuery

include/ydb-cpp-sdk/client/query/stats.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace NYdb::inline V3 {
1717
namespace NYdb::inline V3::NQuery {
1818

1919
class TExecStats {
20-
friend class NYdb::V3::TProtoAccessor;
20+
friend class NYdb::TProtoAccessor;
2121

2222
public:
2323
TExecStats() = default;
@@ -42,4 +42,4 @@ class TExecStats {
4242
std::shared_ptr<TImpl> Impl_;
4343
};
4444

45-
} // namespace NYdb::V3::NQuery
45+
} // namespace NYdb::NQuery

include/ydb-cpp-sdk/client/query/tx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ struct TTxControl {
116116
: TxSettings_(txSettings) {}
117117
};
118118

119-
} // namespace NYdb::V3::NQuery
119+
} // namespace NYdb::NQuery

include/ydb-cpp-sdk/client/rate_limiter/rate_limiter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ class TRateLimiterClient {
320320
std::shared_ptr<TImpl> Impl_;
321321
};
322322

323-
} // namespace NYdb::V3::NRateLimiter
323+
} // namespace NYdb::NRateLimiter

include/ydb-cpp-sdk/client/result/result.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bool operator!=(const TColumn& col1, const TColumn& col2);
3232
//! Collection of rows, represents result of query or part of the result in case of stream operations
3333
class TResultSet {
3434
friend class TResultSetParser;
35-
friend class NYdb::V3::TProtoAccessor;
35+
friend class NYdb::TProtoAccessor;
3636
public:
3737
TResultSet(const Ydb::ResultSet& proto);
3838
TResultSet(Ydb::ResultSet&& proto);

include/ydb-cpp-sdk/client/retry/retry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ struct TRetryOperationSettings {
4141
}
4242
};
4343

44-
} // namespace NYdb::V3::NRetry
44+
} // namespace NYdb::NRetry

include/ydb-cpp-sdk/client/table/table.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ struct TKMeansTreeSettings {
272272

273273
//! Represents index description
274274
class TIndexDescription {
275-
friend class NYdb::V3::TProtoAccessor;
275+
friend class NYdb::TProtoAccessor;
276276

277277
public:
278278
TIndexDescription(
@@ -349,7 +349,7 @@ class TBuildIndexOperation : public TOperation {
349349

350350
//! Represents changefeed description
351351
class TChangefeedDescription {
352-
friend class NYdb::V3::TProtoAccessor;
352+
friend class NYdb::TProtoAccessor;
353353

354354
public:
355355
class TInitialScanProgress {
@@ -655,7 +655,7 @@ enum class EStoreType {
655655
//! Represents table description
656656
class TTableDescription {
657657
friend class TTableBuilder;
658-
friend class NYdb::V3::TProtoAccessor;
658+
friend class NYdb::TProtoAccessor;
659659

660660
using EUnit = TValueSinceUnixEpochModeSettings::EUnit;
661661

@@ -1092,8 +1092,8 @@ using TAsyncScanQueryPartIterator = NThreading::TFuture<TScanQueryPartIterator>;
10921092

10931093
struct TCreateSessionSettings : public TOperationRequestSettings<TCreateSessionSettings> {};
10941094

1095-
using TBackoffSettings = NYdb::V3::NRetry::TBackoffSettings;
1096-
using TRetryOperationSettings = NYdb::V3::NRetry::TRetryOperationSettings;
1095+
using TBackoffSettings = NYdb::NRetry::TBackoffSettings;
1096+
using TRetryOperationSettings = NYdb::NRetry::TRetryOperationSettings;
10971097

10981098
struct TSessionPoolSettings {
10991099
using TSelf = TSessionPoolSettings;
@@ -2221,7 +2221,7 @@ class TExternalDataSourceDescription {
22212221
class TImpl;
22222222
std::shared_ptr<TImpl> Impl_;
22232223

2224-
friend class NYdb::V3::TProtoAccessor;
2224+
friend class NYdb::TProtoAccessor;
22252225
const Ydb::Table::DescribeExternalDataSourceResult& GetProto() const;
22262226
};
22272227

@@ -2247,7 +2247,7 @@ class TExternalTableDescription {
22472247
class TImpl;
22482248
std::shared_ptr<TImpl> Impl_;
22492249

2250-
friend class NYdb::V3::TProtoAccessor;
2250+
friend class NYdb::TProtoAccessor;
22512251
const Ydb::Table::DescribeExternalTableResult& GetProto() const;
22522252
};
22532253

include/ydb-cpp-sdk/client/topic/client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ class TTopicClient {
6161
std::shared_ptr<TImpl> Impl_;
6262
};
6363

64-
} // namespace NYdb::V3::NTopic
64+
} // namespace NYdb::NTopic

include/ydb-cpp-sdk/client/topic/codecs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ class TCodecMap {
9393
TAdaptiveLock Lock;
9494
};
9595

96-
} // namespace NYdb::V3::NTopic
96+
} // namespace NYdb::NTopic

include/ydb-cpp-sdk/client/topic/control_plane.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ struct TAlterPartitioningSettings {
267267
};
268268

269269
class TTopicDescription {
270-
friend class NYdb::V3::TProtoAccessor;
270+
friend class NYdb::TProtoAccessor;
271271

272272
public:
273273
TTopicDescription(Ydb::Topic::DescribeTopicResult&& desc);
@@ -330,7 +330,7 @@ class TTopicDescription {
330330
};
331331

332332
class TConsumerDescription {
333-
friend class NYdb::V3::TProtoAccessor;
333+
friend class NYdb::TProtoAccessor;
334334

335335
public:
336336
TConsumerDescription(Ydb::Topic::DescribeConsumerResult&& desc);
@@ -350,7 +350,7 @@ class TConsumerDescription {
350350
};
351351

352352
class TPartitionDescription {
353-
friend class NYdb::V3::TProtoAccessor;
353+
friend class NYdb::TProtoAccessor;
354354

355355
public:
356356
TPartitionDescription(Ydb::Topic::DescribePartitionResult&& desc);
@@ -365,7 +365,7 @@ class TPartitionDescription {
365365

366366
// Result for describe topic request.
367367
struct TDescribeTopicResult : public TStatus {
368-
friend class NYdb::V3::TProtoAccessor;
368+
friend class NYdb::TProtoAccessor;
369369

370370
TDescribeTopicResult(TStatus&& status, Ydb::Topic::DescribeTopicResult&& result);
371371

@@ -377,7 +377,7 @@ struct TDescribeTopicResult : public TStatus {
377377

378378
// Result for describe consumer request.
379379
struct TDescribeConsumerResult : public TStatus {
380-
friend class NYdb::V3::TProtoAccessor;
380+
friend class NYdb::TProtoAccessor;
381381

382382
TDescribeConsumerResult(TStatus&& status, Ydb::Topic::DescribeConsumerResult&& result);
383383

@@ -389,7 +389,7 @@ struct TDescribeConsumerResult : public TStatus {
389389

390390
// Result for describe partition request.
391391
struct TDescribePartitionResult: public TStatus {
392-
friend class NYdb::V3::TProtoAccessor;
392+
friend class NYdb::TProtoAccessor;
393393

394394
TDescribePartitionResult(TStatus&& status, Ydb::Topic::DescribePartitionResult&& result);
395395

@@ -768,4 +768,4 @@ struct TDescribePartitionSettings: public TOperationRequestSettings<TDescribePar
768768
// Settings for commit offset request.
769769
struct TCommitOffsetSettings : public TOperationRequestSettings<TCommitOffsetSettings> {};
770770

771-
} // namespace NYdb::V3::NTopic
771+
} // namespace NYdb::NTopic

include/ydb-cpp-sdk/client/topic/counters.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,4 @@ inline bool HasNullCounters(TReaderCounters& counters) {
169169

170170
#undef TOPIC_COUNTERS_HISTOGRAM_SETUP
171171

172-
} // namespace NYdb::V3::NTopic
172+
} // namespace NYdb::NTopic

include/ydb-cpp-sdk/client/topic/errors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ namespace NYdb::inline V3::NTopic {
1010
ERetryErrorClass GetRetryErrorClass(EStatus status);
1111
ERetryErrorClass GetRetryErrorClassV2(EStatus status);
1212

13-
} // namespace NYdb::V3::NTopic
13+
} // namespace NYdb::NTopic

include/ydb-cpp-sdk/client/topic/retry_policy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ struct IRetryPolicy: ::IRetryPolicy<EStatus> {
3838
std::function<ERetryErrorClass(EStatus)> customRetryClassFunction = {});
3939
};
4040

41-
} // namespace NYdb::V3::NTopic
41+
} // namespace NYdb::NTopic

include/ydb-cpp-sdk/library/issue/yql_issue.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#include <string>
1515
#include <string_view>
1616

17-
namespace NYdb::NIssue {
17+
namespace NYdb {
18+
inline namespace V3 {
19+
namespace NIssue {
1820

1921
using TIssueCode = uint32_t;
2022
constexpr TIssueCode DEFAULT_ERROR = 0;
@@ -329,7 +331,9 @@ class TErrorException : public yexception {
329331
TIssue ExceptionToIssue(const std::exception& e, const TPosition& pos = TPosition());
330332
std::optional<TPosition> TryParseTerminationMessage(std::string_view& message);
331333

332-
} // namespace NYql
334+
}
335+
}
336+
}
333337

334338
template <>
335339
void Out<NYdb::NIssue::TPosition>(IOutputStream& out, const NYdb::NIssue::TPosition& pos);

include/ydb-cpp-sdk/library/jwt/jwt.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <util/datetime/base.h>
44

55
namespace NYdb {
6+
inline namespace V3 {
67

78
struct TJwtParams {
89
std::string PrivKey;
@@ -17,4 +18,5 @@ std::string MakeSignedJwt(
1718
const TDuration& lifetime = TDuration::Hours(1)
1819
);
1920

20-
} // namespace NYdb
21+
}
22+
}

include/ydb-cpp-sdk/library/operation_id/operation_id.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ namespace Ydb {
99
}
1010

1111
namespace NKikimr {
12+
inline namespace V3 {
1213
namespace NOperationId {
1314

1415
class TOperationId {
@@ -69,5 +70,6 @@ TOperationId::EKind ParseKind(const std::string_view value);
6970
std::string FormatPreparedQueryIdCompat(const std::string& str);
7071
bool DecodePreparedQueryIdCompat(const std::string& in, std::string& out);
7172

72-
} // namespace NOperationId
73-
} // namespace NKikimr
73+
}
74+
}
75+
}

include/ydb-cpp-sdk/library/string_utils/helpers/helpers.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include <string>
44

5+
namespace NYdb {
6+
inline namespace V3 {
57
namespace NUtils {
68

79
char* ToLower(char* str) noexcept(noexcept(std::tolower(0)));
@@ -80,4 +82,6 @@ std::string Join(const R&... r) {
8082
template <typename TChar>
8183
std::basic_string<TChar> FromAscii(const std::string_view& s);
8284

83-
} // namespace NUtils
85+
}
86+
}
87+
}

include/ydb-cpp-sdk/library/string_utils/misc/misc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
#include <optional>
99

10+
namespace NYdb {
11+
inline namespace V3 {
1012
namespace NUtils {
1113

1214
template <class TContainer, class T>
@@ -58,4 +60,6 @@ void GetNext(std::string_view& s, D delim, std::optional<std::string_view>& para
5860
}
5961
}
6062

63+
}
64+
}
6165
}

include/ydb-cpp-sdk/type_switcher.h

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

3-
#ifdef YDB_SDK_USE_STD_STRING
4-
53
#include <string>
4+
65
namespace NYdb {
7-
using TStringType = std::string;
8-
}
6+
inline namespace Dev {
97

10-
#else
8+
using TStringType = std::string;
119

12-
#include <util/generic/string.h>
13-
namespace NYdb {
14-
using TStringType = TString;
1510
}
16-
17-
#endif
11+
}

src/api/protos/ydb_cms.proto

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ message DatabaseOptions {
6363
bool disable_external_subdomain = 2;
6464
// Transaction plan resolution in milliseconds
6565
uint32 plan_resolution = 3;
66+
// Number of coordinators (server default is used when zero)
67+
uint32 coordinators = 4;
68+
// Number of mediators (server default is used when zero)
69+
uint32 mediators = 5;
6670
}
6771

6872
// A set of quotas for schema operations

src/client/draft/ydb_dynamic_config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,4 +464,4 @@ TAsyncFetchStartupConfigResult TDynamicConfigClient::FetchStartupConfig(const TC
464464
return Impl_->FetchStartupConfig(settings);
465465
}
466466

467-
} // namespace NYdb::V3::NDynamicConfig
467+
} // namespace NYdb::NDynamicConfig

src/client/federated_topic/impl/federated_read_session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,4 +288,4 @@ bool TFederatedReadSessionImpl::Close(TDuration timeout) {
288288
return result;
289289
}
290290

291-
} // namespace NYdb::V3::NFederatedTopic
291+
} // namespace NYdb::NFederatedTopic

src/client/federated_topic/impl/federated_read_session.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,4 @@ class TFederatedReadSession : public IFederatedReadSession,
246246
}
247247
};
248248

249-
} // namespace NYdb::V3::NFederatedTopic
249+
} // namespace NYdb::NFederatedTopic

src/client/federated_topic/impl/federated_read_session_event.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ std::string DebugString(const TReadSessionEvent::TEvent& event) {
165165
return std::visit([](const auto& ev) { return ev.DebugString(); }, event);
166166
}
167167

168-
} // namespace NYdb::V3::NFederatedTopic
168+
} // namespace NYdb::Dev::NFederatedTopic

src/client/federated_topic/impl/federated_topic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ void TFederatedTopicClient::OverrideCodec(NTopic::ECodec codecId, std::unique_pt
8686
return Impl_->OverrideCodec(codecId, std::move(codecImpl));
8787
}
8888

89-
} // namespace NYdb::V3::NFederatedTopic
89+
} // namespace NYdb::NFederatedTopic

0 commit comments

Comments
 (0)