aboutsummaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorAlexSm <alex@ydb.tech>2023-12-21 15:05:38 +0100
committerGitHub <noreply@github.com>2023-12-21 15:05:38 +0100
commite98bcbc74422492351c51646dba3849a138a8ffc (patch)
tree38ad7a09b1f9c201ce8a7e3d69f2017388769224 /library
parent559d7083cd8378cb25b9e966dedcca21d413e338 (diff)
downloadydb-e98bcbc74422492351c51646dba3849a138a8ffc.tar.gz
Import libs 1 (#590)
* Import libs 1 * Add new file without extension * Add file missed in export config
Diffstat (limited to 'library')
-rw-r--r--library/cpp/ipmath/ipmath.cpp34
-rw-r--r--library/cpp/ipmath/ipmath.h20
-rw-r--r--library/cpp/ipv6_address/ipv6_address.cpp6
-rw-r--r--library/cpp/ipv6_address/ipv6_address.h3
-rw-r--r--library/cpp/yt/misc/thread_name.h2
5 files changed, 33 insertions, 32 deletions
diff --git a/library/cpp/ipmath/ipmath.cpp b/library/cpp/ipmath/ipmath.cpp
index 110652b861..53f19dbb01 100644
--- a/library/cpp/ipmath/ipmath.cpp
+++ b/library/cpp/ipmath/ipmath.cpp
@@ -50,7 +50,7 @@ namespace {
auto UpperBoundForPrefix4 = UpperBoundForPrefix<IPV4_BITS>;
auto UpperBoundForPrefix6 = UpperBoundForPrefix<IPV6_BITS>;
- TIpv6Address IpFromStringSafe(const TString& s) {
+ TIpv6Address IpFromStringSafe(const TStringBuf s) {
bool ok{};
auto addr = TIpv6Address::FromString(s, ok);
Y_ENSURE(ok, "Failed to parse an IP address from " << s);
@@ -117,7 +117,7 @@ TIpAddressRange TIpAddressRange::TIpAddressRangeBuilder::Build() {
return TIpAddressRange{Start_, End_};
}
-TIpAddressRange::TIpAddressRangeBuilder::TIpAddressRangeBuilder(const TString& from)
+TIpAddressRange::TIpAddressRangeBuilder::TIpAddressRangeBuilder(const TStringBuf from)
: TIpAddressRangeBuilder{IpFromStringSafe(from)}
{
}
@@ -128,7 +128,7 @@ TIpAddressRange::TIpAddressRangeBuilder::TIpAddressRangeBuilder(TIpv6Address fro
End_ = Start_;
}
-TIpAddressRange::TIpAddressRangeBuilder& TIpAddressRange::TIpAddressRangeBuilder::To(const TString& to) {
+TIpAddressRange::TIpAddressRangeBuilder& TIpAddressRange::TIpAddressRangeBuilder::To(const TStringBuf to) {
End_ = IpFromStringSafe(to);
return *this;
}
@@ -171,7 +171,7 @@ TIpAddressRange::TIpAddressRange(TIpv6Address start, TIpv6Address end) {
Init(start, end);
}
-TIpAddressRange::TIpAddressRange(const TString& start, const TString& end) {
+TIpAddressRange::TIpAddressRange(const TStringBuf start, const TStringBuf end) {
auto startAddr = IpFromStringSafe(start);
auto endAddr = IpFromStringSafe(end);
Init(startAddr, endAddr);
@@ -222,7 +222,7 @@ TIpAddressRange TIpAddressRange::Union(const TIpAddressRange& other) const {
return {s, e};
}
-TIpAddressRange TIpAddressRange::FromCidrString(const TString& str) {
+TIpAddressRange TIpAddressRange::FromCidrString(const TStringBuf str) {
if (auto result = TryFromCidrString(str)) {
return *result;
}
@@ -230,9 +230,9 @@ TIpAddressRange TIpAddressRange::FromCidrString(const TString& str) {
ythrow TInvalidIpRangeException() << "Cannot parse " << str << " as a CIDR string";
}
-TMaybe<TIpAddressRange> TIpAddressRange::TryFromCidrString(const TString& str) {
+TMaybe<TIpAddressRange> TIpAddressRange::TryFromCidrString(const TStringBuf str) {
auto idx = str.rfind('/');
- if (idx == TString::npos) {
+ if (idx == TStringBuf::npos) {
return Nothing();
}
@@ -246,11 +246,11 @@ TMaybe<TIpAddressRange> TIpAddressRange::TryFromCidrString(const TString& str) {
return Nothing();
}
- return TIpAddressRange::From(TString{address})
+ return TIpAddressRange::From(address)
.WithPrefix(prefixLen);
}
-TIpAddressRange TIpAddressRange::FromRangeString(const TString& str) {
+TIpAddressRange TIpAddressRange::FromRangeString(const TStringBuf str) {
if (auto result = TryFromRangeString(str)) {
return *result;
}
@@ -258,9 +258,9 @@ TIpAddressRange TIpAddressRange::FromRangeString(const TString& str) {
ythrow TInvalidIpRangeException() << "Cannot parse " << str << " as a range string";
}
-TMaybe<TIpAddressRange> TIpAddressRange::TryFromRangeString(const TString& str) {
+TMaybe<TIpAddressRange> TIpAddressRange::TryFromRangeString(const TStringBuf str) {
auto idx = str.find('-');
- if (idx == TString::npos) {
+ if (idx == TStringBuf::npos) {
return Nothing();
}
@@ -269,10 +269,10 @@ TMaybe<TIpAddressRange> TIpAddressRange::TryFromRangeString(const TString& str)
sb.SplitAt(idx, start, end);
end.Skip(1);
- return TIpAddressRange::From(TString{start}).To(TString{end});
+ return TIpAddressRange::From(start).To(end);
}
-TIpAddressRange TIpAddressRange::FromString(const TString& str) {
+TIpAddressRange TIpAddressRange::FromString(const TStringBuf str) {
if (auto result = TryFromString(str)) {
return *result;
}
@@ -280,10 +280,10 @@ TIpAddressRange TIpAddressRange::FromString(const TString& str) {
ythrow TInvalidIpRangeException() << "Cannot parse an IP address from " << str;
}
-TMaybe<TIpAddressRange> TIpAddressRange::TryFromString(const TString& str) {
- if (auto idx = str.find('/'); idx != TString::npos) {
+TMaybe<TIpAddressRange> TIpAddressRange::TryFromString(const TStringBuf str) {
+ if (auto idx = str.find('/'); idx != TStringBuf::npos) {
return TryFromCidrString(str);
- } else if (idx = str.find('-'); idx != TString::npos) {
+ } else if (idx = str.find('-'); idx != TStringBuf::npos) {
return TryFromRangeString(str);
} else {
bool ok{};
@@ -321,7 +321,7 @@ TIpAddressRange::TIpAddressRangeBuilder TIpAddressRange::From(TIpv6Address from)
return TIpAddressRangeBuilder{from};
}
-TIpAddressRange::TIpAddressRangeBuilder TIpAddressRange::From(const TString& from) {
+TIpAddressRange::TIpAddressRangeBuilder TIpAddressRange::From(const TStringBuf from) {
return TIpAddressRangeBuilder{from};
}
diff --git a/library/cpp/ipmath/ipmath.h b/library/cpp/ipmath/ipmath.h
index b6df5416f8..f1c15e341e 100644
--- a/library/cpp/ipmath/ipmath.h
+++ b/library/cpp/ipmath/ipmath.h
@@ -19,11 +19,11 @@ public:
TIpAddressRange() = default;
TIpAddressRange(TIpv6Address start, TIpv6Address end);
- TIpAddressRange(const TString& start, const TString& end);
+ TIpAddressRange(const TStringBuf start, const TStringBuf end);
~TIpAddressRange();
static TIpAddressRangeBuilder From(TIpv6Address from);
- static TIpAddressRangeBuilder From(const TString& from);
+ static TIpAddressRangeBuilder From(const TStringBuf from);
/**
* Parses a string tormatted in Classless Iter-Domain Routing (CIDR) notation.
@@ -31,8 +31,8 @@ public:
* @return a new TIpAddressRange
* @throws TInvalidIpRangeException if the string cannot be parsed.
*/
- static TIpAddressRange FromCidrString(const TString& str);
- static TMaybe<TIpAddressRange> TryFromCidrString(const TString& str);
+ static TIpAddressRange FromCidrString(const TStringBuf str);
+ static TMaybe<TIpAddressRange> TryFromCidrString(const TStringBuf str);
/**
* Parses a string formatted as two dash-separated addresses.
@@ -40,8 +40,8 @@ public:
* @return a new TIpAddressRange
* @throws TInvalidIpRangeException if the string cannot be parsed.
*/
- static TIpAddressRange FromRangeString(const TString& str);
- static TMaybe<TIpAddressRange> TryFromRangeString(const TString& str);
+ static TIpAddressRange FromRangeString(const TStringBuf str);
+ static TMaybe<TIpAddressRange> TryFromRangeString(const TStringBuf str);
TString ToRangeString() const;
@@ -50,8 +50,8 @@ public:
* @return a new TIpAddressRange
* @throws TInvlidIpRangeException if the string doesn't match any known format or if parsing failed.
*/
- static TIpAddressRange FromString(const TString& str);
- static TMaybe<TIpAddressRange> TryFromString(const TString& str);
+ static TIpAddressRange FromString(const TStringBuf str);
+ static TMaybe<TIpAddressRange> TryFromString(const TStringBuf str);
TIpType Type() const;
@@ -114,7 +114,7 @@ class TIpAddressRange::TIpAddressRangeBuilder {
friend class TIpAddressRange;
TIpAddressRangeBuilder() = default;
TIpAddressRangeBuilder(TIpv6Address from);
- TIpAddressRangeBuilder(const TString& from);
+ TIpAddressRangeBuilder(const TStringBuf from);
TIpAddressRangeBuilder(const TIpAddressRangeBuilder&) = default;
TIpAddressRangeBuilder& operator=(const TIpAddressRangeBuilder&) = default;
@@ -125,7 +125,7 @@ public:
operator TIpAddressRange();
TIpAddressRange Build();
- TIpAddressRangeBuilder& To(const TString&);
+ TIpAddressRangeBuilder& To(const TStringBuf);
TIpAddressRangeBuilder& To(TIpv6Address);
TIpAddressRangeBuilder& WithPrefix(ui8 len);
diff --git a/library/cpp/ipv6_address/ipv6_address.cpp b/library/cpp/ipv6_address/ipv6_address.cpp
index 75007d56ee..c2b33bcbe8 100644
--- a/library/cpp/ipv6_address/ipv6_address.cpp
+++ b/library/cpp/ipv6_address/ipv6_address.cpp
@@ -310,7 +310,7 @@ NAddr::IRemoteAddr* ToIRemoteAddr(const TIpv6Address& Address, TIpPort Port) {
return new TRemoteAddr(Address, Port);
}
-std::tuple<THostAddressAndPort, TString, TIpPort> ParseHostAndMayBePortFromString(const TString& RawStr,
+std::tuple<THostAddressAndPort, TString, TIpPort> ParseHostAndMayBePortFromString(const TStringBuf RawStr,
TIpPort DefaultPort,
bool& Ok) noexcept {
// Cout << "ParseHostAndMayBePortFromString: " << RawStr << ", Port: " << DefaultPort << Endl;
@@ -320,7 +320,7 @@ std::tuple<THostAddressAndPort, TString, TIpPort> ParseHostAndMayBePortFromStrin
// ---------------------------------------------------------------------
const size_t BracketColPos = RawStr.find("]:");
- if (BracketColPos != TString::npos) {
+ if (BracketColPos != TStringBuf::npos) {
// [ipv6]:port
if (!RawStr.StartsWith('[')) {
Ok = false;
@@ -375,7 +375,7 @@ std::tuple<THostAddressAndPort, TString, TIpPort> ParseHostAndMayBePortFromStrin
// ---------------------------------------------------------------------
const size_t ColPos = RawStr.find(':');
- if (ColPos != TString::npos) {
+ if (ColPos != TStringBuf::npos) {
// host:port
// ipv4:port
// ipv6
diff --git a/library/cpp/ipv6_address/ipv6_address.h b/library/cpp/ipv6_address/ipv6_address.h
index a6ca43a843..44e5e79012 100644
--- a/library/cpp/ipv6_address/ipv6_address.h
+++ b/library/cpp/ipv6_address/ipv6_address.h
@@ -1,6 +1,7 @@
#pragma once
#include <util/generic/hash_set.h>
+#include <util/generic/strbuf.h>
#include <util/network/ip.h>
#include <util/stream/input.h>
@@ -200,7 +201,7 @@ IOutputStream& operator<<(IOutputStream& Out, const THostAddressAndPort& HostAdd
/// 2001::7348 // port wil be equal to DefaultPort
/// [2001::7348]:80
///
-std::tuple<THostAddressAndPort, TString, TIpPort> ParseHostAndMayBePortFromString(const TString& RawStr,
+std::tuple<THostAddressAndPort, TString, TIpPort> ParseHostAndMayBePortFromString(const TStringBuf RawStr,
TIpPort DefaultPort,
bool& Ok) noexcept;
diff --git a/library/cpp/yt/misc/thread_name.h b/library/cpp/yt/misc/thread_name.h
index 96b8ed1995..233808f99f 100644
--- a/library/cpp/yt/misc/thread_name.h
+++ b/library/cpp/yt/misc/thread_name.h
@@ -17,7 +17,7 @@ struct TThreadName
static constexpr int BufferCapacity = 16; // including zero terminator
std::array<char, BufferCapacity> Buffer{}; // zero-terminated
- int Length; // not including zero terminator
+ int Length = 0; // not including zero terminator
};
TThreadName GetCurrentThreadName();