Skip to content

Commit f9e7321

Browse files
GazizonokiGazizonoki
authored
Moved util public headers to include dir (ydb-platform#213)
1 parent ee73e9f commit f9e7321

File tree

820 files changed

+1568
-1543
lines changed

Some content is hidden

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

820 files changed

+1568
-1543
lines changed

‎examples/secondary_index/secondary_index_generate.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "secondary_index.h"
22

3-
#include <src/util/random/random.h>
4-
#include <src/util/thread/pool.h>
3+
#include <ydb-cpp-sdk/util/random/random.h>
4+
#include <ydb-cpp-sdk/util/thread/pool.h>
55

66
using namespace NLastGetopt;
77
using namespace NYdb;

‎examples/secondary_index_builtin/secondary_index.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
#include <src/library/getopt/last_getopt.h>
77
#include <string>
8-
#include <src/util/generic/yexception.h>
9-
#include <src/util/stream/output.h>
10-
#include <src/util/string/builder.h>
8+
#include <ydb-cpp-sdk/util/generic/yexception.h>
9+
#include <ydb-cpp-sdk/util/stream/output.h>
10+
#include <ydb-cpp-sdk/util/string/builder.h>
1111

1212
#define TABLE_USERS "users"
1313
#define TABLE_SERIES "series"

‎examples/secondary_index_builtin/secondary_index_fill.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "secondary_index.h"
22

3-
#include <src/util/random/random.h>
3+
#include <ydb-cpp-sdk/util/random/random.h>
44

55
using namespace NYdb;
66
using namespace NYdb::NTable;

‎examples/ttl/util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <ydb-cpp-sdk/client/table/table.h>
44

55
#include <src/util/folder/pathsplit.h>
6-
#include <src/util/generic/yexception.h>
6+
#include <ydb-cpp-sdk/util/generic/yexception.h>
77

88
namespace NExample {
99

‎include/ydb-cpp-sdk/client/iam/common/iam.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <ydb-cpp-sdk/library/jwt/jwt.h>
1010
#include <ydb-cpp-sdk/util/datetime/base.h>
1111

12-
#include <src/util/system/spinlock.h>
13-
#include <src/util/string/builder.h>
12+
#include <ydb-cpp-sdk/util/system/spinlock.h>
13+
#include <ydb-cpp-sdk/util/string/builder.h>
1414

1515
#include <fstream>
1616

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <ydb-cpp-sdk/client/driver/driver.h>
44
#include <ydb-cpp-sdk/client/types/operation/operation.h>
55

6-
#include <src/util/string/builder.h>
6+
#include <ydb-cpp-sdk/util/string/builder.h>
77

88
namespace NYdb {
99
namespace NOperation {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
#include <src/util/stream/output.h>
5+
#include <ydb-cpp-sdk/util/stream/output.h>
66

77
#include <optional>
88

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ class TChangefeedDescription {
228228
TChangefeedDescription& WithInitialScan();
229229
// Attributes
230230
TChangefeedDescription& AddAttribute(const std::string& key, const std::string& value);
231-
TChangefeedDescription& SetAttributes(const THashMap<std::string, std::string>& attrs);
232-
TChangefeedDescription& SetAttributes(THashMap<std::string, std::string>&& attrs);
231+
TChangefeedDescription& SetAttributes(const std::unordered_map<std::string, std::string>& attrs);
232+
TChangefeedDescription& SetAttributes(std::unordered_map<std::string, std::string>&& attrs);
233233
// Value that will be emitted in the `awsRegion` field of the record in DynamoDBStreamsJson format
234234
TChangefeedDescription& WithAwsRegion(const std::string& value);
235235

@@ -240,7 +240,7 @@ class TChangefeedDescription {
240240
bool GetVirtualTimestamps() const;
241241
const std::optional<TDuration>& GetResolvedTimestamps() const;
242242
bool GetInitialScan() const;
243-
const THashMap<std::string, std::string>& GetAttributes() const;
243+
const std::unordered_map<std::string, std::string>& GetAttributes() const;
244244
const std::string& GetAwsRegion() const;
245245

246246
void SerializeTo(Ydb::Table::Changefeed& proto) const;
@@ -263,7 +263,7 @@ class TChangefeedDescription {
263263
std::optional<TDuration> ResolvedTimestamps_;
264264
std::optional<TDuration> RetentionPeriod_;
265265
bool InitialScan_ = false;
266-
THashMap<std::string, std::string> Attributes_;
266+
std::unordered_map<std::string, std::string> Attributes_;
267267
std::string AwsRegion_;
268268
};
269269

@@ -520,7 +520,7 @@ class TTableDescription {
520520
const std::vector<TColumnFamilyDescription>& GetColumnFamilies() const;
521521

522522
// Attributes
523-
const THashMap<std::string, std::string>& GetAttributes() const;
523+
const std::unordered_map<std::string, std::string>& GetAttributes() const;
524524

525525
// Returns partitioning settings of the table
526526
const TPartitioningSettings& GetPartitioningSettings() const;
@@ -564,8 +564,8 @@ class TTableDescription {
564564
void SetStorageSettings(const TStorageSettings& settings);
565565
void AddColumnFamily(const TColumnFamilyDescription& desc);
566566
void AddAttribute(const std::string& key, const std::string& value);
567-
void SetAttributes(const THashMap<std::string, std::string>& attrs);
568-
void SetAttributes(THashMap<std::string, std::string>&& attrs);
567+
void SetAttributes(const std::unordered_map<std::string, std::string>& attrs);
568+
void SetAttributes(std::unordered_map<std::string, std::string>&& attrs);
569569
void SetCompactionPolicy(const std::string& name);
570570
void SetUniformPartitions(ui64 partitionsCount);
571571
void SetPartitionAtKeys(const TExplicitPartitions& keys);
@@ -787,8 +787,8 @@ class TTableBuilder {
787787
TTableBuilder& AddColumnFamily(const TColumnFamilyDescription& desc);
788788

789789
TTableBuilder& AddAttribute(const std::string& key, const std::string& value);
790-
TTableBuilder& SetAttributes(const THashMap<std::string, std::string>& attrs);
791-
TTableBuilder& SetAttributes(THashMap<std::string, std::string>&& attrs);
790+
TTableBuilder& SetAttributes(const std::unordered_map<std::string, std::string>& attrs);
791+
TTableBuilder& SetAttributes(std::unordered_map<std::string, std::string>&& attrs);
792792

793793
TTableBuilder& SetCompactionPolicy(const std::string& name);
794794

@@ -1379,7 +1379,7 @@ class TAlterAttributesBuilder {
13791379

13801380
private:
13811381
TAlterTableSettings& Parent_;
1382-
THashMap<std::string, std::string> AlterAttributes_;
1382+
std::unordered_map<std::string, std::string> AlterAttributes_;
13831383
};
13841384

13851385
class TAlterPartitioningSettingsBuilder {
@@ -1422,7 +1422,7 @@ class TAlterPartitioningSettingsBuilder {
14221422

14231423
struct TAlterTableSettings : public TOperationRequestSettings<TAlterTableSettings> {
14241424
using TSelf = TAlterTableSettings;
1425-
using TAlterAttributes = THashMap<std::string, std::string>;
1425+
using TAlterAttributes = std::unordered_map<std::string, std::string>;
14261426

14271427
TAlterTableSettings();
14281428

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#include <ydb-cpp-sdk/library/monlib/dynamic_counters/counters.h>
88
#include <ydb-cpp-sdk/library/logger/log.h>
99
#include <ydb-cpp-sdk/library/retry/retry_policy.h>
10-
#include <src/util/string/builder.h>
10+
#include <ydb-cpp-sdk/util/string/builder.h>
1111

1212
#include <ydb-cpp-sdk/util/datetime/base.h>
1313
#include <ydb-cpp-sdk/util/generic/size_literals.h>
14-
#include <src/util/thread/pool.h>
14+
#include <ydb-cpp-sdk/util/thread/pool.h>
1515

1616
#include <exception>
1717
#include <variant>
@@ -626,7 +626,7 @@ struct TWriteSessionMeta: public TThrRefBase {
626626
using TPtr = TIntrusivePtr<TWriteSessionMeta>;
627627

628628
//! User defined fields.
629-
THashMap<std::string, std::string> Fields;
629+
std::unordered_map<std::string, std::string> Fields;
630630
};
631631

632632
struct TMessageMeta: public TThrRefBase {

‎include/ydb-cpp-sdk/client/types/exceptions/exceptions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <src/util/generic/yexception.h>
3+
#include <ydb-cpp-sdk/util/generic/yexception.h>
44

55
namespace NYdb {
66

‎include/ydb-cpp-sdk/library/cgiparam/cgiparam.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <ydb-cpp-sdk/library/iterator/iterate_values.h>
44

5-
#include <src/util/generic/iterator_range.h>
5+
#include <ydb-cpp-sdk/util/generic/iterator_range.h>
66
#include <string_view>
77
#include <string>
88

‎include/ydb-cpp-sdk/library/containers/stack_vector/stack_vec.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <src/util/memory/alloc.h>
4-
#include <src/util/ysaveload.h>
3+
#include <ydb-cpp-sdk/util/memory/alloc.h>
4+
#include <ydb-cpp-sdk/util/ysaveload.h>
55

66
#include <type_traits>
77

‎include/ydb-cpp-sdk/library/coroutine/listener/listen.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <src/util/generic/ptr.h>
3+
#include <ydb-cpp-sdk/util/generic/ptr.h>
44
#include <ydb-cpp-sdk/util/generic/ylimits.h>
55

66
struct TIpAddress;

‎include/ydb-cpp-sdk/library/grpc/client/grpc_client_low.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include "grpc_common.h"
44

5-
#include <src/util/thread/factory.h>
6-
#include <src/util/string/builder.h>
5+
#include <ydb-cpp-sdk/util/thread/factory.h>
6+
#include <ydb-cpp-sdk/util/string/builder.h>
77
#include <grpc++/grpc++.h>
88
#include <grpc++/support/async_stream.h>
99
#include <grpc++/support/async_unary_call.h>

‎include/ydb-cpp-sdk/library/http/fetch/httpheader.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#include <ydb-cpp-sdk/library/mime/types/mime.h>
88

99
#include <ydb-cpp-sdk/util/system/defaults.h>
10-
#include <src/util/system/compat.h>
10+
#include <ydb-cpp-sdk/util/system/compat.h>
1111
#include <string>
1212
#include <ydb-cpp-sdk/util/generic/ylimits.h>
13-
#include <src/util/system/maxlen.h>
13+
#include <ydb-cpp-sdk/util/system/maxlen.h>
1414

1515
#include <ctime>
1616
#include <cstdio>

‎include/ydb-cpp-sdk/library/http/io/headers.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include <src/util/string/builder.h>
3+
#include <ydb-cpp-sdk/util/string/builder.h>
44

55
#include <string>
66
#include <string_view>
77

8-
#include <src/util/string/cast.h>
8+
#include <ydb-cpp-sdk/util/string/cast.h>
99

1010
class IInputStream;
1111
class IOutputStream;

‎include/ydb-cpp-sdk/library/http/io/stream.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
#include "headers.h"
44

5-
#include <src/util/stream/output.h>
5+
#include <ydb-cpp-sdk/util/stream/output.h>
66
#include <span>
77
#include <string>
88
#include <string_view>
9-
#include <src/util/generic/yexception.h>
9+
#include <ydb-cpp-sdk/util/generic/yexception.h>
1010

1111
#include <memory>
1212

‎include/ydb-cpp-sdk/library/http/server/conn.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <ydb-cpp-sdk/library/http/io/stream.h>
4-
#include <src/util/generic/ptr.h>
4+
#include <ydb-cpp-sdk/util/generic/ptr.h>
55

66
class TSocket;
77

‎include/ydb-cpp-sdk/library/http/server/http.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#include "conn.h"
44
#include "options.h"
55

6-
#include <src/util/thread/pool.h>
6+
#include <ydb-cpp-sdk/util/thread/pool.h>
77
#include <ydb-cpp-sdk/library/http/io/stream.h>
8-
#include <src/util/memory/blob.h>
9-
#include <src/util/generic/ptr.h>
8+
#include <ydb-cpp-sdk/util/memory/blob.h>
9+
#include <ydb-cpp-sdk/util/generic/ptr.h>
1010

1111
#include <ydb-cpp-sdk/library/deprecated/atomic/atomic.h>
1212

‎include/ydb-cpp-sdk/library/http/server/options.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <src/util/network/ip.h>
4-
#include <src/util/network/init.h>
5-
#include <src/util/network/address.h>
3+
#include <ydb-cpp-sdk/util/network/ip.h>
4+
#include <ydb-cpp-sdk/util/network/init.h>
5+
#include <ydb-cpp-sdk/util/network/address.h>
66
#include <ydb-cpp-sdk/util/generic/size_literals.h>
77

88
#include <ydb-cpp-sdk/util/datetime/base.h>

‎include/ydb-cpp-sdk/library/iterator/mapped.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <src/util/generic/iterator_range.h>
4-
#include <src/util/generic/store_policy.h>
3+
#include <ydb-cpp-sdk/util/generic/iterator_range.h>
4+
#include <ydb-cpp-sdk/util/generic/store_policy.h>
55

66
#include <functional>
77
#include <iterator>

‎include/ydb-cpp-sdk/library/json/common/defs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <string_view>
4-
#include <src/util/generic/yexception.h>
4+
#include <ydb-cpp-sdk/util/generic/yexception.h>
55

66
namespace NJson {
77
class TJsonException: public yexception {

‎include/ydb-cpp-sdk/library/json/json_reader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <ydb-cpp-sdk/library/json/common/defs.h>
66
#include <ydb-cpp-sdk/library/json/fast_sax/parser.h>
77

8-
#include <src/util/stream/mem.h>
8+
#include <ydb-cpp-sdk/util/stream/mem.h>
99

1010
namespace NJson {
1111
struct TJsonReaderConfig {

‎include/ydb-cpp-sdk/library/json/writer/json.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <src/util/generic/yexception.h>
4-
#include <src/util/string/cast.h>
3+
#include <ydb-cpp-sdk/util/generic/yexception.h>
4+
#include <ydb-cpp-sdk/util/string/cast.h>
55

66
#include <vector>
77

‎include/ydb-cpp-sdk/library/json/writer/json_value.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
#include <ydb-cpp-sdk/library/json/common/defs.h>
44

5-
#include <src/util/generic/hash.h>
5+
#include <ydb-cpp-sdk/util/generic/utility.h>
6+
#include <ydb-cpp-sdk/util/generic/yexception.h>
67

7-
#include <src/util/generic/utility.h>
8-
#include <src/util/generic/yexception.h>
8+
#include <unordered_map>
99

1010
namespace NJson {
1111
enum EJsonValueType {
@@ -33,7 +33,7 @@ namespace NJson {
3333
void Clear() noexcept;
3434

3535
public:
36-
typedef THashMap<std::string, TJsonValue> TMapType;
36+
typedef std::unordered_map<std::string, TJsonValue> TMapType;
3737
typedef std::deque<TJsonValue> TArray;
3838

3939
TJsonValue() noexcept = default;
@@ -265,10 +265,10 @@ namespace NJson {
265265
: TJsonValue(NJson::JSON_MAP)
266266
{}
267267

268-
TJsonMap(const std::initializer_list<std::pair<std::string, TJsonValue>>& list)
268+
TJsonMap(const std::initializer_list<std::pair<const std::string, TJsonValue>>& list)
269269
: TJsonValue(NJson::JSON_MAP)
270270
{
271-
GetMapSafe() = THashMap<std::string, TJsonValue>(list);
271+
GetMapSafe() = std::unordered_map<std::string, TJsonValue>(list);
272272
}
273273
};
274274

‎include/ydb-cpp-sdk/library/logger/backend.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "priority.h"
44

5-
#include <src/util/generic/noncopyable.h>
5+
#include <ydb-cpp-sdk/util/generic/noncopyable.h>
66
#include <vector>
77
#include <cstddef>
88

‎include/ydb-cpp-sdk/library/logger/element.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "record.h"
55

66

7-
#include <src/util/string/cast.h>
8-
#include <src/util/stream/tempbuf.h>
7+
#include <ydb-cpp-sdk/util/string/cast.h>
8+
#include <ydb-cpp-sdk/util/stream/tempbuf.h>
99

1010

1111
class TLog;

‎include/ydb-cpp-sdk/library/logger/log.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "record.h"
77
#include "thread.h"
88

9-
#include <src/util/generic/ptr.h>
9+
#include <ydb-cpp-sdk/util/generic/ptr.h>
1010

1111
#include <functional>
1212
#include <cstdarg>

0 commit comments

Comments
 (0)