diff options
| author | Ilnur Khuziev <ilnur.khuziev@yandex.ru> | 2022-02-10 16:46:13 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:13 +0300 |
| commit | 736dcd8ca259457a136f2f9f9168c44643914323 (patch) | |
| tree | ddd46a036d68bfa83aa11b892f31243ea6b068a1 | |
| parent | 9bf2fa2b060c9881d3135c2208c624a1dd546ecc (diff) | |
| download | ydb-736dcd8ca259457a136f2f9f9168c44643914323.tar.gz | |
Restoring authorship annotation for Ilnur Khuziev <ilnur.khuziev@yandex.ru>. Commit 1 of 2.
1528 files changed, 4672 insertions, 4672 deletions
diff --git a/build/docs/all.md b/build/docs/all.md index 50051b596c..5aed3ebee3 100644 --- a/build/docs/all.md +++ b/build/docs/all.md @@ -761,7 +761,7 @@ Is only used together with the macros like FILES(), PEERDIR(), COPY(), FROM\_SAN Documentation: https://wiki.yandex-team.ru/yatool/large-data/ ###### Module [UNITTEST][]([name]) <a name="module_UNITTEST"></a> -Unit test module based on library/cpp/testing/unittest. +Unit test module based on library/cpp/testing/unittest. It is recommended not to specify the name. Documentation: https://wiki.yandex-team.ru/yatool/test/#opisanievya.make1 @@ -833,7 +833,7 @@ Documentation about the Arcadia test system: https://wiki.yandex-team.ru/yatool/ YT Unit test module based on mapreduce/yt/library/utlib ###### Module [Y\_BENCHMARK][]([benchmarkname]) <a name="module_Y_BENCHMARK"></a> -Benchmark test based on the library/cpp/testing/benchmark. +Benchmark test based on the library/cpp/testing/benchmark. For more details see: https://wiki.yandex-team.ru/yatool/test/#zapuskbenchmark @@ -1019,9 +1019,9 @@ Set memory allocator implementation for the PROGRAM()/DLL() module. This may only be specified for programs and dlls, use in other modules leads to configuration errors. Available allocators are: "LF", "LF\_YT", "LF\_DBG", "YT", "J", "B", "BM", "C", "TCMALLOC", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE", "MIM", "HU". - - LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc) - - LF\_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/yt/ya.make) - - LF\_DBG - Debug allocator selection (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/dbg/ya.make) + - LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc) + - LF\_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/yt/ya.make) + - LF\_DBG - Debug allocator selection (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/dbg/ya.make) - YT - The YTAlloc allocator (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/ytalloc/impl/ya.make) - J - The JEMalloc allocator (https://a.yandex-team.ru/arc/trunk/arcadia/library/malloc/jemalloc) - B - The balloc allocator named Pyotr Popov and Anton Samokhvalov diff --git a/build/docs/readme.md b/build/docs/readme.md index 3db0a653c7..c828cf7158 100644 --- a/build/docs/readme.md +++ b/build/docs/readme.md @@ -615,7 +615,7 @@ Is only used together with the macros like FILES(), PEERDIR(), COPY(), FROM\_SAN Documentation: https://wiki.yandex-team.ru/yatool/large-data/ ###### Module [UNITTEST][]([name]) <a name="module_UNITTEST"></a> -Unit test module based on library/cpp/testing/unittest. +Unit test module based on library/cpp/testing/unittest. It is recommended not to specify the name. Documentation: https://wiki.yandex-team.ru/yatool/test/#opisanievya.make1 @@ -687,7 +687,7 @@ Documentation about the Arcadia test system: https://wiki.yandex-team.ru/yatool/ YT Unit test module based on mapreduce/yt/library/utlib ###### Module [Y\_BENCHMARK][]([benchmarkname]) <a name="module_Y_BENCHMARK"></a> -Benchmark test based on the library/cpp/testing/benchmark. +Benchmark test based on the library/cpp/testing/benchmark. For more details see: https://wiki.yandex-team.ru/yatool/test/#zapuskbenchmark @@ -751,9 +751,9 @@ Set memory allocator implementation for the PROGRAM()/DLL() module. This may only be specified for programs and dlls, use in other modules leads to configuration errors. Available allocators are: "LF", "LF\_YT", "LF\_DBG", "YT", "J", "B", "BM", "C", "TCMALLOC", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE", "MIM", "HU". - - LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc) - - LF\_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/yt/ya.make) - - LF\_DBG - Debug allocator selection (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/dbg/ya.make) + - LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc) + - LF\_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/yt/ya.make) + - LF\_DBG - Debug allocator selection (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/dbg/ya.make) - YT - The YTAlloc allocator (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/ytalloc/impl/ya.make) - J - The JEMalloc allocator (https://a.yandex-team.ru/arc/trunk/arcadia/library/malloc/jemalloc) - B - The balloc allocator named Pyotr Popov and Anton Samokhvalov diff --git a/build/rules/contrib_deps.policy b/build/rules/contrib_deps.policy index 9af4b85cc2..912e078147 100644 --- a/build/rules/contrib_deps.policy +++ b/build/rules/contrib_deps.policy @@ -2,9 +2,9 @@ ALLOW contrib/clickhouse -> library/cpp/consistent_hashing ALLOW contrib -> contrib ALLOW contrib -> build ALLOW contrib -> library/python/resource -ALLOW contrib -> library/cpp/testing/unittest_main -ALLOW contrib -> library/cpp/testing/unittest -ALLOW contrib -> library/cpp/getopt +ALLOW contrib -> library/cpp/testing/unittest_main +ALLOW contrib -> library/cpp/testing/unittest +ALLOW contrib -> library/cpp/getopt ALLOW contrib -> library/cpp/resource ALLOW contrib -> library/cpp/charset ALLOW contrib -> library/cpp/svnversion @@ -73,4 +73,4 @@ ALLOW contrib/python/marshmallow-mongoengine/py[23]/tests -> library/python/pyte # contrib tests is written by us, hence everything is allowed ALLOW contrib/tests -> .* -DENY contrib -> .* +DENY contrib -> .* diff --git a/build/scripts/build_pln_header.py b/build/scripts/build_pln_header.py index c73693f444..50e9d1fb74 100755 --- a/build/scripts/build_pln_header.py +++ b/build/scripts/build_pln_header.py @@ -14,7 +14,7 @@ def BuildPlnHeader(): tmpPath = outPath + '.tmp' tmpFile = open(tmpPath, 'w') - tmpFile.write('#include <library/cpp/sse/sse.h>\n') + tmpFile.write('#include <library/cpp/sse/sse.h>\n') tmpFile.write('#include <kernel/relevfml/relev_fml.h>\n') for path in sys.argv[2:]: name = os.path.basename(path).split(".")[0] # name without extensions diff --git a/build/stdafx.hpp b/build/stdafx.hpp index 98b15adda0..5fe44a9732 100644 --- a/build/stdafx.hpp +++ b/build/stdafx.hpp @@ -242,7 +242,7 @@ #include <util/generic/queue.h> #include <util/generic/adaptor.h> #include <util/string/escape.h> -#include <library/cpp/string_utils/scan/scan.h> +#include <library/cpp/string_utils/scan/scan.h> #include <util/string/type.h> #include <util/string/join.h> #include <util/string/vector.h> diff --git a/build/ya.make b/build/ya.make index 407b8f13e0..21bcb741ff 100644 --- a/build/ya.make +++ b/build/ya.make @@ -14,7 +14,7 @@ PY_SRCS( PEERDIR( library/cpp/deprecated/enum_codegen library/cpp/deprecated/split - library/cpp/string_utils/scan + library/cpp/string_utils/scan ) END() diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 081833998b..1180c4d2e1 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1464,13 +1464,13 @@ when ($COMMON_LINK_SETTINGS == "yes") { } } "LF" ? { - PEERDIR+=library/cpp/lfalloc + PEERDIR+=library/cpp/lfalloc } "LF_YT" ? { - PEERDIR+=library/cpp/lfalloc/yt + PEERDIR+=library/cpp/lfalloc/yt } "LF_DBG" ? { - PEERDIR+=library/cpp/lfalloc/dbg + PEERDIR+=library/cpp/lfalloc/dbg } "B" ? { PEERDIR+=library/cpp/balloc @@ -1848,13 +1848,13 @@ UNITTEST_SEM=$CPP_PROGRAM_SEM && add_test NAME $REALPRJNAME COMMAND $REALPRJNAME # tag:test ### @usage: UNITTEST([name]) ### -### Unit test module based on library/cpp/testing/unittest. +### Unit test module based on library/cpp/testing/unittest. ### It is recommended not to specify the name. ### ### Documentation: https://wiki.yandex-team.ru/yatool/test/#opisanievya.make1 module UNITTEST: _BASE_UNITTEST { .SEM=UNITTEST_SEM - PEERDIR(library/cpp/testing/unittest_main) + PEERDIR(library/cpp/testing/unittest_main) ADD_YTEST($MODULE_PREFIX$REALPRJNAME unittest.py) SET(MODULE_LANG CPP) } @@ -2299,11 +2299,11 @@ module EXECTEST: _BARE_UNIT { # tag:cpp-specific tag:test ### @usage: Y_BENCHMARK([benchmarkname]) ### -### Benchmark test based on the library/cpp/testing/benchmark. +### Benchmark test based on the library/cpp/testing/benchmark. ### ### For more details see: https://wiki.yandex-team.ru/yatool/test/#zapuskbenchmark module Y_BENCHMARK: PROGRAM { - PEERDIR(library/cpp/testing/benchmark/main) + PEERDIR(library/cpp/testing/benchmark/main) SET(MODULE_LANG CPP) } @@ -5259,9 +5259,9 @@ macro ADD_PERL_MODULE(Dir, Module) { ### This may only be specified for programs and dlls, use in other modules leads to configuration errors. ### ### Available allocators are: "LF", "LF_YT", "LF_DBG", "YT", "J", "B", "BM", "C", "TCMALLOC", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE", "MIM", "HU". -### - LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc) -### - LF_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/yt/ya.make) -### - LF_DBG - Debug allocator selection (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/dbg/ya.make) +### - LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc) +### - LF_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/yt/ya.make) +### - LF_DBG - Debug allocator selection (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/lfalloc/dbg/ya.make) ### - YT - The YTAlloc allocator (https://a.yandex-team.ru/arc/trunk/arcadia/library/cpp/ytalloc/impl/ya.make) ### - J - The JEMalloc allocator (https://a.yandex-team.ru/arc/trunk/arcadia/library/malloc/jemalloc) ### - B - The balloc allocator named Pyotr Popov and Anton Samokhvalov @@ -6802,7 +6802,7 @@ macro _MX_GEN_TABLE(Srcs...) { PEERDIR(library/cpp/archive) } -RELEV_FML_CODEGEN_INCLS=${output_include;hide:"kernel/relevfml/relev_fml.h"} ${output_include;hide:"library/cpp/sse/sse.h"} +RELEV_FML_CODEGEN_INCLS=${output_include;hide:"kernel/relevfml/relev_fml.h"} ${output_include;hide:"library/cpp/sse/sse.h"} ### @usage: GENERATE_ENUM_SERIALIZATION(File.h) ### @@ -6878,7 +6878,7 @@ macro BUILD_MNS(Files...) { ### Relev specific macro. macro BUILD_PLNS(Src...) { .CMD=$YMAKE_PYTHON ${input:"build/scripts/build_pln_header.py"} ${output:"plnmodels.h"} ${input:Src} $RELEV_FML_CODEGEN_INCLS ${kv;hide:"p PN"} ${kv;hide:"pc yellow"} - .PEERDIR=kernel/relevfml library/cpp/sse + .PEERDIR=kernel/relevfml library/cpp/sse } ### @usage: COMPILE_NLG(Src...) diff --git a/contrib/libs/cctz/README b/contrib/libs/cctz/README index 8cdda27da8..b9a4415c5e 100644 --- a/contrib/libs/cctz/README +++ b/contrib/libs/cctz/README @@ -5,4 +5,4 @@ This version is based on commit 2e86a776379ec6f2a60f4a6595a3b68cd3961cb4 from ht The following changes were made compared to the vanilla Google code: * the Time Zone Database may optionally be compiled into the library (just add a PEERDIR() to contrib/libs/cctz/tzdata subdirectory in your code); * some minor cleanups to avoid clang warnings; - * the tests were modified to work with library/cpp/testing/unittest. + * the tests were modified to work with library/cpp/testing/unittest. diff --git a/contrib/libs/cxxsupp/openmp/ya.make b/contrib/libs/cxxsupp/openmp/ya.make index 2c64468375..8ee6391220 100644 --- a/contrib/libs/cxxsupp/openmp/ya.make +++ b/contrib/libs/cxxsupp/openmp/ya.make @@ -22,12 +22,12 @@ NO_PLATFORM() NO_COMPILER_WARNINGS() IF (SANITIZER_TYPE == thread) - NO_SANITIZE() + NO_SANITIZE() CFLAGS( -fPIC ) ENDIF() - + IF (SANITIZER_TYPE == memory) NO_SANITIZE() CFLAGS( diff --git a/contrib/libs/farmhash/test.cc b/contrib/libs/farmhash/test.cc index 08d191ae7c..d0ee04af9a 100644 --- a/contrib/libs/farmhash/test.cc +++ b/contrib/libs/farmhash/test.cc @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "common.h" diff --git a/contrib/libs/grpc/src/python/grpcio/grpc/__init__.py b/contrib/libs/grpc/src/python/grpcio/grpc/__init__.py index abe87458c4..c0b0ece921 100644 --- a/contrib/libs/grpc/src/python/grpcio/grpc/__init__.py +++ b/contrib/libs/grpc/src/python/grpcio/grpc/__init__.py @@ -1473,7 +1473,7 @@ class Server(six.with_metaclass(abc.ABCMeta)): 2) A timeout occurs if timeout is not `None`. The timeout argument works in the same way as `threading.Event.wait()`. - https://docs.python.org/3/library/threading.html#threading.Event.wait + https://docs.python.org/3/library/threading.html#threading.Event.wait Args: timeout: A floating point number specifying a timeout for the diff --git a/contrib/libs/libunwind/ut/libunwind_ut.cpp b/contrib/libs/libunwind/ut/libunwind_ut.cpp index 93767c50c8..ee870be94a 100644 --- a/contrib/libs/libunwind/ut/libunwind_ut.cpp +++ b/contrib/libs/libunwind/ut/libunwind_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/compiler.h> diff --git a/contrib/libs/protobuf/src/google/protobuf/message_lite.cc b/contrib/libs/protobuf/src/google/protobuf/message_lite.cc index a3f5437556..64384b43e4 100644 --- a/contrib/libs/protobuf/src/google/protobuf/message_lite.cc +++ b/contrib/libs/protobuf/src/google/protobuf/message_lite.cc @@ -514,34 +514,34 @@ TProtoStringType MessageLite::SerializePartialAsString() const { return output; } -#if PROTOBUF_USE_EXCEPTIONS && defined(__cpp_lib_string_view) -void MessageLite::ParseFromStringOrThrow(std::string_view s) { - const bool isOk = ParseFromArray(s.data(), s.size()); - if (!isOk) { - throw FatalException("message_lite.cc", __LINE__, "Failed to parse protobuf message " + GetTypeName()); - } -} -#endif - -#if PROTOBUF_USE_EXCEPTIONS -TProtoStringType NProtoBuf::MessageLite::SerializeAsStringOrThrow() const { - TProtoStringType s; - if (!IsInitialized()) { - //NOTE: SerializeToString (called inside SerializeAsString too) does not perform this check in release build - // so SerializeToString in release build return false only if result size is greater than 2gb - // but in debug build not properly inited message (without required filds) will lead to an exception - // different control flow in debug and build release look like a bug - throw FatalException("message_lite.cc", __LINE__, "Some required fileds are not set in message " + GetTypeName()); - } - const bool isOk = SerializeToString(&s); - if (!isOk) { - throw FatalException("message_lite.cc", __LINE__, "Failed to serialize protobuf message " + GetTypeName()); - } - return s; -} -#endif - - +#if PROTOBUF_USE_EXCEPTIONS && defined(__cpp_lib_string_view) +void MessageLite::ParseFromStringOrThrow(std::string_view s) { + const bool isOk = ParseFromArray(s.data(), s.size()); + if (!isOk) { + throw FatalException("message_lite.cc", __LINE__, "Failed to parse protobuf message " + GetTypeName()); + } +} +#endif + +#if PROTOBUF_USE_EXCEPTIONS +TProtoStringType NProtoBuf::MessageLite::SerializeAsStringOrThrow() const { + TProtoStringType s; + if (!IsInitialized()) { + //NOTE: SerializeToString (called inside SerializeAsString too) does not perform this check in release build + // so SerializeToString in release build return false only if result size is greater than 2gb + // but in debug build not properly inited message (without required filds) will lead to an exception + // different control flow in debug and build release look like a bug + throw FatalException("message_lite.cc", __LINE__, "Some required fileds are not set in message " + GetTypeName()); + } + const bool isOk = SerializeToString(&s); + if (!isOk) { + throw FatalException("message_lite.cc", __LINE__, "Failed to serialize protobuf message " + GetTypeName()); + } + return s; +} +#endif + + namespace internal { template <> diff --git a/contrib/libs/protobuf/src/google/protobuf/message_lite.h b/contrib/libs/protobuf/src/google/protobuf/message_lite.h index 0bbf1eb6ed..149e994418 100644 --- a/contrib/libs/protobuf/src/google/protobuf/message_lite.h +++ b/contrib/libs/protobuf/src/google/protobuf/message_lite.h @@ -281,65 +281,65 @@ class PROTOBUF_EXPORT MessageLite { // format. A successful return does not indicate the entire input is // consumed, ensure you call ConsumedEntireMessage() to check that if // applicable. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromCodedStream( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromCodedStream( io::CodedInputStream* input); // Like ParseFromCodedStream(), but accepts messages that are missing // required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromCodedStream( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromCodedStream( io::CodedInputStream* input); // Read a protocol buffer from the given zero-copy input stream. If // successful, the entire input will be consumed. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromZeroCopyStream( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromZeroCopyStream( io::ZeroCopyInputStream* input); // Like ParseFromZeroCopyStream(), but accepts messages that are missing // required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromZeroCopyStream( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromZeroCopyStream( io::ZeroCopyInputStream* input); // Parse a protocol buffer from a file descriptor. If successful, the entire // input will be consumed. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromFileDescriptor( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromFileDescriptor( int file_descriptor); // Like ParseFromFileDescriptor(), but accepts messages that are missing // required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromFileDescriptor( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromFileDescriptor( int file_descriptor); // Parse a protocol buffer from a C++ istream. If successful, the entire // input will be consumed. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromIstream(std::istream* input); + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromIstream(std::istream* input); // Like ParseFromIstream(), but accepts messages that are missing // required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromIstream( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromIstream( std::istream* input); // Read a protocol buffer from the given zero-copy input stream, expecting // the message to be exactly "size" bytes long. If successful, exactly // this many bytes will have been consumed from the input. - PROTOBUF_MUST_USE_RESULT bool MergePartialFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input, + PROTOBUF_MUST_USE_RESULT bool MergePartialFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input, int size); // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are // missing required fields. - PROTOBUF_MUST_USE_RESULT bool MergeFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input, int size); - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromBoundedZeroCopyStream( + PROTOBUF_MUST_USE_RESULT bool MergeFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input, int size); + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromBoundedZeroCopyStream( io::ZeroCopyInputStream* input, int size); // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are // missing required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromBoundedZeroCopyStream( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromBoundedZeroCopyStream( io::ZeroCopyInputStream* input, int size); // Parses a protocol buffer contained in a string. Returns true on success. // This function takes a string in the (non-human-readable) binary wire // format, matching the encoding output by MessageLite::SerializeToString(). // If you'd like to convert a human-readable string into a protocol buffer // object, see google::protobuf::TextFormat::ParseFromString(). - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromString(ConstStringParam data); + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromString(ConstStringParam data); // Like ParseFromString(), but accepts messages that are missing // required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromString( + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromString( ConstStringParam data); // Parse a protocol buffer contained in an array of bytes. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromArray(const void* data, + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParseFromArray(const void* data, int size); // Like ParseFromArray(), but accepts messages that are missing // required fields. - PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromArray(const void* data, + PROTOBUF_ATTRIBUTE_REINITIALIZES PROTOBUF_MUST_USE_RESULT bool ParsePartialFromArray(const void* data, int size); @@ -354,17 +354,17 @@ class PROTOBUF_EXPORT MessageLite { // // ParseFromCodedStream() is implemented as Clear() followed by // MergeFromCodedStream(). - PROTOBUF_MUST_USE_RESULT bool MergeFromCodedStream(io::CodedInputStream* input); + PROTOBUF_MUST_USE_RESULT bool MergeFromCodedStream(io::CodedInputStream* input); // Like MergeFromCodedStream(), but succeeds even if required fields are // missing in the input. // // MergeFromCodedStream() is just implemented as MergePartialFromCodedStream() // followed by IsInitialized(). - PROTOBUF_MUST_USE_RESULT bool MergePartialFromCodedStream(io::CodedInputStream* input); + PROTOBUF_MUST_USE_RESULT bool MergePartialFromCodedStream(io::CodedInputStream* input); // Merge a protocol buffer contained in a string. - PROTOBUF_MUST_USE_RESULT bool MergeFromString(ConstStringParam data); + PROTOBUF_MUST_USE_RESULT bool MergeFromString(ConstStringParam data); // Serialization --------------------------------------------------- @@ -374,24 +374,24 @@ class PROTOBUF_EXPORT MessageLite { // Write a protocol buffer of this message to the given output. Returns // false on a write error. If the message is missing required fields, // this may GOOGLE_CHECK-fail. - PROTOBUF_MUST_USE_RESULT bool SerializeToCodedStream(io::CodedOutputStream* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializeToCodedStream(io::CodedOutputStream* output) const; // Like SerializeToCodedStream(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool SerializePartialToCodedStream(io::CodedOutputStream* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializePartialToCodedStream(io::CodedOutputStream* output) const; // Write the message to the given zero-copy output stream. All required // fields must be set. - PROTOBUF_MUST_USE_RESULT bool SerializeToZeroCopyStream(io::ZeroCopyOutputStream* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializeToZeroCopyStream(io::ZeroCopyOutputStream* output) const; // Like SerializeToZeroCopyStream(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool SerializePartialToZeroCopyStream(io::ZeroCopyOutputStream* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializePartialToZeroCopyStream(io::ZeroCopyOutputStream* output) const; // Serialize the message and store it in the given string. All required // fields must be set. - PROTOBUF_MUST_USE_RESULT bool SerializeToString(TProtoStringType* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializeToString(TProtoStringType* output) const; // Like SerializeToString(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool SerializePartialToString(TProtoStringType* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializePartialToString(TProtoStringType* output) const; // Serialize the message and store it in the given byte array. All required // fields must be set. - PROTOBUF_MUST_USE_RESULT bool SerializeToArray(void* data, int size) const; + PROTOBUF_MUST_USE_RESULT bool SerializeToArray(void* data, int size) const; // Like SerializeToArray(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool SerializePartialToArray(void* data, int size) const; + PROTOBUF_MUST_USE_RESULT bool SerializePartialToArray(void* data, int size) const; // Make a string encoding the message. Is equivalent to calling // SerializeToString() on a string and using that. Returns the empty @@ -405,20 +405,20 @@ class PROTOBUF_EXPORT MessageLite { // Serialize the message and write it to the given file descriptor. All // required fields must be set. - PROTOBUF_MUST_USE_RESULT bool SerializeToFileDescriptor(int file_descriptor) const; + PROTOBUF_MUST_USE_RESULT bool SerializeToFileDescriptor(int file_descriptor) const; // Like SerializeToFileDescriptor(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool SerializePartialToFileDescriptor(int file_descriptor) const; + PROTOBUF_MUST_USE_RESULT bool SerializePartialToFileDescriptor(int file_descriptor) const; // Serialize the message and write it to the given C++ ostream. All // required fields must be set. - PROTOBUF_MUST_USE_RESULT bool SerializeToOstream(std::ostream* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializeToOstream(std::ostream* output) const; // Like SerializeToOstream(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool SerializePartialToOstream(std::ostream* output) const; + PROTOBUF_MUST_USE_RESULT bool SerializePartialToOstream(std::ostream* output) const; // Like SerializeToString(), but appends to the data to the string's // existing contents. All required fields must be set. - PROTOBUF_MUST_USE_RESULT bool AppendToString(TProtoStringType* output) const; + PROTOBUF_MUST_USE_RESULT bool AppendToString(TProtoStringType* output) const; // Like AppendToString(), but allows missing required fields. - PROTOBUF_MUST_USE_RESULT bool AppendPartialToString(TProtoStringType* output) const; + PROTOBUF_MUST_USE_RESULT bool AppendPartialToString(TProtoStringType* output) const; // Computes the serialized size of the message. This recursively calls @@ -518,14 +518,14 @@ class PROTOBUF_EXPORT MessageLite { return false; } - #if PROTOBUF_USE_EXCEPTIONS && defined(__cpp_lib_string_view) - PROTOBUF_ATTRIBUTE_REINITIALIZES void ParseFromStringOrThrow(std::string_view s) noexcept(false); - #endif - - #if PROTOBUF_USE_EXCEPTIONS - TProtoStringType SerializeAsStringOrThrow() const noexcept(false); - #endif - + #if PROTOBUF_USE_EXCEPTIONS && defined(__cpp_lib_string_view) + PROTOBUF_ATTRIBUTE_REINITIALIZES void ParseFromStringOrThrow(std::string_view s) noexcept(false); + #endif + + #if PROTOBUF_USE_EXCEPTIONS + TProtoStringType SerializeAsStringOrThrow() const noexcept(false); + #endif + private: // TODO(gerbens) make this a pure abstract function virtual const void* InternalGetTable() const { return NULL; } @@ -600,7 +600,7 @@ bool MergeFromImpl(const SourceWrapper<T>& input, MessageLite* msg, } // namespace internal template <MessageLite::ParseFlags flags, typename T> -PROTOBUF_MUST_USE_RESULT bool MessageLite::ParseFrom(const T& input) { +PROTOBUF_MUST_USE_RESULT bool MessageLite::ParseFrom(const T& input) { if (flags & kParse) Clear(); constexpr bool alias = (flags & kMergeWithAliasing) != 0; return internal::MergeFromImpl<alias>(input, this, flags); diff --git a/contrib/libs/protobuf/src/google/protobuf/port_def.inc b/contrib/libs/protobuf/src/google/protobuf/port_def.inc index c40e6af377..57fcd53a0f 100644 --- a/contrib/libs/protobuf/src/google/protobuf/port_def.inc +++ b/contrib/libs/protobuf/src/google/protobuf/port_def.inc @@ -394,11 +394,11 @@ #ifdef PROTOBUF_MUST_USE_RESULT #error PROTOBUF_MUST_USE_RESULT was previously defined #endif -#if !defined(MSVC_COMPILER) && __has_cpp_attribute(warn_unused_result) -# define PROTOBUF_MUST_USE_RESULT __attribute__((warn_unused_result)) -# else +#if !defined(MSVC_COMPILER) && __has_cpp_attribute(warn_unused_result) +# define PROTOBUF_MUST_USE_RESULT __attribute__((warn_unused_result)) +# else # define PROTOBUF_MUST_USE_RESULT -# endif +# endif #ifdef PROTOBUF_MUST_USE_EXTRACT_RESULT #error PROTOBUF_MUST_USE_EXTRACT_RESULT was previously defined diff --git a/contrib/libs/protobuf/src/google/protobuf/stubs/common.h b/contrib/libs/protobuf/src/google/protobuf/stubs/common.h index e4fae2d68e..ce4d5f4abe 100644 --- a/contrib/libs/protobuf/src/google/protobuf/stubs/common.h +++ b/contrib/libs/protobuf/src/google/protobuf/stubs/common.h @@ -58,8 +58,8 @@ #endif #endif -#define Y_PROTOBUF_SUPPRESS_NODISCARD [[maybe_unused]] bool Y_GENERATE_UNIQUE_ID(pb_checker)= - +#define Y_PROTOBUF_SUPPRESS_NODISCARD [[maybe_unused]] bool Y_GENERATE_UNIQUE_ID(pb_checker)= + #if PROTOBUF_USE_EXCEPTIONS #include <exception> #endif diff --git a/contrib/libs/python/ut/lib/test.cpp b/contrib/libs/python/ut/lib/test.cpp index e3aabc8889..b49d6ab61e 100644 --- a/contrib/libs/python/ut/lib/test.cpp +++ b/contrib/libs/python/ut/lib/test.cpp @@ -1,7 +1,7 @@ #include "test.h" #include <Python.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> TTestPyInvoker::TTestPyInvoker() {} diff --git a/contrib/libs/python/ut/lib/ya.make b/contrib/libs/python/ut/lib/ya.make index cfa0aaa612..de4a2b892c 100644 --- a/contrib/libs/python/ut/lib/ya.make +++ b/contrib/libs/python/ut/lib/ya.make @@ -7,7 +7,7 @@ WITHOUT_LICENSE_TEXTS() LICENSE(YandexOpen) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ) SRCS( diff --git a/contrib/libs/python/ut/py2/use.cpp b/contrib/libs/python/ut/py2/use.cpp index a4a2c8d9bb..5cce4a1571 100644 --- a/contrib/libs/python/ut/py2/use.cpp +++ b/contrib/libs/python/ut/py2/use.cpp @@ -1,5 +1,5 @@ #include <contrib/libs/python/ut/lib/test.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestPy3Binding) { Y_UNIT_TEST(version) { diff --git a/contrib/libs/python/ut/py3/use.cpp b/contrib/libs/python/ut/py3/use.cpp index 8a2531bcc1..0d067c1fc1 100644 --- a/contrib/libs/python/ut/py3/use.cpp +++ b/contrib/libs/python/ut/py3/use.cpp @@ -1,5 +1,5 @@ #include <contrib/libs/python/ut/lib/test.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestPy3Binding) { Y_UNIT_TEST(version) { diff --git a/contrib/python/pytest/py2/_pytest/compat.py b/contrib/python/pytest/py2/_pytest/compat.py index e5c3b84667..f04fc35b9a 100644 --- a/contrib/python/pytest/py2/_pytest/compat.py +++ b/contrib/python/pytest/py2/_pytest/compat.py @@ -367,7 +367,7 @@ def safe_isclass(obj): def _is_unittest_unexpected_success_a_failure(): """Return if the test suite should fail if an @expectedFailure unittest test PASSES. - From https://docs.python.org/3/library/unittest.html?highlight=unittest#unittest.TestResult.wasSuccessful: + From https://docs.python.org/3/library/unittest.html?highlight=unittest#unittest.TestResult.wasSuccessful: Changed in version 3.4: Returns False if there were any unexpectedSuccesses from tests marked with the expectedFailure() decorator. """ diff --git a/contrib/python/pytest/py2/_pytest/python_api.py b/contrib/python/pytest/py2/_pytest/python_api.py index f6e475c3a2..27db070b8d 100644 --- a/contrib/python/pytest/py2/_pytest/python_api.py +++ b/contrib/python/pytest/py2/_pytest/python_api.py @@ -472,7 +472,7 @@ def approx(expected, rel=None, abs=None, nan_ok=False): available in subclasses of ``unittest.TestCase`` and it's ugly because it doesn't follow PEP8. `More information...`__ - __ https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertAlmostEqual + __ https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertAlmostEqual - ``a == pytest.approx(b, rel=1e-6, abs=1e-12)``: True if the relative tolerance is met w.r.t. ``b`` or if the absolute tolerance is met. diff --git a/contrib/python/pytest/py3/_pytest/python_api.py b/contrib/python/pytest/py3/_pytest/python_api.py index 81ce4f8953..d7f2c26e05 100644 --- a/contrib/python/pytest/py3/_pytest/python_api.py +++ b/contrib/python/pytest/py3/_pytest/python_api.py @@ -469,7 +469,7 @@ def approx(expected, rel=None, abs=None, nan_ok: bool = False) -> ApproxBase: available in subclasses of ``unittest.TestCase`` and it's ugly because it doesn't follow PEP8. `More information...`__ - __ https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertAlmostEqual + __ https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertAlmostEqual - ``a == pytest.approx(b, rel=1e-6, abs=1e-12)``: True if the relative tolerance is met w.r.t. ``b`` or if the absolute tolerance is met. diff --git a/contrib/python/tornado/tornado-4/tornado/testing.py b/contrib/python/tornado/tornado-4/tornado/testing.py index 82a3b93732..9fc3d009ff 100644 --- a/contrib/python/tornado/tornado-4/tornado/testing.py +++ b/contrib/python/tornado/tornado-4/tornado/testing.py @@ -682,7 +682,7 @@ def main(**kwargs): Additional keyword arguments passed through to ``unittest.main()``. For example, use ``tornado.testing.main(verbosity=2)`` to show many test details as they are run. - See http://docs.python.org/library/unittest.html#unittest.main + See http://docs.python.org/library/unittest.html#unittest.main for full argument list. """ from tornado.options import define, options, parse_command_line diff --git a/contrib/restricted/boost/arcadia_test/test_shared_ptr.cpp b/contrib/restricted/boost/arcadia_test/test_shared_ptr.cpp index 10d0589248..88612ff1c4 100644 --- a/contrib/restricted/boost/arcadia_test/test_shared_ptr.cpp +++ b/contrib/restricted/boost/arcadia_test/test_shared_ptr.cpp @@ -8,7 +8,7 @@ * Данная ошибка исправляется путем довления константности к типу входящего артумента 'pe'. */ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <boost/interprocess/smart_ptr/shared_ptr.hpp> #include <boost/interprocess/smart_ptr/enable_shared_from_this.hpp> #include <type_traits> diff --git a/contrib/tools/python3/src/Lib/unittest/__init__.py b/contrib/tools/python3/src/Lib/unittest/__init__.py index 348dc471f4..0c83332c56 100644 --- a/contrib/tools/python3/src/Lib/unittest/__init__.py +++ b/contrib/tools/python3/src/Lib/unittest/__init__.py @@ -24,7 +24,7 @@ Simple usage: Further information is available in the bundled documentation, and from - http://docs.python.org/library/unittest.html + http://docs.python.org/library/unittest.html Copyright (c) 1999-2003 Steve Purcell Copyright (c) 2003-2010 Python Software Foundation diff --git a/library/cpp/accurate_accumulate/benchmark/main.cpp b/library/cpp/accurate_accumulate/benchmark/main.cpp index 3c5e6e775d..7dce980e0c 100644 --- a/library/cpp/accurate_accumulate/benchmark/main.cpp +++ b/library/cpp/accurate_accumulate/benchmark/main.cpp @@ -1,5 +1,5 @@ #include <library/cpp/accurate_accumulate/accurate_accumulate.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/algorithm.h> #include <util/generic/singleton.h> diff --git a/library/cpp/actors/core/actor_coroutine_ut.cpp b/library/cpp/actors/core/actor_coroutine_ut.cpp index 951512b877..5008c63643 100644 --- a/library/cpp/actors/core/actor_coroutine_ut.cpp +++ b/library/cpp/actors/core/actor_coroutine_ut.cpp @@ -5,7 +5,7 @@ #include "events.h" #include "event_local.h" #include "hfunc.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> diff --git a/library/cpp/actors/core/actorsystem.h b/library/cpp/actors/core/actorsystem.h index 40499d7586..b98c344709 100644 --- a/library/cpp/actors/core/actorsystem.h +++ b/library/cpp/actors/core/actorsystem.h @@ -10,7 +10,7 @@ #include "scheduler_cookie.h" #include "mon_stats.h" -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <library/cpp/actors/util/ticket_lock.h> #include <util/generic/vector.h> diff --git a/library/cpp/actors/core/ask.h b/library/cpp/actors/core/ask.h index 036f1833a4..d5b5178813 100644 --- a/library/cpp/actors/core/ask.h +++ b/library/cpp/actors/core/ask.h @@ -3,7 +3,7 @@ #include "actor.h" #include "event.h" -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NActors { /** diff --git a/library/cpp/actors/core/ask_ut.cpp b/library/cpp/actors/core/ask_ut.cpp index e72ebdba9b..309af4e038 100644 --- a/library/cpp/actors/core/ask_ut.cpp +++ b/library/cpp/actors/core/ask_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "actorsystem.h" diff --git a/library/cpp/actors/core/event.h b/library/cpp/actors/core/event.h index 6ff02aaf94..ac0407bb46 100644 --- a/library/cpp/actors/core/event.h +++ b/library/cpp/actors/core/event.h @@ -83,7 +83,7 @@ namespace NActors { template <typename T> TAutoPtr<T> Release() { TAutoPtr<T> x = Get<T>(); - Y_UNUSED(Event.Release()); + Y_UNUSED(Event.Release()); Buffer.Reset(); return x; } @@ -271,7 +271,7 @@ namespace NActors { TAutoPtr<IEventBase> ReleaseBase() { TAutoPtr<IEventBase> x = GetBase(); - Y_UNUSED(Event.Release()); + Y_UNUSED(Event.Release()); Buffer.Reset(); return x; } diff --git a/library/cpp/actors/core/event_pb.h b/library/cpp/actors/core/event_pb.h index d7546b901a..efba90c24e 100644 --- a/library/cpp/actors/core/event_pb.h +++ b/library/cpp/actors/core/event_pb.h @@ -233,7 +233,7 @@ namespace NActors { static IEventBase* Load(TIntrusivePtr<TEventSerializedData> input) { THolder<TEventPBBase> ev(new TEv()); if (!input->GetSize()) { - Y_PROTOBUF_SUPPRESS_NODISCARD ev->Record.ParseFromString(TString()); + Y_PROTOBUF_SUPPRESS_NODISCARD ev->Record.ParseFromString(TString()); } else { TRope::TConstIterator iter = input->GetBeginIter(); ui64 size = input->GetSize(); @@ -450,7 +450,7 @@ namespace NActors { TRecord& base(TBase::Record); if (!PreSerializedData.empty()) { TRecord copy; - Y_PROTOBUF_SUPPRESS_NODISCARD copy.ParseFromString(PreSerializedData); + Y_PROTOBUF_SUPPRESS_NODISCARD copy.ParseFromString(PreSerializedData); copy.MergeFrom(base); base.Swap(©); PreSerializedData.clear(); diff --git a/library/cpp/actors/core/event_pb_payload_ut.cpp b/library/cpp/actors/core/event_pb_payload_ut.cpp index eab007bc15..1063f85a28 100644 --- a/library/cpp/actors/core/event_pb_payload_ut.cpp +++ b/library/cpp/actors/core/event_pb_payload_ut.cpp @@ -1,7 +1,7 @@ #include "event_pb.h" #include "events.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/protos/unittests.pb.h> using namespace NActors; @@ -124,7 +124,7 @@ Y_UNIT_TEST_SUITE(TEventProtoWithPayload) { msg.AddSomeData("xyzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"); TEvMessageWithPayloadPreSerialized e1; - Y_PROTOBUF_SUPPRESS_NODISCARD msg.SerializeToString(&e1.PreSerializedData); + Y_PROTOBUF_SUPPRESS_NODISCARD msg.SerializeToString(&e1.PreSerializedData); auto serializer1 = MakeHolder<TAllocChunkSerializer>(); e1.SerializeToArcadiaStream(serializer1.Get()); diff --git a/library/cpp/actors/core/event_pb_ut.cpp b/library/cpp/actors/core/event_pb_ut.cpp index a16c3092b3..1e2b2c9401 100644 --- a/library/cpp/actors/core/event_pb_ut.cpp +++ b/library/cpp/actors/core/event_pb_ut.cpp @@ -1,6 +1,6 @@ #include "event_pb.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/protos/unittests.pb.h> Y_UNIT_TEST_SUITE(TEventSerialization) { @@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(TEventSerialization) { bm.SetYANumber(394143); TString bmSerialized; - Y_PROTOBUF_SUPPRESS_NODISCARD bm.SerializeToString(&bmSerialized); + Y_PROTOBUF_SUPPRESS_NODISCARD bm.SerializeToString(&bmSerialized); UNIT_ASSERT_UNEQUAL(bmSerialized.size(), 0); NActors::TCoroutineChunkSerializer chunker; diff --git a/library/cpp/actors/core/executor_pool_basic_ut.cpp b/library/cpp/actors/core/executor_pool_basic_ut.cpp index 76dff693af..ef1b73a124 100644 --- a/library/cpp/actors/core/executor_pool_basic_ut.cpp +++ b/library/cpp/actors/core/executor_pool_basic_ut.cpp @@ -5,7 +5,7 @@ #include <library/cpp/actors/util/should_continue.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/protos/unittests.pb.h> using namespace NActors; diff --git a/library/cpp/actors/core/executor_pool_united_ut.cpp b/library/cpp/actors/core/executor_pool_united_ut.cpp index d4df17f1b8..98a89571bb 100644 --- a/library/cpp/actors/core/executor_pool_united_ut.cpp +++ b/library/cpp/actors/core/executor_pool_united_ut.cpp @@ -5,7 +5,7 @@ #include <library/cpp/actors/util/should_continue.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/protos/unittests.pb.h> using namespace NActors; diff --git a/library/cpp/actors/core/log_ut.cpp b/library/cpp/actors/core/log_ut.cpp index 09b5f88ea2..b550c0d77e 100644 --- a/library/cpp/actors/core/log_ut.cpp +++ b/library/cpp/actors/core/log_ut.cpp @@ -1,6 +1,6 @@ #include "log.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/testlib/test_runtime.h> diff --git a/library/cpp/actors/core/mailbox.h b/library/cpp/actors/core/mailbox.h index 0bd9c4d314..2d3d8e0f6b 100644 --- a/library/cpp/actors/core/mailbox.h +++ b/library/cpp/actors/core/mailbox.h @@ -6,8 +6,8 @@ #include "mailbox_queue_simple.h" #include "mailbox_queue_revolving.h" #include <library/cpp/actors/util/unordered_cache.h> -#include <library/cpp/threading/queue/mpsc_htswap.h> -#include <library/cpp/threading/queue/mpsc_read_as_filled.h> +#include <library/cpp/threading/queue/mpsc_htswap.h> +#include <library/cpp/threading/queue/mpsc_read_as_filled.h> #include <util/generic/hash.h> #include <util/system/hp_timer.h> #include <util/generic/ptr.h> diff --git a/library/cpp/actors/core/scheduler_actor_ut.cpp b/library/cpp/actors/core/scheduler_actor_ut.cpp index 09b7369d36..95ad1a8aa4 100644 --- a/library/cpp/actors/core/scheduler_actor_ut.cpp +++ b/library/cpp/actors/core/scheduler_actor_ut.cpp @@ -7,7 +7,7 @@ #include "event_local.h" #include "hfunc.h" #include <library/cpp/actors/interconnect/poller_actor.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> diff --git a/library/cpp/actors/core/scheduler_basic.h b/library/cpp/actors/core/scheduler_basic.h index 2ccde39235..6921bd07e2 100644 --- a/library/cpp/actors/core/scheduler_basic.h +++ b/library/cpp/actors/core/scheduler_basic.h @@ -4,7 +4,7 @@ #include "monotonic.h" #include "scheduler_queue.h" #include <library/cpp/actors/util/queue_chunk.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> #include <util/generic/hash.h> #include <util/generic/map.h> diff --git a/library/cpp/actors/core/ya.make b/library/cpp/actors/core/ya.make index 880a9d00db..d036ac752c 100644 --- a/library/cpp/actors/core/ya.make +++ b/library/cpp/actors/core/ya.make @@ -113,7 +113,7 @@ PEERDIR( library/cpp/lwtrace library/cpp/monlib/dynamic_counters library/cpp/svnversion - library/cpp/threading/future + library/cpp/threading/future ) END() diff --git a/library/cpp/actors/dnscachelib/timekeeper.h b/library/cpp/actors/dnscachelib/timekeeper.h index 0528d8549c..aeac6afc10 100644 --- a/library/cpp/actors/dnscachelib/timekeeper.h +++ b/library/cpp/actors/dnscachelib/timekeeper.h @@ -5,7 +5,7 @@ #include <util/string/cast.h> #include <util/system/thread.h> #include <util/system/event.h> -#include <util/system/env.h> +#include <util/system/env.h> #include <cstdlib> @@ -28,7 +28,7 @@ public: TTimeKeeper() : Thread(&TTimeKeeper::Worker, this) { - ConstTime = !!GetEnv("TEST_TIME"); + ConstTime = !!GetEnv("TEST_TIME"); if (ConstTime) { try { CurrentTime.tv_sec = FromString<ui32>(GetEnv("TEST_TIME")); diff --git a/library/cpp/actors/helpers/selfping_actor.cpp b/library/cpp/actors/helpers/selfping_actor.cpp index f9bfaf8dc0..0e1881eaef 100644 --- a/library/cpp/actors/helpers/selfping_actor.cpp +++ b/library/cpp/actors/helpers/selfping_actor.cpp @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/sliding_window/sliding_window.h> namespace NActors { diff --git a/library/cpp/actors/helpers/selfping_actor_ut.cpp b/library/cpp/actors/helpers/selfping_actor_ut.cpp index 459635fa24..75b90ea576 100644 --- a/library/cpp/actors/helpers/selfping_actor_ut.cpp +++ b/library/cpp/actors/helpers/selfping_actor_ut.cpp @@ -1,6 +1,6 @@ #include "selfping_actor.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/testlib/test_runtime.h> namespace NActors { diff --git a/library/cpp/actors/http/http.cpp b/library/cpp/actors/http/http.cpp index 7125f9d8b0..0bdc6417d3 100644 --- a/library/cpp/actors/http/http.cpp +++ b/library/cpp/actors/http/http.cpp @@ -1,5 +1,5 @@ #include "http.h" -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> inline TStringBuf operator +(TStringBuf l, TStringBuf r) { if (l.empty()) { diff --git a/library/cpp/actors/http/http_ut.cpp b/library/cpp/actors/http/http_ut.cpp index 4c922f8d0f..a2e2ecaaad 100644 --- a/library/cpp/actors/http/http_ut.cpp +++ b/library/cpp/actors/http/http_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <library/cpp/actors/core/executor_pool_basic.h> #include <library/cpp/actors/core/scheduler_basic.h> #include <library/cpp/actors/testlib/test_runtime.h> diff --git a/library/cpp/actors/http/ya.make b/library/cpp/actors/http/ya.make index 7ce68b7a75..8d0ac30be7 100644 --- a/library/cpp/actors/http/ya.make +++ b/library/cpp/actors/http/ya.make @@ -27,7 +27,7 @@ PEERDIR( library/cpp/actors/interconnect library/cpp/dns library/cpp/monlib/metrics - library/cpp/string_utils/quote + library/cpp/string_utils/quote ) END() diff --git a/library/cpp/actors/interconnect/event_holder_pool.h b/library/cpp/actors/interconnect/event_holder_pool.h index b6090a3bc8..f23734a0d4 100644 --- a/library/cpp/actors/interconnect/event_holder_pool.h +++ b/library/cpp/actors/interconnect/event_holder_pool.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include "packet.h" diff --git a/library/cpp/actors/interconnect/interconnect_handshake.cpp b/library/cpp/actors/interconnect/interconnect_handshake.cpp index 9ede998d8e..3226f135c9 100644 --- a/library/cpp/actors/interconnect/interconnect_handshake.cpp +++ b/library/cpp/actors/interconnect/interconnect_handshake.cpp @@ -724,7 +724,7 @@ namespace NActors { template <typename T> void SendExBlock(const T& proto, const char* what) { TString data; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&data); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&data); Y_VERIFY(data.size() <= TExHeader::MaxSize); ReportProto(proto, Sprintf("SendExBlock %s", what).data()); diff --git a/library/cpp/actors/interconnect/packet.h b/library/cpp/actors/interconnect/packet.h index 4ba50a2b5f..bd59c3ab85 100644 --- a/library/cpp/actors/interconnect/packet.h +++ b/library/cpp/actors/interconnect/packet.h @@ -4,7 +4,7 @@ #include <library/cpp/actors/core/event_load.h> #include <library/cpp/actors/core/events.h> #include <library/cpp/actors/core/actor.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/actors/util/rope.h> #include <library/cpp/actors/prof/tag.h> #include <library/cpp/digest/crc32c/crc32c.h> diff --git a/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp b/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp index 565a511859..6841f68017 100644 --- a/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp +++ b/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/actors/interconnect/channel_scheduler.h> #include <library/cpp/actors/interconnect/events_local.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NActors; diff --git a/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp b/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp index e6b2bd4e4c..c5e85d41a5 100644 --- a/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp +++ b/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/core/events.h> #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/interconnect/interconnect_common.h> diff --git a/library/cpp/actors/interconnect/ut/large.cpp b/library/cpp/actors/interconnect/ut/large.cpp index ba2a50c6f6..785033aac8 100644 --- a/library/cpp/actors/interconnect/ut/large.cpp +++ b/library/cpp/actors/interconnect/ut/large.cpp @@ -4,8 +4,8 @@ #include <library/cpp/actors/interconnect/interconnect_tcp_proxy.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/event.h> #include <util/system/sanitizers.h> diff --git a/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h b/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h index 2b6d27cd3f..db147d649e 100644 --- a/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h +++ b/library/cpp/actors/interconnect/ut/lib/ic_test_cluster.h @@ -5,7 +5,7 @@ #include <library/cpp/actors/interconnect/interconnect_tcp_proxy.h> #include <library/cpp/actors/core/events.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/generic/noncopyable.h> diff --git a/library/cpp/actors/interconnect/ut/lib/interrupter.h b/library/cpp/actors/interconnect/ut/lib/interrupter.h index 48851de2c5..2a92378a8f 100644 --- a/library/cpp/actors/interconnect/ut/lib/interrupter.h +++ b/library/cpp/actors/interconnect/ut/lib/interrupter.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/network/sock.h> #include <util/network/poller.h> diff --git a/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp b/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp index 23d846a2fd..bc9152c3f8 100644 --- a/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp +++ b/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp @@ -1,7 +1,7 @@ #include <library/cpp/actors/interconnect/poller_actor.h> #include <library/cpp/actors/testlib/test_runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/network/pair.h> #include <util/network/socket.h> diff --git a/library/cpp/actors/interconnect/ut/ya.make b/library/cpp/actors/interconnect/ut/ya.make index 2f5b13352e..5ebbf538b0 100644 --- a/library/cpp/actors/interconnect/ut/ya.make +++ b/library/cpp/actors/interconnect/ut/ya.make @@ -30,7 +30,7 @@ PEERDIR( library/cpp/actors/interconnect/ut/protos library/cpp/actors/testlib library/cpp/digest/md5 - library/cpp/testing/unittest + library/cpp/testing/unittest ) END() diff --git a/library/cpp/actors/interconnect/ut_fat/main.cpp b/library/cpp/actors/interconnect/ut_fat/main.cpp index 5d19bc3003..626083c3a3 100644 --- a/library/cpp/actors/interconnect/ut_fat/main.cpp +++ b/library/cpp/actors/interconnect/ut_fat/main.cpp @@ -7,8 +7,8 @@ #include <library/cpp/actors/interconnect/ut/lib/test_actors.h> #include <library/cpp/actors/interconnect/ut/lib/node.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/network/sock.h> #include <util/network/poller.h> diff --git a/library/cpp/actors/interconnect/ut_fat/ya.make b/library/cpp/actors/interconnect/ut_fat/ya.make index 6e58d08154..a26080b7f5 100644 --- a/library/cpp/actors/interconnect/ut_fat/ya.make +++ b/library/cpp/actors/interconnect/ut_fat/ya.make @@ -19,7 +19,7 @@ PEERDIR( library/cpp/actors/interconnect/mock library/cpp/actors/interconnect/ut/lib library/cpp/actors/interconnect/ut/protos - library/cpp/testing/unittest + library/cpp/testing/unittest ) END() diff --git a/library/cpp/actors/memory_log/memlog.h b/library/cpp/actors/memory_log/memlog.h index 2aa27272a6..c248742acf 100644 --- a/library/cpp/actors/memory_log/memlog.h +++ b/library/cpp/actors/memory_log/memlog.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/threading/queue/mpmc_unordered_ring.h> +#include <library/cpp/threading/queue/mpmc_unordered_ring.h> #include <util/generic/string.h> #include <util/string/printf.h> #include <util/system/datetime.h> diff --git a/library/cpp/actors/memory_log/ya.make b/library/cpp/actors/memory_log/ya.make index d89d5db4d7..da26cdd561 100644 --- a/library/cpp/actors/memory_log/ya.make +++ b/library/cpp/actors/memory_log/ya.make @@ -12,7 +12,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/queue + library/cpp/threading/queue contrib/libs/linuxvdso ) diff --git a/library/cpp/actors/prof/tag.cpp b/library/cpp/actors/prof/tag.cpp index 9ccf03e1a9..fc93d883ee 100644 --- a/library/cpp/actors/prof/tag.cpp +++ b/library/cpp/actors/prof/tag.cpp @@ -6,7 +6,7 @@ #include <library/cpp/malloc/api/malloc.h> #if defined(PROFILE_MEMORY_ALLOCATIONS) -#include <library/cpp/lfalloc/dbg_info/dbg_info.h> +#include <library/cpp/lfalloc/dbg_info/dbg_info.h> #include <library/cpp/ytalloc/api/ytalloc.h> #endif diff --git a/library/cpp/actors/prof/ut/tag_ut.cpp b/library/cpp/actors/prof/ut/tag_ut.cpp index accf3921ab..47950afe76 100644 --- a/library/cpp/actors/prof/ut/tag_ut.cpp +++ b/library/cpp/actors/prof/ut/tag_ut.cpp @@ -1,6 +1,6 @@ #include "tag.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NProfiling; diff --git a/library/cpp/actors/prof/ya.make b/library/cpp/actors/prof/ya.make index b5e2497563..ebab0d1092 100644 --- a/library/cpp/actors/prof/ya.make +++ b/library/cpp/actors/prof/ya.make @@ -18,7 +18,7 @@ IF (PROFILE_MEMORY_ALLOCATIONS) CFLAGS(-DPROFILE_MEMORY_ALLOCATIONS) PEERDIR( library/cpp/malloc/api - library/cpp/lfalloc/dbg_info + library/cpp/lfalloc/dbg_info library/cpp/ytalloc/api ) ENDIF() diff --git a/library/cpp/actors/testlib/test_runtime.h b/library/cpp/actors/testlib/test_runtime.h index 26e3b45c98..cbd11903b1 100644 --- a/library/cpp/actors/testlib/test_runtime.h +++ b/library/cpp/actors/testlib/test_runtime.h @@ -11,7 +11,7 @@ #include <library/cpp/actors/interconnect/mock/ic_mock.h> #include <library/cpp/random_provider/random_provider.h> #include <library/cpp/time_provider/time_provider.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/datetime/base.h> #include <util/folder/tempdir.h> diff --git a/library/cpp/actors/util/intrinsics.h b/library/cpp/actors/util/intrinsics.h index df07e36896..cff5765c2c 100644 --- a/library/cpp/actors/util/intrinsics.h +++ b/library/cpp/actors/util/intrinsics.h @@ -4,7 +4,7 @@ #include <util/system/atomic.h> #include <util/system/spinlock.h> -#include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support +#include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support static_assert(sizeof(TAtomic) == 8, "expect sizeof(TAtomic) == 8"); diff --git a/library/cpp/actors/util/rope_ut.cpp b/library/cpp/actors/util/rope_ut.cpp index cabeed9230..8606730924 100644 --- a/library/cpp/actors/util/rope_ut.cpp +++ b/library/cpp/actors/util/rope_ut.cpp @@ -1,5 +1,5 @@ #include "rope.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> class TRopeStringBackend : public IRopeChunkBackend { diff --git a/library/cpp/actors/wilson/wilson_event.h b/library/cpp/actors/wilson/wilson_event.h index 7d89c33b51..db39188ec3 100644 --- a/library/cpp/actors/wilson/wilson_event.h +++ b/library/cpp/actors/wilson/wilson_event.h @@ -2,7 +2,7 @@ #include "wilson_trace.h" -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <library/cpp/actors/core/log.h> diff --git a/library/cpp/actors/wilson/wilson_trace.h b/library/cpp/actors/wilson/wilson_trace.h index 3d1ca50562..2e2b2b7728 100644 --- a/library/cpp/actors/wilson/wilson_trace.h +++ b/library/cpp/actors/wilson/wilson_trace.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/stream/output.h> #include <util/random/random.h> diff --git a/library/cpp/actors/wilson/ya.make b/library/cpp/actors/wilson/ya.make index e371f5061d..061e6b6eab 100644 --- a/library/cpp/actors/wilson/ya.make +++ b/library/cpp/actors/wilson/ya.make @@ -1,7 +1,7 @@ LIBRARY() PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) OWNER(alexvru) diff --git a/library/cpp/archive/directory_models_archive_reader.cpp b/library/cpp/archive/directory_models_archive_reader.cpp index 6de9424c7c..392c99b511 100644 --- a/library/cpp/archive/directory_models_archive_reader.cpp +++ b/library/cpp/archive/directory_models_archive_reader.cpp @@ -9,12 +9,12 @@ #include <util/stream/input.h> #include <util/stream/mem.h> -TDirectoryModelsArchiveReader::TDirectoryModelsArchiveReader(const TString& path, bool lockMemory, bool ownBlobs) +TDirectoryModelsArchiveReader::TDirectoryModelsArchiveReader(const TString& path, bool lockMemory, bool ownBlobs) : Path_(path) { Y_ENSURE(IsDir(path), "directory not found on this path"); - LoadFilesAndSubdirs("", lockMemory, ownBlobs); + LoadFilesAndSubdirs("", lockMemory, ownBlobs); } TDirectoryModelsArchiveReader::~TDirectoryModelsArchiveReader() {} @@ -29,21 +29,21 @@ TString TDirectoryModelsArchiveReader::KeyByIndex(size_t n) const { } bool TDirectoryModelsArchiveReader::Has(const TStringBuf key) const { - return BlobByKey_.contains(key) || PathByKey_.contains(key); -} - -namespace { - struct TBlobOwningStream : public TMemoryInput { - TBlob Blob; - TBlobOwningStream(TBlob blob) - : TMemoryInput(blob.Data(), blob.Length()) - , Blob(blob) - {} - }; + return BlobByKey_.contains(key) || PathByKey_.contains(key); } +namespace { + struct TBlobOwningStream : public TMemoryInput { + TBlob Blob; + TBlobOwningStream(TBlob blob) + : TMemoryInput(blob.Data(), blob.Length()) + , Blob(blob) + {} + }; +} + TAutoPtr<IInputStream> TDirectoryModelsArchiveReader::ObjectByKey(const TStringBuf key) const { - return new TBlobOwningStream(BlobByKey(key)); + return new TBlobOwningStream(BlobByKey(key)); } TBlob TDirectoryModelsArchiveReader::ObjectBlobByKey(const TStringBuf key) const { @@ -51,14 +51,14 @@ TBlob TDirectoryModelsArchiveReader::ObjectBlobByKey(const TStringBuf key) const } TBlob TDirectoryModelsArchiveReader::BlobByKey(const TStringBuf key) const { - Y_ENSURE(Has(key), "key " << key << " not found"); - if (auto ptr = BlobByKey_.FindPtr(key); ptr) { - return *ptr; - } - if (auto ptr = PathByKey_.FindPtr(key); ptr) { - return TBlob::FromFile(*ptr); - } - Y_UNREACHABLE(); + Y_ENSURE(Has(key), "key " << key << " not found"); + if (auto ptr = BlobByKey_.FindPtr(key); ptr) { + return *ptr; + } + if (auto ptr = PathByKey_.FindPtr(key); ptr) { + return TBlob::FromFile(*ptr); + } + Y_UNREACHABLE(); } bool TDirectoryModelsArchiveReader::Compressed() const { @@ -74,18 +74,18 @@ TString TDirectoryModelsArchiveReader::NormalizePath(TString path) const { return path; } -void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs) { +void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs) { TFileList fileList; fileList.Fill(JoinFsPaths(Path_, subPath)); const char* file; while ((file = fileList.Next()) != nullptr) { TString key = JoinFsPaths(subPath, TString(file)); - TString fullPath = JoinFsPaths(Path_, key); + TString fullPath = JoinFsPaths(Path_, key); TBlob fileBlob; if (lockMemory) { - fileBlob = TBlob::LockedFromFile(fullPath); + fileBlob = TBlob::LockedFromFile(fullPath); } else { - fileBlob = TBlob::FromFile(fullPath); + fileBlob = TBlob::FromFile(fullPath); } if (key.EndsWith(".archive")) { TArchiveReader reader(fileBlob); @@ -97,11 +97,11 @@ void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath, } } else { const TString normalizedPath = NormalizePath(key); - if (lockMemory || ownBlobs) { - BlobByKey_.emplace(normalizedPath, fileBlob); - } else { - PathByKey_.emplace(normalizedPath, RealPath(fullPath)); - } + if (lockMemory || ownBlobs) { + BlobByKey_.emplace(normalizedPath, fileBlob); + } else { + PathByKey_.emplace(normalizedPath, RealPath(fullPath)); + } Recs_.push_back(normalizedPath); } } @@ -110,6 +110,6 @@ void TDirectoryModelsArchiveReader::LoadFilesAndSubdirs(const TString& subPath, dirsList.Fill(JoinFsPaths(Path_, subPath)); const char* dir; while ((dir = dirsList.Next()) != nullptr) { - LoadFilesAndSubdirs(JoinFsPaths(subPath, TString(dir)), lockMemory, ownBlobs); + LoadFilesAndSubdirs(JoinFsPaths(subPath, TString(dir)), lockMemory, ownBlobs); } } diff --git a/library/cpp/archive/directory_models_archive_reader.h b/library/cpp/archive/directory_models_archive_reader.h index d16d6d728d..5d65e76197 100644 --- a/library/cpp/archive/directory_models_archive_reader.h +++ b/library/cpp/archive/directory_models_archive_reader.h @@ -15,7 +15,7 @@ class TBlob; class TDirectoryModelsArchiveReader : public IModelsArchiveReader { public: - TDirectoryModelsArchiveReader(const TString& path, bool lockMemory = false, bool ownBlobs = false); + TDirectoryModelsArchiveReader(const TString& path, bool lockMemory = false, bool ownBlobs = false); virtual ~TDirectoryModelsArchiveReader() override; virtual size_t Count() const noexcept override; @@ -28,11 +28,11 @@ public: private: TString NormalizePath(TString path) const; // in archive path works unix-like path delimiter and leading slash is neccesery - void LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs); + void LoadFilesAndSubdirs(const TString& subPath, bool lockMemory, bool ownBlobs); private: TString Path_; - THashMap<TString, TString> PathByKey_; + THashMap<TString, TString> PathByKey_; THashMap<TString, TBlob> BlobByKey_; TVector<TString> Recs_; }; diff --git a/library/cpp/archive/directory_models_archive_reader_ut.cpp b/library/cpp/archive/directory_models_archive_reader_ut.cpp index 09994de9b4..d7d24fce5a 100644 --- a/library/cpp/archive/directory_models_archive_reader_ut.cpp +++ b/library/cpp/archive/directory_models_archive_reader_ut.cpp @@ -1,6 +1,6 @@ #include "directory_models_archive_reader.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/tempdir.h> #include <util/string/cast.h> diff --git a/library/cpp/archive/yarchive.cpp b/library/cpp/archive/yarchive.cpp index 1becc3e5da..e4ac611ca9 100644 --- a/library/cpp/archive/yarchive.cpp +++ b/library/cpp/archive/yarchive.cpp @@ -153,15 +153,15 @@ public: TransferData(src, &compress); compress.Finish(); } else { - size_t skip_size = ArchiveWriterDefaultDataAlignment - Off_ % ArchiveWriterDefaultDataAlignment; - if (skip_size == ArchiveWriterDefaultDataAlignment) { - skip_size = 0; - } - while(skip_size > 0) { - Out_->Write(char(0)); - Off_ += 1; - skip_size -= 1; - } + size_t skip_size = ArchiveWriterDefaultDataAlignment - Off_ % ArchiveWriterDefaultDataAlignment; + if (skip_size == ArchiveWriterDefaultDataAlignment) { + skip_size = 0; + } + while(skip_size > 0) { + Out_->Write(char(0)); + Off_ += 1; + skip_size -= 1; + } TransferData(src, &out); out.Finish(); } diff --git a/library/cpp/archive/yarchive.h b/library/cpp/archive/yarchive.h index 8120bcb940..bbd84ab071 100644 --- a/library/cpp/archive/yarchive.h +++ b/library/cpp/archive/yarchive.h @@ -11,9 +11,9 @@ class IOutputStream; class TBlob; -//noncompressed data will be stored with default alignment DEVTOOLS-4384 -static constexpr size_t ArchiveWriterDefaultDataAlignment = 16; - +//noncompressed data will be stored with default alignment DEVTOOLS-4384 +static constexpr size_t ArchiveWriterDefaultDataAlignment = 16; + class TArchiveWriter { public: explicit TArchiveWriter(IOutputStream* out, bool compress = true); diff --git a/library/cpp/archive/yarchive_ut.cpp b/library/cpp/archive/yarchive_ut.cpp index 602a1cdbbd..5736504aac 100644 --- a/library/cpp/archive/yarchive_ut.cpp +++ b/library/cpp/archive/yarchive_ut.cpp @@ -1,6 +1,6 @@ #include "yarchive.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> #include <util/stream/file.h> diff --git a/library/cpp/balloc/ya.make b/library/cpp/balloc/ya.make index d4457fbba9..77b78f7e67 100644 --- a/library/cpp/balloc/ya.make +++ b/library/cpp/balloc/ya.make @@ -10,7 +10,7 @@ NO_COMPILER_WARNINGS() IF (OS_WINDOWS) PEERDIR( - library/cpp/lfalloc + library/cpp/lfalloc ) ELSE() SRCS( diff --git a/library/cpp/binsaver/bin_saver.h b/library/cpp/binsaver/bin_saver.h index 412424889f..371cdaf5a5 100644 --- a/library/cpp/binsaver/bin_saver.h +++ b/library/cpp/binsaver/bin_saver.h @@ -3,7 +3,7 @@ #include "buffered_io.h" #include "class_factory.h" -#include <library/cpp/containers/2d_array/2d_array.h> +#include <library/cpp/containers/2d_array/2d_array.h> #include <util/generic/hash_set.h> #include <util/generic/buffer.h> @@ -630,7 +630,7 @@ struct TRegisterSaveLoadType { f.AddMulti(__VA_ARGS__); \ return 0; \ } - + #define SAVELOAD_OVERRIDE(base, ...) \ int operator&(IBinSaver& f) override { \ base::operator&(f); \ @@ -643,4 +643,4 @@ struct TRegisterSaveLoadType { TBase::operator&(f); \ f.AddMulti(__VA_ARGS__); \ return 0; \ - } + } diff --git a/library/cpp/binsaver/ut/binsaver_ut.cpp b/library/cpp/binsaver/ut/binsaver_ut.cpp index 37eba5406f..e7a5626188 100644 --- a/library/cpp/binsaver/ut/binsaver_ut.cpp +++ b/library/cpp/binsaver/ut/binsaver_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/binsaver/mem_io.h> #include <library/cpp/binsaver/bin_saver.h> #include <library/cpp/binsaver/ut_util/ut_util.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/buffer.h> #include <util/generic/map.h> diff --git a/library/cpp/binsaver/ut_util/ut_util.h b/library/cpp/binsaver/ut_util/ut_util.h index 52e7bcf8e1..ec896541dc 100644 --- a/library/cpp/binsaver/ut_util/ut_util.h +++ b/library/cpp/binsaver/ut_util/ut_util.h @@ -4,7 +4,7 @@ #include <library/cpp/binsaver/mem_io.h> #include <library/cpp/binsaver/util_stream_io.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/stream/buffer.h> diff --git a/library/cpp/binsaver/ut_util/ya.make b/library/cpp/binsaver/ut_util/ya.make index 7e60f13ef3..507273a3d3 100644 --- a/library/cpp/binsaver/ut_util/ya.make +++ b/library/cpp/binsaver/ut_util/ya.make @@ -8,7 +8,7 @@ SRCS( PEERDIR( library/cpp/binsaver - library/cpp/testing/unittest + library/cpp/testing/unittest ) END() diff --git a/library/cpp/binsaver/ya.make b/library/cpp/binsaver/ya.make index 9693c54639..6a7cfa5c7b 100644 --- a/library/cpp/binsaver/ya.make +++ b/library/cpp/binsaver/ya.make @@ -12,7 +12,7 @@ SRCS( ) PEERDIR( - library/cpp/containers/2d_array + library/cpp/containers/2d_array ) END() diff --git a/library/cpp/bit_io/bitinout_ut.cpp b/library/cpp/bit_io/bitinout_ut.cpp index 23a1ddf344..e1f1f6afce 100644 --- a/library/cpp/bit_io/bitinout_ut.cpp +++ b/library/cpp/bit_io/bitinout_ut.cpp @@ -1,7 +1,7 @@ #include "bitinput.h" #include "bitoutput.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/buffer.h> #include <util/generic/buffer.h> diff --git a/library/cpp/blockcodecs/codecs_ut.cpp b/library/cpp/blockcodecs/codecs_ut.cpp index bfe5a23690..fc2fa7f6b0 100644 --- a/library/cpp/blockcodecs/codecs_ut.cpp +++ b/library/cpp/blockcodecs/codecs_ut.cpp @@ -1,7 +1,7 @@ #include "codecs.h" #include "stream.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> #include <util/string/join.h> diff --git a/library/cpp/build_info/sandbox.cpp.in b/library/cpp/build_info/sandbox.cpp.in index ac3b2d9004..7638da6686 100644 --- a/library/cpp/build_info/sandbox.cpp.in +++ b/library/cpp/build_info/sandbox.cpp.in @@ -1,5 +1,5 @@ #include <library/cpp/build_info/sandbox.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/generic/string.h> #include <util/string/subst.h> diff --git a/library/cpp/build_info/ya.make b/library/cpp/build_info/ya.make index 99886a8893..25409c47d9 100644 --- a/library/cpp/build_info/ya.make +++ b/library/cpp/build_info/ya.make @@ -12,7 +12,7 @@ DEFAULT(KOSHER_SVN_VERSION "") CREATE_BUILDINFO_FOR(buildinfo_data.h) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) SRCS( diff --git a/library/cpp/cache/ut/cache_ut.cpp b/library/cpp/cache/ut/cache_ut.cpp index 329872cfde..3c12ce7b0a 100644 --- a/library/cpp/cache/ut/cache_ut.cpp +++ b/library/cpp/cache/ut/cache_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/cache/cache.h> #include <library/cpp/cache/thread_safe_cache.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> struct TStrokaWeighter { static size_t Weight(const TString& s) { diff --git a/library/cpp/cgiparam/cgiparam.cpp b/library/cpp/cgiparam/cgiparam.cpp index f3277b8e4b..90d4ef4034 100644 --- a/library/cpp/cgiparam/cgiparam.cpp +++ b/library/cpp/cgiparam/cgiparam.cpp @@ -1,7 +1,7 @@ #include "cgiparam.h" -#include <library/cpp/string_utils/scan/scan.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/scan/scan.h> +#include <library/cpp/string_utils/quote/quote.h> #include <util/generic/singleton.h> @@ -11,7 +11,7 @@ TCgiParameters::TCgiParameters(std::initializer_list<std::pair<TString, TString> } } -const TString& TCgiParameters::Get(const TStringBuf name, size_t numOfValue) const noexcept { +const TString& TCgiParameters::Get(const TStringBuf name, size_t numOfValue) const noexcept { const auto it = Find(name, numOfValue); return end() == it ? Default<TString>() : it->second; @@ -204,7 +204,7 @@ TString TCgiParameters::QuotedPrint(const char* safe) const { return res; } -TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_t pos) const noexcept { +TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_t pos) const noexcept { const auto pair = equal_range(name); for (auto it = pair.first; it != pair.second; ++it, --pos) { @@ -216,7 +216,7 @@ TCgiParameters::const_iterator TCgiParameters::Find(const TStringBuf name, size_ return end(); } -bool TCgiParameters::Has(const TStringBuf name, const TStringBuf value) const noexcept { +bool TCgiParameters::Has(const TStringBuf name, const TStringBuf value) const noexcept { const auto pair = equal_range(name); for (auto it = pair.first; it != pair.second; ++it) { @@ -248,7 +248,7 @@ TQuickCgiParam::TQuickCgiParam(const TStringBuf cgiParamStr) { } } -const TStringBuf& TQuickCgiParam::Get(const TStringBuf name, size_t pos) const noexcept { +const TStringBuf& TQuickCgiParam::Get(const TStringBuf name, size_t pos) const noexcept { const auto pair = equal_range(name); for (auto it = pair.first; it != pair.second; ++it, --pos) { @@ -260,7 +260,7 @@ const TStringBuf& TQuickCgiParam::Get(const TStringBuf name, size_t pos) const n return Default<TStringBuf>(); } -bool TQuickCgiParam::Has(const TStringBuf name, const TStringBuf value) const noexcept { +bool TQuickCgiParam::Has(const TStringBuf name, const TStringBuf value) const noexcept { const auto pair = equal_range(name); for (auto it = pair.first; it != pair.second; ++it) { diff --git a/library/cpp/cgiparam/cgiparam.h b/library/cpp/cgiparam/cgiparam.h index 87d1ab0ad4..bdf3caf99a 100644 --- a/library/cpp/cgiparam/cgiparam.h +++ b/library/cpp/cgiparam/cgiparam.h @@ -32,7 +32,7 @@ public: size_t EraseAll(const TStringBuf name); - size_t NumOfValues(const TStringBuf name) const noexcept { + size_t NumOfValues(const TStringBuf name) const noexcept { return count(name); } @@ -53,8 +53,8 @@ public: */ TString Print() const; char* Print(char* res) const; - - Y_PURE_FUNCTION + + Y_PURE_FUNCTION size_t PrintSize() const noexcept; /** The same as Print* except that RFC-3986 reserved characters are escaped. @@ -62,19 +62,19 @@ public: */ TString QuotedPrint(const char* safe = "/") const; - Y_PURE_FUNCTION + Y_PURE_FUNCTION auto Range(const TStringBuf name) const noexcept { return IterateValues(MakeIteratorRange(equal_range(name))); } - - Y_PURE_FUNCTION - const_iterator Find(const TStringBuf name, size_t numOfValue = 0) const noexcept; - - Y_PURE_FUNCTION - bool Has(const TStringBuf name, const TStringBuf value) const noexcept; - - Y_PURE_FUNCTION - bool Has(const TStringBuf name) const noexcept { + + Y_PURE_FUNCTION + const_iterator Find(const TStringBuf name, size_t numOfValue = 0) const noexcept; + + Y_PURE_FUNCTION + bool Has(const TStringBuf name, const TStringBuf value) const noexcept; + + Y_PURE_FUNCTION + bool Has(const TStringBuf name) const noexcept { const auto pair = equal_range(name); return pair.first != pair.second; } @@ -82,8 +82,8 @@ public: /** * @note The returned value is CGI-unescaped. */ - Y_PURE_FUNCTION - const TString& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept; + Y_PURE_FUNCTION + const TString& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept; void InsertEscaped(const TStringBuf name, const TStringBuf value); @@ -167,17 +167,17 @@ public: explicit TQuickCgiParam(const TStringBuf cgiParamStr); - Y_PURE_FUNCTION - bool Has(const TStringBuf name, const TStringBuf value) const noexcept; - - Y_PURE_FUNCTION - bool Has(const TStringBuf name) const noexcept { + Y_PURE_FUNCTION + bool Has(const TStringBuf name, const TStringBuf value) const noexcept; + + Y_PURE_FUNCTION + bool Has(const TStringBuf name) const noexcept { const auto pair = equal_range(name); return pair.first != pair.second; } - Y_PURE_FUNCTION - const TStringBuf& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept; + Y_PURE_FUNCTION + const TStringBuf& Get(const TStringBuf name, size_t numOfValue = 0) const noexcept; private: TString UnescapeBuf; diff --git a/library/cpp/cgiparam/cgiparam_ut.cpp b/library/cpp/cgiparam/cgiparam_ut.cpp index a562342084..2aad99292e 100644 --- a/library/cpp/cgiparam/cgiparam_ut.cpp +++ b/library/cpp/cgiparam/cgiparam_ut.cpp @@ -1,6 +1,6 @@ #include "cgiparam.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TCgiParametersTest) { Y_UNIT_TEST(TestScan1) { diff --git a/library/cpp/cgiparam/fuzz/main.cpp b/library/cpp/cgiparam/fuzz/main.cpp index 69d82b5f32..2981d851b0 100644 --- a/library/cpp/cgiparam/fuzz/main.cpp +++ b/library/cpp/cgiparam/fuzz/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> extern "C" int LLVMFuzzerTestOneInput(const ui8* data, size_t size) { try { diff --git a/library/cpp/cgiparam/fuzz/ya.make b/library/cpp/cgiparam/fuzz/ya.make index 8fb9d50d3b..22ca30879a 100644 --- a/library/cpp/cgiparam/fuzz/ya.make +++ b/library/cpp/cgiparam/fuzz/ya.make @@ -10,7 +10,7 @@ SRCS( ) PEERDIR( - library/cpp/cgiparam + library/cpp/cgiparam ) END() diff --git a/library/cpp/cgiparam/ut/ya.make b/library/cpp/cgiparam/ut/ya.make index 1eee403951..8eb9edf1f1 100644 --- a/library/cpp/cgiparam/ut/ya.make +++ b/library/cpp/cgiparam/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/cgiparam) +UNITTEST_FOR(library/cpp/cgiparam) OWNER(g:util) diff --git a/library/cpp/cgiparam/ya.make b/library/cpp/cgiparam/ya.make index fa1a6a13c0..81f40d85dc 100644 --- a/library/cpp/cgiparam/ya.make +++ b/library/cpp/cgiparam/ya.make @@ -9,8 +9,8 @@ SRCS( PEERDIR( library/cpp/iterator - library/cpp/string_utils/quote - library/cpp/string_utils/scan + library/cpp/string_utils/quote + library/cpp/string_utils/scan ) END() diff --git a/library/cpp/charset/codepage_ut.cpp b/library/cpp/charset/codepage_ut.cpp index c3ac3ac478..d9f6228044 100644 --- a/library/cpp/charset/codepage_ut.cpp +++ b/library/cpp/charset/codepage_ut.cpp @@ -2,7 +2,7 @@ #include "recyr.hh" #include "wide.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/utf8.h> #include <util/system/yassert.h> diff --git a/library/cpp/charset/iconv_ut.cpp b/library/cpp/charset/iconv_ut.cpp index e8c56f6d49..b0c3b3f12f 100644 --- a/library/cpp/charset/iconv_ut.cpp +++ b/library/cpp/charset/iconv_ut.cpp @@ -2,7 +2,7 @@ #include "recyr.hh" #include "codepage.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static void TestIconv(const TString& utf8, const TString& other, ECharset enc) { TUtf16String wide0 = CharToWide(utf8, CODES_UTF8); diff --git a/library/cpp/charset/wide_ut.cpp b/library/cpp/charset/wide_ut.cpp index 78947d51ba..119dff918d 100644 --- a/library/cpp/charset/wide_ut.cpp +++ b/library/cpp/charset/wide_ut.cpp @@ -2,7 +2,7 @@ #include "codepage.h" #include "recyr.hh" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/utf8.h> #include <util/digest/numeric.h> diff --git a/library/cpp/codecs/greedy_dict/gd_builder.cpp b/library/cpp/codecs/greedy_dict/gd_builder.cpp index 561bfbca01..9dfaab121d 100644 --- a/library/cpp/codecs/greedy_dict/gd_builder.cpp +++ b/library/cpp/codecs/greedy_dict/gd_builder.cpp @@ -1,6 +1,6 @@ #include "gd_builder.h" -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/generic/algorithm.h> #include <util/random/shuffle.h> diff --git a/library/cpp/codecs/greedy_dict/gd_entry.h b/library/cpp/codecs/greedy_dict/gd_entry.h index 18b5be0e15..42482552a3 100644 --- a/library/cpp/codecs/greedy_dict/gd_entry.h +++ b/library/cpp/codecs/greedy_dict/gd_entry.h @@ -2,7 +2,7 @@ #include "gd_stats.h" -#include <library/cpp/containers/comptrie/comptrie.h> +#include <library/cpp/containers/comptrie/comptrie.h> #include <util/generic/ptr.h> #include <util/generic/strbuf.h> diff --git a/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp b/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp index 679089a11b..a0df45201c 100644 --- a/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp +++ b/library/cpp/codecs/greedy_dict/ut/greedy_dict_ut.cpp @@ -1,7 +1,7 @@ #include "gd_builder.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/string/printf.h> #include <util/generic/ymath.h> diff --git a/library/cpp/codecs/greedy_dict/ya.make b/library/cpp/codecs/greedy_dict/ya.make index 2a57224f7e..dc02820e71 100644 --- a/library/cpp/codecs/greedy_dict/ya.make +++ b/library/cpp/codecs/greedy_dict/ya.make @@ -8,8 +8,8 @@ SRCS( ) PEERDIR( - library/cpp/containers/comptrie - library/cpp/string_utils/relaxed_escaper + library/cpp/containers/comptrie + library/cpp/string_utils/relaxed_escaper ) END() diff --git a/library/cpp/codecs/solar_codec.cpp b/library/cpp/codecs/solar_codec.cpp index d0692fe2a4..b5be13281c 100644 --- a/library/cpp/codecs/solar_codec.cpp +++ b/library/cpp/codecs/solar_codec.cpp @@ -2,8 +2,8 @@ #include <library/cpp/codecs/greedy_dict/gd_builder.h> -#include <library/cpp/containers/comptrie/comptrie_builder.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/containers/comptrie/comptrie_builder.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/stream/length.h> #include <util/string/printf.h> #include <util/ysaveload.h> diff --git a/library/cpp/codecs/solar_codec.h b/library/cpp/codecs/solar_codec.h index 7158ae7926..c9477e643f 100644 --- a/library/cpp/codecs/solar_codec.h +++ b/library/cpp/codecs/solar_codec.h @@ -1,7 +1,7 @@ #pragma once #include "codecs.h" -#include <library/cpp/containers/comptrie/comptrie_trie.h> +#include <library/cpp/containers/comptrie/comptrie_trie.h> #include <library/cpp/codecs/greedy_dict/gd_builder.h> #include <util/string/cast.h> diff --git a/library/cpp/codecs/static/tools/common/ct_common.cpp b/library/cpp/codecs/static/tools/common/ct_common.cpp index fe77691280..ae5b30924c 100644 --- a/library/cpp/codecs/static/tools/common/ct_common.cpp +++ b/library/cpp/codecs/static/tools/common/ct_common.cpp @@ -2,7 +2,7 @@ #include <library/cpp/codecs/codecs.h> #include <library/cpp/codecs/static/static_codec_info.pb.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/stream/output.h> #include <util/string/builder.h> diff --git a/library/cpp/codecs/static/tools/common/ya.make b/library/cpp/codecs/static/tools/common/ya.make index d624222dad..59943b7b8b 100644 --- a/library/cpp/codecs/static/tools/common/ya.make +++ b/library/cpp/codecs/static/tools/common/ya.make @@ -9,8 +9,8 @@ SRCS( PEERDIR( library/cpp/codecs library/cpp/codecs/static - library/cpp/getopt/small - library/cpp/string_utils/base64 + library/cpp/getopt/small + library/cpp/string_utils/base64 util/draft ) diff --git a/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp b/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp index 9c8d568d82..984583f234 100644 --- a/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp +++ b/library/cpp/codecs/static/tools/static_codec_checker/static_codec_checker.cpp @@ -2,7 +2,7 @@ #include <library/cpp/codecs/static/static.h> #include <library/cpp/codecs/static/static_codec_info.pb.h> #include <library/cpp/codecs/codecs.h> -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> #include <util/digest/city.h> #include <util/generic/yexception.h> diff --git a/library/cpp/codecs/static/tools/static_codec_checker/ya.make b/library/cpp/codecs/static/tools/static_codec_checker/ya.make index 90e06ca448..271bce239c 100644 --- a/library/cpp/codecs/static/tools/static_codec_checker/ya.make +++ b/library/cpp/codecs/static/tools/static_codec_checker/ya.make @@ -10,7 +10,7 @@ PEERDIR( library/cpp/codecs library/cpp/codecs/static library/cpp/codecs/static/tools/common - library/cpp/getopt/small + library/cpp/getopt/small ) END() diff --git a/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp b/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp index 45fdb5c5fe..193c964cee 100644 --- a/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp +++ b/library/cpp/codecs/static/tools/static_codec_generator/static_codec_generator.cpp @@ -3,7 +3,7 @@ #include <library/cpp/codecs/static/builder.h> #include <library/cpp/codecs/codecs.h> -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> #include <util/generic/yexception.h> #include <util/stream/file.h> diff --git a/library/cpp/codecs/static/tools/static_codec_generator/ya.make b/library/cpp/codecs/static/tools/static_codec_generator/ya.make index efbc440dd1..d41dab9f89 100644 --- a/library/cpp/codecs/static/tools/static_codec_generator/ya.make +++ b/library/cpp/codecs/static/tools/static_codec_generator/ya.make @@ -11,7 +11,7 @@ PEERDIR( library/cpp/codecs/static library/cpp/codecs/static/tools/common library/cpp/digest/md5 - library/cpp/getopt/small + library/cpp/getopt/small ) END() diff --git a/library/cpp/codecs/static/ut/builder_ut.cpp b/library/cpp/codecs/static/ut/builder_ut.cpp index b47c279ed1..ae746b8c98 100644 --- a/library/cpp/codecs/static/ut/builder_ut.cpp +++ b/library/cpp/codecs/static/ut/builder_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/codecs/static/builder.h> #include <library/cpp/codecs/static/static_codec_info.pb.h> #include <util/string/vector.h> diff --git a/library/cpp/codecs/static/ut/static_ut.cpp b/library/cpp/codecs/static/ut/static_ut.cpp index 57e1e62887..117d77c838 100644 --- a/library/cpp/codecs/static/ut/static_ut.cpp +++ b/library/cpp/codecs/static/ut/static_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/codecs/static/example/example.h> class TStaticCodecUsageTest: public NUnitTest::TTestBase { diff --git a/library/cpp/codecs/ut/codecs_ut.cpp b/library/cpp/codecs/ut/codecs_ut.cpp index caf6089aef..827804eeb1 100644 --- a/library/cpp/codecs/ut/codecs_ut.cpp +++ b/library/cpp/codecs/ut/codecs_ut.cpp @@ -5,12 +5,12 @@ #include <library/cpp/codecs/zstd_dict_codec.h> #include <library/cpp/codecs/comptable_codec.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/buffer.h> #include <util/string/util.h> #include <util/string/hex.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> namespace { const char* TextValues[] = { diff --git a/library/cpp/codecs/ut/float_huffman_ut.cpp b/library/cpp/codecs/ut/float_huffman_ut.cpp index 3156fb1f46..9611100325 100644 --- a/library/cpp/codecs/ut/float_huffman_ut.cpp +++ b/library/cpp/codecs/ut/float_huffman_ut.cpp @@ -1,10 +1,10 @@ #include <library/cpp/codecs/float_huffman.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/format.h> #include <util/stream/output.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> namespace fh = NCodecs::NFloatHuff; diff --git a/library/cpp/codecs/ut/tls_cache_ut.cpp b/library/cpp/codecs/ut/tls_cache_ut.cpp index 8101af761f..14d7552b3b 100644 --- a/library/cpp/codecs/ut/tls_cache_ut.cpp +++ b/library/cpp/codecs/ut/tls_cache_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/codecs/tls_cache.h> Y_UNIT_TEST_SUITE(CodecsBufferFactoryTest){ diff --git a/library/cpp/codecs/ut/ya.make b/library/cpp/codecs/ut/ya.make index 90841b05ef..1c2af74509 100644 --- a/library/cpp/codecs/ut/ya.make +++ b/library/cpp/codecs/ut/ya.make @@ -6,9 +6,9 @@ OWNER( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 library/cpp/codecs - library/cpp/string_utils/relaxed_escaper + library/cpp/string_utils/relaxed_escaper ) SRCS( diff --git a/library/cpp/codecs/ya.make b/library/cpp/codecs/ya.make index 7e76fb0c9a..d240a56d85 100644 --- a/library/cpp/codecs/ya.make +++ b/library/cpp/codecs/ya.make @@ -24,10 +24,10 @@ PEERDIR( library/cpp/blockcodecs library/cpp/codecs/greedy_dict library/cpp/comptable - library/cpp/containers/comptrie + library/cpp/containers/comptrie library/cpp/deprecated/accessors library/cpp/packers - library/cpp/string_utils/relaxed_escaper + library/cpp/string_utils/relaxed_escaper ) END() diff --git a/library/cpp/colorizer/ut/colorizer_ut.cpp b/library/cpp/colorizer/ut/colorizer_ut.cpp index 20341440af..226607885e 100644 --- a/library/cpp/colorizer/ut/colorizer_ut.cpp +++ b/library/cpp/colorizer/ut/colorizer_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/colorizer/colors.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> #include <util/string/escape.h> diff --git a/library/cpp/compproto/compproto_ut.cpp b/library/cpp/compproto/compproto_ut.cpp index 9393be967a..63bb5b7103 100644 --- a/library/cpp/compproto/compproto_ut.cpp +++ b/library/cpp/compproto/compproto_ut.cpp @@ -6,7 +6,7 @@ #include <util/generic/map.h> #include <util/system/protect.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static ui64 gSeed = 42; diff --git a/library/cpp/comptable/ut/comptable_ut.cpp b/library/cpp/comptable/ut/comptable_ut.cpp index 5901d0246f..243b6e3fc1 100644 --- a/library/cpp/comptable/ut/comptable_ut.cpp +++ b/library/cpp/comptable/ut/comptable_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/comptable/comptable.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/random/fast.h> diff --git a/library/cpp/containers/bitseq/bititerator_ut.cpp b/library/cpp/containers/bitseq/bititerator_ut.cpp index ed0925866f..9857e31fc1 100644 --- a/library/cpp/containers/bitseq/bititerator_ut.cpp +++ b/library/cpp/containers/bitseq/bititerator_ut.cpp @@ -1,6 +1,6 @@ #include "bititerator.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> Y_UNIT_TEST_SUITE(TBitIteratorTest) { diff --git a/library/cpp/containers/bitseq/bitvector_ut.cpp b/library/cpp/containers/bitseq/bitvector_ut.cpp index 6137adab1e..78fd155f87 100644 --- a/library/cpp/containers/bitseq/bitvector_ut.cpp +++ b/library/cpp/containers/bitseq/bitvector_ut.cpp @@ -1,7 +1,7 @@ #include "bitvector.h" #include "readonly_bitvector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/memory/blob.h> #include <util/stream/buffer.h> diff --git a/library/cpp/containers/compact_vector/compact_vector_ut.cpp b/library/cpp/containers/compact_vector/compact_vector_ut.cpp index 7d413d6575..cef0f81726 100644 --- a/library/cpp/containers/compact_vector/compact_vector_ut.cpp +++ b/library/cpp/containers/compact_vector/compact_vector_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "compact_vector.h" diff --git a/library/cpp/containers/comptrie/benchmark/main.cpp b/library/cpp/containers/comptrie/benchmark/main.cpp index 6e42dad18a..8a353b6b5d 100644 --- a/library/cpp/containers/comptrie/benchmark/main.cpp +++ b/library/cpp/containers/comptrie/benchmark/main.cpp @@ -1,9 +1,9 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> -#include <library/cpp/containers/comptrie/comptrie_trie.h> -#include <library/cpp/containers/comptrie/comptrie_builder.h> -#include <library/cpp/containers/comptrie/search_iterator.h> -#include <library/cpp/containers/comptrie/pattern_searcher.h> +#include <library/cpp/containers/comptrie/comptrie_trie.h> +#include <library/cpp/containers/comptrie/comptrie_builder.h> +#include <library/cpp/containers/comptrie/search_iterator.h> +#include <library/cpp/containers/comptrie/pattern_searcher.h> #include <library/cpp/on_disk/aho_corasick/writer.h> #include <library/cpp/on_disk/aho_corasick/reader.h> diff --git a/library/cpp/containers/comptrie/benchmark/ya.make b/library/cpp/containers/comptrie/benchmark/ya.make index 16fa19530d..fcd3d2851c 100644 --- a/library/cpp/containers/comptrie/benchmark/ya.make +++ b/library/cpp/containers/comptrie/benchmark/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/containers/comptrie + library/cpp/containers/comptrie util ) diff --git a/library/cpp/containers/comptrie/comptrie_builder.inl b/library/cpp/containers/comptrie/comptrie_builder.inl index f273fa6571..fd8d30b13c 100644 --- a/library/cpp/containers/comptrie/comptrie_builder.inl +++ b/library/cpp/containers/comptrie/comptrie_builder.inl @@ -745,8 +745,8 @@ void TCompactTrieBuilder<T, D, S>::TCompactTrieBuilderImpl::Clear() { Pool.Clear(); NodeAllocator.Reset(new TFixedSizeAllocator(sizeof(TNode) + PayloadSize, TDefaultAllocator::Instance())); Root = new (*NodeAllocator) TNode; - EntryCount = 0; - NodeCount = 1; + EntryCount = 0; + NodeCount = 1; } template <class T, class D, class S> diff --git a/library/cpp/containers/comptrie/comptrie_ut.cpp b/library/cpp/containers/comptrie/comptrie_ut.cpp index 74bee09b5d..f71b285e6a 100644 --- a/library/cpp/containers/comptrie/comptrie_ut.cpp +++ b/library/cpp/containers/comptrie/comptrie_ut.cpp @@ -1,5 +1,5 @@ #include <util/random/shuffle.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> #include <utility> @@ -206,7 +206,7 @@ public: void TestMergeFromBuffer(); void TestUnique(); void TestAddRetValue(); - void TestClear(); + void TestClear(); void TestIterateEmptyKey(); @@ -983,27 +983,27 @@ void TCompactTrieTest::TestAddRetValue() { } void TCompactTrieTest::TestClear() { - TCompactTrieBuilder<char, ui32> builder; - const char* data[] = { - "Kazan", - "Moscow", - "Monino", - "Murmansk", - "Fryanovo", - "Fryazino", - "Fryazevo", - "Fry", - "Tumen", - }; + TCompactTrieBuilder<char, ui32> builder; + const char* data[] = { + "Kazan", + "Moscow", + "Monino", + "Murmansk", + "Fryanovo", + "Fryazino", + "Fryazevo", + "Fry", + "Tumen", + }; for (size_t i = 0; i < Y_ARRAY_SIZE(data); ++i) { - builder.Add(data[i], strlen(data[i]), i + 1); - } + builder.Add(data[i], strlen(data[i]), i + 1); + } UNIT_ASSERT(builder.GetEntryCount() == Y_ARRAY_SIZE(data)); - builder.Clear(); - UNIT_ASSERT(builder.GetEntryCount() == 0); - UNIT_ASSERT(builder.GetNodeCount() == 1); -} - + builder.Clear(); + UNIT_ASSERT(builder.GetEntryCount() == 0); + UNIT_ASSERT(builder.GetNodeCount() == 1); +} + void TCompactTrieTest::TestFindTails() { TestFindTailsImpl("aa"); TestFindTailsImpl("bb"); diff --git a/library/cpp/containers/comptrie/loader/loader_ut.cpp b/library/cpp/containers/comptrie/loader/loader_ut.cpp index 345063a31e..1654f8d4d0 100644 --- a/library/cpp/containers/comptrie/loader/loader_ut.cpp +++ b/library/cpp/containers/comptrie/loader/loader_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/containers/comptrie/comptrie.h> -#include <library/cpp/containers/comptrie/loader/loader.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/containers/comptrie/comptrie.h> +#include <library/cpp/containers/comptrie/loader/loader.h> using TDummyTrie = TCompactTrie<char, i32>; diff --git a/library/cpp/containers/comptrie/loader/ut/ya.make b/library/cpp/containers/comptrie/loader/ut/ya.make index 6c0334d3ea..6f20e6d699 100644 --- a/library/cpp/containers/comptrie/loader/ut/ya.make +++ b/library/cpp/containers/comptrie/loader/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/containers/comptrie/loader) +UNITTEST_FOR(library/cpp/containers/comptrie/loader) OWNER(my34) @@ -12,7 +12,7 @@ SRCS( ) PEERDIR( - library/cpp/containers/comptrie/loader + library/cpp/containers/comptrie/loader ) END() diff --git a/library/cpp/containers/comptrie/loader/ya.make b/library/cpp/containers/comptrie/loader/ya.make index 1e23e442a0..8279dd86e5 100644 --- a/library/cpp/containers/comptrie/loader/ya.make +++ b/library/cpp/containers/comptrie/loader/ya.make @@ -9,7 +9,7 @@ SRCS( PEERDIR( library/cpp/archive - library/cpp/containers/comptrie + library/cpp/containers/comptrie ) END() diff --git a/library/cpp/containers/comptrie/pattern_searcher.h b/library/cpp/containers/comptrie/pattern_searcher.h index caab51dc1c..bce5f8615b 100644 --- a/library/cpp/containers/comptrie/pattern_searcher.h +++ b/library/cpp/containers/comptrie/pattern_searcher.h @@ -1,8 +1,8 @@ #pragma once -#include "comptrie_builder.h" -#include "comptrie_trie.h" -#include "comptrie_impl.h" +#include "comptrie_builder.h" +#include "comptrie_trie.h" +#include "comptrie_impl.h" #include <library/cpp/packers/packers.h> #include <util/system/yassert.h> diff --git a/library/cpp/containers/comptrie/ut/ya.make b/library/cpp/containers/comptrie/ut/ya.make index c4f4666009..4ad483c0dc 100644 --- a/library/cpp/containers/comptrie/ut/ya.make +++ b/library/cpp/containers/comptrie/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/containers/comptrie) +UNITTEST_FOR(library/cpp/containers/comptrie) OWNER(alzobnin) diff --git a/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp b/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp index 040cff3fff..c9f90a5bf1 100644 --- a/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp +++ b/library/cpp/containers/flat_hash/benchmark/flat_hash_benchmark.cpp @@ -1,7 +1,7 @@ #include <library/cpp/containers/flat_hash/flat_hash.h> #include <library/cpp/containers/dense_hash/dense_hash.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/random/random.h> #include <util/generic/xrange.h> diff --git a/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp index b17b30fa80..8da76a0512 100644 --- a/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp +++ b/library/cpp/containers/flat_hash/lib/ut/containers_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/containers/flat_hash/lib/containers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/random/random.h> diff --git a/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp index 0b77bf043f..f0282c11b6 100644 --- a/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp +++ b/library/cpp/containers/flat_hash/lib/ut/iterator_ut.cpp @@ -1,7 +1,7 @@ #include <library/cpp/containers/flat_hash/lib/iterator.h> #include <library/cpp/containers/flat_hash/lib/containers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/generic/algorithm.h> diff --git a/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp index 593f8cbb1b..33484a1459 100644 --- a/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp +++ b/library/cpp/containers/flat_hash/lib/ut/probings_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/containers/flat_hash/lib/probings.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NFlatHash; diff --git a/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp index 4167947ece..299249c5e7 100644 --- a/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp +++ b/library/cpp/containers/flat_hash/lib/ut/size_fitters_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/containers/flat_hash/lib/size_fitters.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NFlatHash; diff --git a/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp b/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp index ea511e2c6a..1c34598ee0 100644 --- a/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp +++ b/library/cpp/containers/flat_hash/lib/ut/table_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/containers/flat_hash/lib/size_fitters.h> #include <library/cpp/containers/flat_hash/lib/table.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/random/random.h> diff --git a/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp b/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp index 2b9d6a1dc2..77c6d5ff95 100644 --- a/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp +++ b/library/cpp/containers/flat_hash/ut/flat_hash_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/containers/flat_hash/flat_hash.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NFH; diff --git a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp index cab2365cce..07ca1176fd 100644 --- a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp +++ b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/containers/intrusive_avl_tree/avltree.h> diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp b/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp index c34ed1fd9b..5a75bdd8f5 100644 --- a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp +++ b/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp @@ -1,6 +1,6 @@ #include "rb_tree.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> #include <util/random/easy.h> diff --git a/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp b/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp index e867808ee4..7d3e544aa7 100644 --- a/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp +++ b/library/cpp/containers/paged_vector/ut/paged_vector_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/containers/paged_vector/paged_vector.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <stdexcept> diff --git a/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp b/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp index 893862f098..47a718e729 100644 --- a/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp +++ b/library/cpp/containers/sorted_vector/sorted_vector_ut.cpp @@ -1,6 +1,6 @@ #include "sorted_vector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/generic/strbuf.h> diff --git a/library/cpp/containers/stack_array/ut/tests_ut.cpp b/library/cpp/containers/stack_array/ut/tests_ut.cpp index 3e96384f0e..b99334ba1e 100644 --- a/library/cpp/containers/stack_array/ut/tests_ut.cpp +++ b/library/cpp/containers/stack_array/ut/tests_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/containers/stack_array/stack_array.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestStackArray) { using namespace NStackArray; diff --git a/library/cpp/containers/stack_vector/stack_vec_ut.cpp b/library/cpp/containers/stack_vector/stack_vec_ut.cpp index 19f9677781..003ec955e6 100644 --- a/library/cpp/containers/stack_vector/stack_vec_ut.cpp +++ b/library/cpp/containers/stack_vector/stack_vec_ut.cpp @@ -1,6 +1,6 @@ #include "stack_vec.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace { struct TNotCopyAssignable { diff --git a/library/cpp/containers/stack_vector/ut/ya.make b/library/cpp/containers/stack_vector/ut/ya.make index 1d70496954..86327485b0 100644 --- a/library/cpp/containers/stack_vector/ut/ya.make +++ b/library/cpp/containers/stack_vector/ut/ya.make @@ -1,8 +1,8 @@ UNITTEST() -OWNER(ilnurkh) +OWNER(ilnurkh) -SRCDIR(library/cpp/containers/stack_vector) +SRCDIR(library/cpp/containers/stack_vector) SRCS( stack_vec_ut.cpp diff --git a/library/cpp/containers/stack_vector/ya.make b/library/cpp/containers/stack_vector/ya.make index cfb63295ec..938bf2945b 100644 --- a/library/cpp/containers/stack_vector/ya.make +++ b/library/cpp/containers/stack_vector/ya.make @@ -1,11 +1,11 @@ LIBRARY() -OWNER(ilnurkh) +OWNER(ilnurkh) SRCS( stack_vec.cpp ) END() - -RECURSE_FOR_TESTS(ut) + +RECURSE_FOR_TESTS(ut) diff --git a/library/cpp/containers/top_keeper/README.md b/library/cpp/containers/top_keeper/README.md index f160fb1c01..e7a1adb9af 100644 --- a/library/cpp/containers/top_keeper/README.md +++ b/library/cpp/containers/top_keeper/README.md @@ -23,4 +23,4 @@ TopKeeper - структура данных для поддержания "top M В ситуации когда нужны чередующиеся добавления / извлечения - используйте LimitedHeap Примеры использования: -library/cpp/containers/top_keeper/ut +library/cpp/containers/top_keeper/ut diff --git a/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp b/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp index a938279025..761478481d 100644 --- a/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp +++ b/library/cpp/containers/top_keeper/top_keeper/ut/top_keeper_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/containers/limited_heap/limited_heap.h> #include <library/cpp/containers/top_keeper/top_keeper.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> static ui32 seed = 3; diff --git a/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp b/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp index a938279025..ecb624143d 100644 --- a/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp +++ b/library/cpp/containers/top_keeper/ut/top_keeper_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/containers/limited_heap/limited_heap.h> -#include <library/cpp/containers/top_keeper/top_keeper.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/containers/top_keeper/top_keeper.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> static ui32 seed = 3; diff --git a/library/cpp/containers/top_keeper/ut/ya.make b/library/cpp/containers/top_keeper/ut/ya.make index 42cfdd6f13..49093c470c 100644 --- a/library/cpp/containers/top_keeper/ut/ya.make +++ b/library/cpp/containers/top_keeper/ut/ya.make @@ -1,7 +1,7 @@ -UNITTEST_FOR(library/cpp/containers/top_keeper) +UNITTEST_FOR(library/cpp/containers/top_keeper) OWNER( - ilnurkh + ilnurkh rmplstiltskin ) diff --git a/library/cpp/containers/top_keeper/ya.make b/library/cpp/containers/top_keeper/ya.make index ed206a1df9..7f0779e051 100644 --- a/library/cpp/containers/top_keeper/ya.make +++ b/library/cpp/containers/top_keeper/ya.make @@ -1,13 +1,13 @@ LIBRARY() -OWNER(ilnurkh) +OWNER(ilnurkh) SRCS( top_keeper.cpp ) END() - -RECURSE_FOR_TESTS(ut) - - + +RECURSE_FOR_TESTS(ut) + + diff --git a/library/cpp/containers/ya.make b/library/cpp/containers/ya.make index 4b1b315e6a..a65dee29b3 100644 --- a/library/cpp/containers/ya.make +++ b/library/cpp/containers/ya.make @@ -1,5 +1,5 @@ RECURSE( - 2d_array + 2d_array absl_flat_hash absl_tstring_flat_hash atomizer @@ -7,11 +7,11 @@ RECURSE( bitseq/ut compact_vector compact_vector/ut - comptrie - comptrie/loader - comptrie/loader/ut - comptrie/ut - comptrie/benchmark + comptrie + comptrie/loader + comptrie/loader/ut + comptrie/ut + comptrie/benchmark concurrent_hash concurrent_hash_set concurrent_hash_set/ut @@ -22,8 +22,8 @@ RECURSE( dictionary/ut disjoint_interval_tree disjoint_interval_tree/ut - ext_priority_queue - ext_priority_queue/ut + ext_priority_queue + ext_priority_queue/ut fast_trie fast_trie/ut flat_hash @@ -59,11 +59,11 @@ RECURSE( spars_ar stack_array stack_array/ut - stack_vector + stack_vector str_hash str_map - top_keeper - top_keeper/ut + top_keeper + top_keeper/ut two_level_hash two_level_hash/ut vp_tree diff --git a/library/cpp/coroutine/engine/coroutine_ut.cpp b/library/cpp/coroutine/engine/coroutine_ut.cpp index 8b372496a2..38554cfaaf 100644 --- a/library/cpp/coroutine/engine/coroutine_ut.cpp +++ b/library/cpp/coroutine/engine/coroutine_ut.cpp @@ -2,7 +2,7 @@ #include "condvar.h" #include "network.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> #include <util/system/pipe.h> diff --git a/library/cpp/coroutine/engine/poller.cpp b/library/cpp/coroutine/engine/poller.cpp index 61164fa56b..02aabed4f5 100644 --- a/library/cpp/coroutine/engine/poller.cpp +++ b/library/cpp/coroutine/engine/poller.cpp @@ -4,7 +4,7 @@ #include <util/memory/smallobj.h> #include <util/generic/intrlist.h> #include <util/generic/singleton.h> -#include <util/system/env.h> +#include <util/system/env.h> #include <util/string/cast.h> namespace { diff --git a/library/cpp/dbg_output/ut/dbg_output_ut.cpp b/library/cpp/dbg_output/ut/dbg_output_ut.cpp index 7b285c84cb..825ff8662a 100644 --- a/library/cpp/dbg_output/ut/dbg_output_ut.cpp +++ b/library/cpp/dbg_output/ut/dbg_output_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/dbg_output/dump.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> #include <util/string/builder.h> diff --git a/library/cpp/deprecated/accessors/accessors_ut.cpp b/library/cpp/deprecated/accessors/accessors_ut.cpp index a9bdc9fcc4..8e57abd493 100644 --- a/library/cpp/deprecated/accessors/accessors_ut.cpp +++ b/library/cpp/deprecated/accessors/accessors_ut.cpp @@ -1,6 +1,6 @@ #include "accessors.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/buffer.h> #include <util/generic/vector.h> diff --git a/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp b/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp index f8f1c9b6df..8b317a3276 100644 --- a/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp +++ b/library/cpp/deprecated/enum_codegen/enum_codegen_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "enum_codegen.h" diff --git a/library/cpp/deprecated/kmp/kmp_ut.cpp b/library/cpp/deprecated/kmp/kmp_ut.cpp index c2eda83c57..fa2a0bba6e 100644 --- a/library/cpp/deprecated/kmp/kmp_ut.cpp +++ b/library/cpp/deprecated/kmp/kmp_ut.cpp @@ -1,6 +1,6 @@ #include "kmp.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/library/cpp/deprecated/mapped_file/mapped_file.cpp b/library/cpp/deprecated/mapped_file/mapped_file.cpp index b0e4511299..9cee7da7c0 100644 --- a/library/cpp/deprecated/mapped_file/mapped_file.cpp +++ b/library/cpp/deprecated/mapped_file/mapped_file.cpp @@ -30,7 +30,7 @@ void TMappedFile::precharge(size_t off, size_t size) const { void TMappedFile::init(const TString& name) { THolder<TFileMap> map(new TFileMap(name)); TMappedFile newFile(map.Get(), name.data()); - Y_UNUSED(map.Release()); + Y_UNUSED(map.Release()); newFile.swap(*this); newFile.term(); } @@ -38,7 +38,7 @@ void TMappedFile::init(const TString& name) { void TMappedFile::init(const TString& name, size_t length, TFileMap::EOpenMode om) { THolder<TFileMap> map(new TFileMap(name, length, om)); TMappedFile newFile(map.Get(), name.data()); - Y_UNUSED(map.Release()); + Y_UNUSED(map.Release()); newFile.swap(*this); newFile.term(); } @@ -46,7 +46,7 @@ void TMappedFile::init(const TString& name, size_t length, TFileMap::EOpenMode o void TMappedFile::init(const TFile& file, TFileMap::EOpenMode om, const char* dbgName) { THolder<TFileMap> map(new TFileMap(file, om)); TMappedFile newFile(map.Get(), dbgName); - Y_UNUSED(map.Release()); + Y_UNUSED(map.Release()); newFile.swap(*this); newFile.term(); } @@ -54,7 +54,7 @@ void TMappedFile::init(const TFile& file, TFileMap::EOpenMode om, const char* db void TMappedFile::init(const TString& name, TFileMap::EOpenMode om) { THolder<TFileMap> map(new TFileMap(name, om)); TMappedFile newFile(map.Get(), name.data()); - Y_UNUSED(map.Release()); + Y_UNUSED(map.Release()); newFile.swap(*this); newFile.term(); } diff --git a/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp b/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp index afbd5b3358..726af9a7e6 100644 --- a/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp +++ b/library/cpp/deprecated/mapped_file/ut/mapped_file_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/deprecated/mapped_file/mapped_file.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/fs.h> diff --git a/library/cpp/deprecated/split/delim_string_iter_ut.cpp b/library/cpp/deprecated/split/delim_string_iter_ut.cpp index 18a8b2a160..c596c6d438 100644 --- a/library/cpp/deprecated/split/delim_string_iter_ut.cpp +++ b/library/cpp/deprecated/split/delim_string_iter_ut.cpp @@ -1,6 +1,6 @@ #include "delim_string_iter.h" #include <util/generic/vector.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> /// Test that TDelimStringIter build on top of given string and delimeter will produce expected sequence static void AssertStringSplit(const TString& str, const TString& delim, const TVector<TString>& expected) { diff --git a/library/cpp/deprecated/split/split_iterator_ut.cpp b/library/cpp/deprecated/split/split_iterator_ut.cpp index be5069c4be..b30d071986 100644 --- a/library/cpp/deprecated/split/split_iterator_ut.cpp +++ b/library/cpp/deprecated/split/split_iterator_ut.cpp @@ -1,6 +1,6 @@ #include "split_iterator.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TSplitIteratorTest: public TTestBase { UNIT_TEST_SUITE(TSplitIteratorTest); diff --git a/library/cpp/diff/diff_ut.cpp b/library/cpp/diff/diff_ut.cpp index b82a7b000e..06273ded20 100644 --- a/library/cpp/diff/diff_ut.cpp +++ b/library/cpp/diff/diff_ut.cpp @@ -1,6 +1,6 @@ #include "diff.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NDiff; diff --git a/library/cpp/diff/ut/ya.make b/library/cpp/diff/ut/ya.make index 360134d186..40ab4698e5 100644 --- a/library/cpp/diff/ut/ya.make +++ b/library/cpp/diff/ut/ya.make @@ -2,10 +2,10 @@ UNITTEST() OWNER(antonovvk) -SRCDIR(library/cpp/diff) +SRCDIR(library/cpp/diff) PEERDIR( - library/cpp/diff + library/cpp/diff ) SRCS( diff --git a/library/cpp/digest/argonish/benchmark/mbench.cpp b/library/cpp/digest/argonish/benchmark/mbench.cpp index 178c1169c9..ff846c5d4a 100644 --- a/library/cpp/digest/argonish/benchmark/mbench.cpp +++ b/library/cpp/digest/argonish/benchmark/mbench.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <library/cpp/digest/argonish/argon2.h> Y_CPU_BENCHMARK(Argon2d_2048_REF, iface) { diff --git a/library/cpp/digest/argonish/internal/argon2/argon2_base.h b/library/cpp/digest/argonish/internal/argon2/argon2_base.h index 2385cc947c..359c4d91b6 100644 --- a/library/cpp/digest/argonish/internal/argon2/argon2_base.h +++ b/library/cpp/digest/argonish/internal/argon2/argon2_base.h @@ -3,7 +3,7 @@ #include <util/generic/yexception.h> #include <library/cpp/digest/argonish/argon2.h> #include <library/cpp/digest/argonish/internal/blake2b/blake2b.h> -#include <library/cpp/threading/poor_man_openmp/thread_helper.h> +#include <library/cpp/threading/poor_man_openmp/thread_helper.h> namespace NArgonish { const ui32 ARGON2_PREHASH_DIGEST_LENGTH = 64; diff --git a/library/cpp/digest/argonish/ut/ut.cpp b/library/cpp/digest/argonish/ut/ut.cpp index 12ef530a18..6d36eb9d0d 100644 --- a/library/cpp/digest/argonish/ut/ut.cpp +++ b/library/cpp/digest/argonish/ut/ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/digest/argonish/argon2.h> #include <library/cpp/digest/argonish/blake2b.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ArgonishTest) { const ui8 GenKatPassword[32] = { diff --git a/library/cpp/digest/argonish/ut_fat/ut.cpp b/library/cpp/digest/argonish/ut_fat/ut.cpp index 41fa001685..cd17876cba 100644 --- a/library/cpp/digest/argonish/ut_fat/ut.cpp +++ b/library/cpp/digest/argonish/ut_fat/ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/digest/argonish/argon2.h> #include <library/cpp/digest/argonish/blake2b.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ArgonishTest) { const ui8 GenKatPassword[32] = { diff --git a/library/cpp/digest/crc32c/crc32c_ut.cpp b/library/cpp/digest/crc32c/crc32c_ut.cpp index aa31b83422..e829467afc 100644 --- a/library/cpp/digest/crc32c/crc32c_ut.cpp +++ b/library/cpp/digest/crc32c/crc32c_ut.cpp @@ -1,6 +1,6 @@ #include "crc32c.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestCrc32c) { Y_UNIT_TEST(TestCalc) { diff --git a/library/cpp/digest/lower_case/hash_ops_ut.cpp b/library/cpp/digest/lower_case/hash_ops_ut.cpp index a7ab0b86ea..4c9af596f3 100644 --- a/library/cpp/digest/lower_case/hash_ops_ut.cpp +++ b/library/cpp/digest/lower_case/hash_ops_ut.cpp @@ -1,6 +1,6 @@ #include "hash_ops.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestCIHash) { Y_UNIT_TEST(TestYHash1) { diff --git a/library/cpp/digest/lower_case/lchash_ut.cpp b/library/cpp/digest/lower_case/lchash_ut.cpp index 5711fe7cd7..4df3b80e17 100644 --- a/library/cpp/digest/lower_case/lchash_ut.cpp +++ b/library/cpp/digest/lower_case/lchash_ut.cpp @@ -1,6 +1,6 @@ #include "lchash.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TWebDaemonHash) { Y_UNIT_TEST(Stability) { diff --git a/library/cpp/digest/md5/md5_medium_ut.cpp b/library/cpp/digest/md5/md5_medium_ut.cpp index a940c5cb66..524e0b1e44 100644 --- a/library/cpp/digest/md5/md5_medium_ut.cpp +++ b/library/cpp/digest/md5/md5_medium_ut.cpp @@ -1,6 +1,6 @@ #include "md5.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TMD5MediumTest) { Y_UNIT_TEST(TestOverflow) { diff --git a/library/cpp/digest/md5/md5_ut.cpp b/library/cpp/digest/md5/md5_ut.cpp index 1c3e4ad0a9..51afd8bc55 100644 --- a/library/cpp/digest/md5/md5_ut.cpp +++ b/library/cpp/digest/md5/md5_ut.cpp @@ -1,6 +1,6 @@ #include "md5.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/fs.h> #include <util/stream/file.h> diff --git a/library/cpp/digest/md5/ya.make b/library/cpp/digest/md5/ya.make index c09ec1c326..9420c4e00e 100644 --- a/library/cpp/digest/md5/ya.make +++ b/library/cpp/digest/md5/ya.make @@ -11,7 +11,7 @@ SRCS( PEERDIR( contrib/libs/nayuki_md5 - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) END() diff --git a/library/cpp/digest/old_crc/crc_ut.cpp b/library/cpp/digest/old_crc/crc_ut.cpp index 46e1d5d29b..03e486b3d7 100644 --- a/library/cpp/digest/old_crc/crc_ut.cpp +++ b/library/cpp/digest/old_crc/crc_ut.cpp @@ -1,6 +1,6 @@ #include "crc.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/library/cpp/digest/sfh/sfh_ut.cpp b/library/cpp/digest/sfh/sfh_ut.cpp index 912999bae7..82107d0896 100644 --- a/library/cpp/digest/sfh/sfh_ut.cpp +++ b/library/cpp/digest/sfh/sfh_ut.cpp @@ -1,6 +1,6 @@ #include "sfh.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/library/cpp/dns/ut/dns_ut.cpp b/library/cpp/dns/ut/dns_ut.cpp index aae05a742c..9c2acf72a0 100644 --- a/library/cpp/dns/ut/dns_ut.cpp +++ b/library/cpp/dns/ut/dns_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/dns/cache.h> #include <util/network/address.h> diff --git a/library/cpp/enumbitset/enumbitset_ut.cpp b/library/cpp/enumbitset/enumbitset_ut.cpp index e55b3251c3..fdc68bf28c 100644 --- a/library/cpp/enumbitset/enumbitset_ut.cpp +++ b/library/cpp/enumbitset/enumbitset_ut.cpp @@ -1,6 +1,6 @@ #include "enumbitset.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> #include <util/stream/file.h> diff --git a/library/cpp/getopt/last_getopt.h b/library/cpp/getopt/last_getopt.h index d14f05cc5b..3a50270b44 100644 --- a/library/cpp/getopt/last_getopt.h +++ b/library/cpp/getopt/last_getopt.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> diff --git a/library/cpp/getopt/last_getopt_demo/demo.cpp b/library/cpp/getopt/last_getopt_demo/demo.cpp index 79426a9cc9..dfa98829a6 100644 --- a/library/cpp/getopt/last_getopt_demo/demo.cpp +++ b/library/cpp/getopt/last_getopt_demo/demo.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/getopt/last_getopt.h> -#include <library/cpp/getopt/modchooser.h> +#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/modchooser.h> #include <library/cpp/colorizer/colors.h> // For the sake of this example, let's implement Wget @@ -158,7 +158,7 @@ protected: opts.AddSection( "Description", - "LastGetoptDemo is a showcase of library/cpp/getopt capabilities. It mimics interface of Wget " + "LastGetoptDemo is a showcase of library/cpp/getopt capabilities. It mimics interface of Wget " "but doesn't actually do anything." "\n\n" "GNU Wget, on the other hand, is a free utility for non-interactive download of files from the Web." diff --git a/library/cpp/getopt/last_getopt_demo/ya.make b/library/cpp/getopt/last_getopt_demo/ya.make index 53f1cfc122..a0a6bb7f3e 100644 --- a/library/cpp/getopt/last_getopt_demo/ya.make +++ b/library/cpp/getopt/last_getopt_demo/ya.make @@ -3,7 +3,7 @@ PROGRAM(last_getopt_demo) OWNER(amatanhead) PEERDIR( - library/cpp/getopt + library/cpp/getopt ) SRCS( diff --git a/library/cpp/getopt/last_getopt_support.h b/library/cpp/getopt/last_getopt_support.h index b71c7045b1..6a2fd0ba86 100644 --- a/library/cpp/getopt/last_getopt_support.h +++ b/library/cpp/getopt/last_getopt_support.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/last_getopt_support.h> +#include <library/cpp/getopt/small/last_getopt_support.h> diff --git a/library/cpp/getopt/modchooser.h b/library/cpp/getopt/modchooser.h index 9bf73daf13..956d4c7fd9 100644 --- a/library/cpp/getopt/modchooser.h +++ b/library/cpp/getopt/modchooser.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/modchooser.h> +#include <library/cpp/getopt/small/modchooser.h> diff --git a/library/cpp/getopt/opt.h b/library/cpp/getopt/opt.h index d2a85075bd..a0c6fdee64 100644 --- a/library/cpp/getopt/opt.h +++ b/library/cpp/getopt/opt.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/opt.h> +#include <library/cpp/getopt/small/opt.h> diff --git a/library/cpp/getopt/opt2.h b/library/cpp/getopt/opt2.h index 2d35bc7b29..17373ce273 100644 --- a/library/cpp/getopt/opt2.h +++ b/library/cpp/getopt/opt2.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/opt2.h> +#include <library/cpp/getopt/small/opt2.h> diff --git a/library/cpp/getopt/posix_getopt.h b/library/cpp/getopt/posix_getopt.h index 8cb7ece624..38e1650c89 100644 --- a/library/cpp/getopt/posix_getopt.h +++ b/library/cpp/getopt/posix_getopt.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/posix_getopt.h> +#include <library/cpp/getopt/small/posix_getopt.h> diff --git a/library/cpp/getopt/print.cpp b/library/cpp/getopt/print.cpp index 8cf1c62e4d..0aadd22eba 100644 --- a/library/cpp/getopt/print.cpp +++ b/library/cpp/getopt/print.cpp @@ -9,7 +9,7 @@ #include <library/cpp/svnversion/svnversion.h> #include <library/cpp/build_info/build_info.h> -namespace NLastGetoptPrivate { +namespace NLastGetoptPrivate { TString InitVersionString() { TString ts = GetProgramSvnVersion(); ts += "\n"; @@ -21,7 +21,7 @@ namespace NLastGetoptPrivate { } return ts; } - + TString InitShortVersionString() { TString ts = GetProgramShortVersionData(); return ts; @@ -29,12 +29,12 @@ namespace NLastGetoptPrivate { TString& VersionString(); TString& ShortVersionString(); - - struct TInit { + + struct TInit { TInit() { - VersionString() = InitVersionString(); + VersionString() = InitVersionString(); ShortVersionString() = InitShortVersionString(); - } - } Init; - + } + } Init; + } diff --git a/library/cpp/getopt/small/last_getopt.h b/library/cpp/getopt/small/last_getopt.h index 07687bc914..e0479cc433 100644 --- a/library/cpp/getopt/small/last_getopt.h +++ b/library/cpp/getopt/small/last_getopt.h @@ -1,38 +1,38 @@ #pragma once -#include "last_getopt_opts.h" -#include "last_getopt_easy_setup.h" -#include "last_getopt_parse_result.h" - +#include "last_getopt_opts.h" +#include "last_getopt_easy_setup.h" +#include "last_getopt_parse_result.h" + #include <util/generic/function.h> #include <util/string/split.h> -/// see some documentation in -/// https://wiki.yandex-team.ru/development/poisk/arcadia/util/lastgetopt/ +/// see some documentation in +/// https://wiki.yandex-team.ru/development/poisk/arcadia/util/lastgetopt/ /// https://wiki.yandex-team.ru/development/poisk/arcadia/library/getopt/ -/// see examples in library/cpp/getopt/last_getopt_demo - -//TODO: in most cases this include is unnecessary, but needed THandlerFunctor1<TpFunc, TpArg>::HandleOpt -#include "last_getopt_parser.h" +/// see examples in library/cpp/getopt/last_getopt_demo +//TODO: in most cases this include is unnecessary, but needed THandlerFunctor1<TpFunc, TpArg>::HandleOpt +#include "last_getopt_parser.h" + namespace NLastGetopt { - /// Handler to split option value by delimiter into a target container and allow ranges. + /// Handler to split option value by delimiter into a target container and allow ranges. template <class Container> struct TOptRangeSplitHandler: public IOptHandler { - public: - using TContainer = Container; - using TValue = typename TContainer::value_type; + public: + using TContainer = Container; + using TValue = typename TContainer::value_type; - explicit TOptRangeSplitHandler(TContainer* target, const char elementsDelim, const char rangesDelim) - : Target(target) - , ElementsDelim(elementsDelim) + explicit TOptRangeSplitHandler(TContainer* target, const char elementsDelim, const char rangesDelim) + : Target(target) + , ElementsDelim(elementsDelim) , RangesDelim(rangesDelim) { } void HandleOpt(const TOptsParser* parser) override { - const TStringBuf curval(parser->CurValOrDef()); - if (curval.IsInited()) { + const TStringBuf curval(parser->CurValOrDef()); + if (curval.IsInited()) { StringSplitter(curval).Split(ElementsDelim).Consume([&](const TStringBuf& val) { TStringBuf mutableValue = val; @@ -47,39 +47,39 @@ namespace NLastGetopt { Target->insert(Target->end(), first); } }); - } + } } private: TContainer* Target; - char ElementsDelim; - char RangesDelim; + char ElementsDelim; + char RangesDelim; }; template <class Container> struct TOptSplitHandler: public IOptHandler { - public: - using TContainer = Container; - using TValue = typename TContainer::value_type; + public: + using TContainer = Container; + using TValue = typename TContainer::value_type; - explicit TOptSplitHandler(TContainer* target, const char delim) - : Target(target) + explicit TOptSplitHandler(TContainer* target, const char delim) + : Target(target) , Delim(delim) { } void HandleOpt(const TOptsParser* parser) override { - const TStringBuf curval(parser->CurValOrDef()); - if (curval.IsInited()) { + const TStringBuf curval(parser->CurValOrDef()); + if (curval.IsInited()) { StringSplitter(curval).Split(Delim).Consume([&](const TStringBuf& val) { Target->insert(Target->end(), NPrivate::OptFromString<TValue>(val, parser->CurOpt())); }); - } + } } - private: - TContainer* Target; - char Delim; + private: + TContainer* Target; + char Delim; }; template <class TpFunc> @@ -129,4 +129,4 @@ namespace NLastGetopt { } -} +} diff --git a/library/cpp/getopt/small/last_getopt_easy_setup.cpp b/library/cpp/getopt/small/last_getopt_easy_setup.cpp index c87dedf95e..dea45dbb83 100644 --- a/library/cpp/getopt/small/last_getopt_easy_setup.cpp +++ b/library/cpp/getopt/small/last_getopt_easy_setup.cpp @@ -1,12 +1,12 @@ -#include "last_getopt_easy_setup.h" - -namespace NLastGetopt { +#include "last_getopt_easy_setup.h" + +namespace NLastGetopt { TEasySetup::TEasySetup(const TStringBuf& optstring) : TOpts(optstring) { AddHelpOption(); } - + TOpt& TEasySetup::AdjustParam(const char* longName, const char* help, const char* argName, bool required) { Y_ASSERT(longName); TOpt& o = AddLongOption(longName); @@ -23,25 +23,25 @@ namespace NLastGetopt { } return o; } - + TEasySetup& TEasySetup::operator()(char shortName, const char* longName, const char* help, bool required) { AdjustParam(longName, help, nullptr, required).AddShortName(shortName); return *this; - } + } TEasySetup& TEasySetup::operator()(char shortName, const char* longName, const char* argName, const char* help, bool required) { AdjustParam(longName, help, argName, required).AddShortName(shortName); return *this; - } + } TEasySetup& TEasySetup::operator()(const char* longName, const char* help, bool required) { AdjustParam(longName, help, nullptr, required); return *this; - } - + } + TEasySetup& TEasySetup::operator()(const char* longName, const char* argName, const char* help, bool required) { AdjustParam(longName, help, argName, required); return *this; } - -} + +} diff --git a/library/cpp/getopt/small/last_getopt_easy_setup.h b/library/cpp/getopt/small/last_getopt_easy_setup.h index 60dddda225..8baa889a87 100644 --- a/library/cpp/getopt/small/last_getopt_easy_setup.h +++ b/library/cpp/getopt/small/last_getopt_easy_setup.h @@ -1,8 +1,8 @@ -#pragma once - -#include "last_getopt_opts.h" - -namespace NLastGetopt { +#pragma once + +#include "last_getopt_opts.h" + +namespace NLastGetopt { /** * Wrapper for TOpts class to make the life a bit easier. * Usual usage: @@ -21,25 +21,25 @@ namespace NLastGetopt { TEasySetup(const TStringBuf& optstring = TStringBuf()); TEasySetup& operator()(char shortName, const char* longName, const char* help, bool required = false); TEasySetup& operator()(char shortName, const char* longName, const char* argName, const char* help, bool required = false); - + template <class TpFunc> TEasySetup& operator()(char shortName, const char* longName, TpFunc handler, const char* help, bool required = false) { AdjustParam(longName, help, nullptr, handler, required).AddShortName(shortName); return *this; } - + TEasySetup& operator()(const char* longName, const char* help, bool required = false); TEasySetup& operator()(const char* longName, const char* argName, const char* help, bool required = false); - + template <class TpFunc> TEasySetup& operator()(const char* longName, TpFunc handler, const char* help, bool required = false) { AdjustParam(longName, help, nullptr, handler, required); return *this; } - + private: TOpt& AdjustParam(const char* longName, const char* help, const char* argName, bool required); - + template <class TpFunc> TOpt& AdjustParam(const char* longName, const char* help, const char* argName, TpFunc handler, bool required) { TOpt& o = AdjustParam(longName, help, argName, required); @@ -47,5 +47,5 @@ namespace NLastGetopt { return o; } }; - -} + +} diff --git a/library/cpp/getopt/small/last_getopt_handlers.h b/library/cpp/getopt/small/last_getopt_handlers.h index d35456ef34..db6e21ded3 100644 --- a/library/cpp/getopt/small/last_getopt_handlers.h +++ b/library/cpp/getopt/small/last_getopt_handlers.h @@ -1,19 +1,19 @@ -#pragma once - -#include "last_getopt_support.h" - -#include <util/string/split.h> +#pragma once + +#include "last_getopt_support.h" + +#include <util/string/split.h> #include <util/system/compiler.h> - -namespace NLastGetopt { - /// Handler to split option value by delimiter into a target container. + +namespace NLastGetopt { + /// Handler to split option value by delimiter into a target container. template <class Container> - struct TOptSplitHandler; - - /// Handler to split option value by delimiter into a target container and allow ranges. + struct TOptSplitHandler; + + /// Handler to split option value by delimiter into a target container and allow ranges. template <class Container> - struct TOptRangeSplitHandler; - + struct TOptRangeSplitHandler; + /// Handler to parse key-value pairs (default delimiter is '=') and apply user-supplied handler to each pair template <class TpFunc> struct TOptKVHandler; @@ -21,4 +21,4 @@ namespace NLastGetopt { [[noreturn]] void PrintUsageAndExit(const TOptsParser* parser); [[noreturn]] void PrintVersionAndExit(const TOptsParser* parser); [[noreturn]] void PrintShortVersionAndExit(const TString& appName); -} +} diff --git a/library/cpp/getopt/small/last_getopt_opt.cpp b/library/cpp/getopt/small/last_getopt_opt.cpp index 9a99437f4b..7f63053afe 100644 --- a/library/cpp/getopt/small/last_getopt_opt.cpp +++ b/library/cpp/getopt/small/last_getopt_opt.cpp @@ -1,16 +1,16 @@ -#include "last_getopt_opt.h" - -#include <util/stream/format.h> -#include <util/string/escape.h> -#include <util/generic/ylimits.h> -#include <util/generic/utility.h> -#include <util/generic/algorithm.h> -#include <ctype.h> - -namespace NLastGetopt { +#include "last_getopt_opt.h" + +#include <util/stream/format.h> +#include <util/string/escape.h> +#include <util/generic/ylimits.h> +#include <util/generic/utility.h> +#include <util/generic/algorithm.h> +#include <ctype.h> + +namespace NLastGetopt { static const TStringBuf ExcludedShortNameChars = "= -\t\n"; static const TStringBuf ExcludedLongNameChars = "= \t\n"; - + bool TOpt::NameIs(const TString& name) const { for (const auto& next : LongNames_) { if (next == name) @@ -18,7 +18,7 @@ namespace NLastGetopt { } return false; } - + bool TOpt::CharIs(char c) const { for (auto next : Chars_) { if (next == c) @@ -26,31 +26,31 @@ namespace NLastGetopt { } return false; } - + char TOpt::GetChar() const { ; if (Chars_.empty()) ythrow TConfException() << "no char for option " << this->ToShortString(); return Chars_.at(0); - } - + } + char TOpt::GetCharOr0() const { if (Chars_.empty()) return 0; return GetChar(); - } - + } + TString TOpt::GetName() const { ; if (LongNames_.empty()) ythrow TConfException() << "no name for option " << this->ToShortString(); return LongNames_.at(0); } - + bool TOpt::IsAllowedShortName(unsigned char c) { return isprint(c) && TStringBuf::npos == ExcludedShortNameChars.find(c); } - + TOpt& TOpt::AddShortName(unsigned char c) { ; if (!IsAllowedShortName(c)) @@ -58,7 +58,7 @@ namespace NLastGetopt { Chars_.push_back(c); return *this; } - + bool TOpt::IsAllowedLongName(const TString& name, unsigned char* out) { for (size_t i = 0; i != name.size(); ++i) { const unsigned char c = name[i]; @@ -67,10 +67,10 @@ namespace NLastGetopt { *out = c; return false; } - } + } return true; - } - + } + TOpt& TOpt::AddLongName(const TString& name) { ; unsigned char c = 0; @@ -80,13 +80,13 @@ namespace NLastGetopt { LongNames_.push_back(name); return *this; } - + namespace NPrivate { TString OptToString(char c); - + TString OptToString(const TString& longOption); } - + TString TOpt::ToShortString() const { ; if (!LongNames_.empty()) @@ -95,13 +95,13 @@ namespace NLastGetopt { return NPrivate::OptToString(Chars_.front()); return "?"; } - + void TOpt::FireHandlers(const TOptsParser* parser) const { for (const auto& handler : Handlers_) { handler->HandleOpt(parser); } - } - + } + TOpt& TOpt::IfPresentDisableCompletionFor(const TOpt& opt) { if (opt.GetLongNames()) { IfPresentDisableCompletionFor(opt.GetName()); @@ -110,4 +110,4 @@ namespace NLastGetopt { } return *this; } -} +} diff --git a/library/cpp/getopt/small/last_getopt_opt.h b/library/cpp/getopt/small/last_getopt_opt.h index a8dd5adca9..3a39357365 100644 --- a/library/cpp/getopt/small/last_getopt_opt.h +++ b/library/cpp/getopt/small/last_getopt_opt.h @@ -1,25 +1,25 @@ -#pragma once - +#pragma once + #include "completer.h" -#include "last_getopt_handlers.h" - -#include <util/string/split.h> -#include <util/generic/ptr.h> +#include "last_getopt_handlers.h" + +#include <util/string/split.h> +#include <util/generic/ptr.h> #include <util/generic/string.h> -#include <util/generic/maybe.h> -#include <util/generic/vector.h> +#include <util/generic/maybe.h> +#include <util/generic/vector.h> #include <util/string/cast.h> - -#include <stdarg.h> - -namespace NLastGetopt { + +#include <stdarg.h> + +namespace NLastGetopt { enum EHasArg { NO_ARGUMENT, REQUIRED_ARGUMENT, OPTIONAL_ARGUMENT, DEFAULT_HAS_ARG = REQUIRED_ARGUMENT }; - + /** * NLastGetopt::TOpt is a storage of data about exactly one program option. * The data is: parse politics and help information. @@ -44,25 +44,25 @@ namespace NLastGetopt { public: typedef TVector<char> TShortNames; typedef TVector<TString> TLongNames; - + protected: TShortNames Chars_; TLongNames LongNames_; - + private: typedef TMaybe<TString> TdOptVal; typedef TVector<TSimpleSharedPtr<IOptHandler>> TOptHandlers; - + public: bool Hidden_ = false; // is visible in help TString ArgTitle_; // the name of argument in help output TString Help_; // the help string TString CompletionHelp_; // the help string that's used in completion script, a shorter version of Help_ TString CompletionArgHelp_; // the description of argument in completion script - + EHasArg HasArg_ = DEFAULT_HAS_ARG; // the argument parsing politics bool Required_ = false; // option existence politics - + bool AllowMultipleCompletion_ = false; // let the completer know that this option can occur more than once bool DisableCompletionForOptions_ = false; @@ -78,48 +78,48 @@ namespace NLastGetopt { TdOptVal OptionalValue_; TdOptVal DefaultValue_; TOptHandlers Handlers_; - + public: /** * Checks if given char can be a short name * @param c char to check */ static bool IsAllowedShortName(unsigned char c); - + /** * Checks if given string can be a long name * @param name string to check * @param c if given, the first bad charecter will be saved in c */ static bool IsAllowedLongName(const TString& name, unsigned char* c = nullptr); - + /** * @return one of the expected representations of the option. * If the option has short names, will return "-<char>" * Otherwise will return "--<long name>" */ TString ToShortString() const; - + /** * check if given string is one of the long names * * @param name string to check */ bool NameIs(const TString& name) const; - + /** * check if given char is one of the short names * * @param c char to check */ bool CharIs(char c) const; - + /** * If string has long names - will return one of them * Otherwise will throw */ TString GetName() const; - + /** * adds short alias for the option * @@ -128,14 +128,14 @@ namespace NLastGetopt { * @return self */ TOpt& AddShortName(unsigned char c); - + /** * return all short names of the option */ const TShortNames& GetShortNames() const { return Chars_; } - + /** * adds long alias for the option * @@ -144,31 +144,31 @@ namespace NLastGetopt { * @return self */ TOpt& AddLongName(const TString& name); - + /** * return all long names of the option */ const TLongNames& GetLongNames() const { return LongNames_; } - + /** * @return one of short names of the opt. If there is no short names exception is raised. */ char GetChar() const; - + /** * @return one of short names of the opt. If there is no short names '\0' returned. */ char GetCharOr0() const; - + /** * @returns argument parsing politics */ const EHasArg& GetHasArg() const { return HasArg_; } - + /** * sets argument parsing politics * @@ -181,14 +181,14 @@ namespace NLastGetopt { HasArg_ = hasArg; return *this; } - + /** * @returns argument title */ TString GetArgTitle() const { return ArgTitle_; } - + /** * sets argument parsing politics into REQUIRED_ARGUMENT * @@ -199,7 +199,7 @@ namespace NLastGetopt { ArgTitle_ = title; return HasArg(REQUIRED_ARGUMENT); } - + /** * sets argument parsing politics into NO_ARGUMENT * @@ -208,7 +208,7 @@ namespace NLastGetopt { TOpt& NoArgument() { return HasArg(NO_ARGUMENT); } - + /** * sets argument parsing politics into OPTIONAL_ARGUMENT * for details see NLastGetopt::TOpt @@ -220,7 +220,7 @@ namespace NLastGetopt { ArgTitle_ = title; return HasArg(OPTIONAL_ARGUMENT); } - + /** * sets argument parsing politics into OPTIONAL_ARGUMENT * sets the <optional value> into given @@ -235,14 +235,14 @@ namespace NLastGetopt { OptionalValue_ = val; return OptionalArgument(title); } - + /** * checks if "argument parsing politics" is OPTIONAL_ARGUMENT and the <optional value> is set. */ bool HasOptionalValue() const { return OPTIONAL_ARGUMENT == HasArg_ && OptionalValue_; } - + /** * @return optional value * throws exception if optional value wasn't set @@ -250,7 +250,7 @@ namespace NLastGetopt { const TString& GetOptionalValue() const { return *OptionalValue_; } - + /** * sets <default value> * @return self @@ -260,14 +260,14 @@ namespace NLastGetopt { DefaultValue_ = ToString(val); return *this; } - + /** * checks if default value is set. */ bool HasDefaultValue() const { return DefaultValue_.Defined(); } - + /** * @return default value * throws exception if <default value> wasn't set @@ -275,7 +275,7 @@ namespace NLastGetopt { const TString& GetDefaultValue() const { return *DefaultValue_; } - + /** * sets the option to be required * @return self @@ -284,7 +284,7 @@ namespace NLastGetopt { Required_ = true; return *this; } - + /** * sets the option to be optional * @return self @@ -293,14 +293,14 @@ namespace NLastGetopt { Required_ = false; return *this; } - + /** * @return true if the option is required */ bool IsRequired() const { return Required_; } - + /** * sets the option to be hidden (invisible in help) * @return self @@ -309,14 +309,14 @@ namespace NLastGetopt { Hidden_ = true; return *this; } - + /** * @return true if the option is hidden */ bool IsHidden() const { return Hidden_; } - + /** * sets the <user value> * @return self @@ -326,14 +326,14 @@ namespace NLastGetopt { UserValue_ = userval; return *this; } - + /** * @return user value */ const void* UserValue() const { return UserValue_; } - + /** * Set help string that appears with `--help`. Unless `CompletionHelp` is given, this message will also be used * in completion script. In this case, don't make it too long, don't start it with a capital letter and don't @@ -371,14 +371,14 @@ namespace NLastGetopt { Help_ = help; return *this; } - + /** * Get help string. */ const TString& GetHelp() const { return Help_; } - + /** * Set help string that appears when argument completer lists available options. * @@ -546,19 +546,19 @@ namespace NLastGetopt { * Run handlers for this option. */ void FireHandlers(const TOptsParser* parser) const; - + private: TOpt& HandlerImpl(IOptHandler* handler) { Handlers_.push_back(handler); return *this; } - + public: template <typename TpFunc> TOpt& Handler0(TpFunc func) { // functor taking no parameters return HandlerImpl(new NPrivate::THandlerFunctor0<TpFunc>(func)); } - + template <typename TpFunc> TOpt& Handler1(TpFunc func) { // functor taking one parameter return HandlerImpl(new NPrivate::THandlerFunctor1<TpFunc>(func)); @@ -575,35 +575,35 @@ namespace NLastGetopt { TOpt& Handler1T2(const TpArg2& def, TpFunc func) { return HandlerImpl(new NPrivate::THandlerFunctor1<TpFunc, TpArg>(func, def)); } - + TOpt& Handler(void (*f)()) { return Handler0(f); } TOpt& Handler(void (*f)(const TOptsParser*)) { return Handler1(f); } - + TOpt& Handler(TAutoPtr<IOptHandler> handler) { return HandlerImpl(handler.Release()); } - + template <typename T> // T extends IOptHandler TOpt& Handler(TAutoPtr<T> handler) { return HandlerImpl(handler.Release()); } - + // Stores FromString<T>(arg) in *target // T maybe anything with FromString<T>(const TStringBuf&) defined template <typename TpVal, typename T> TOpt& StoreResultT(T* target) { return Handler1T<TpVal>(NPrivate::TStoreResultFunctor<T, TpVal>(target)); } - + template <typename T> TOpt& StoreResult(T* target) { return StoreResultT<T>(target); } - + // Uses TMaybe<T> to store FromString<T>(arg) template <typename T> TOpt& StoreResult(TMaybe<T>* target) { @@ -614,12 +614,12 @@ namespace NLastGetopt { TOpt& StoreResultT(T* target, const TpDef& def) { return Handler1T<TpVal>(def, NPrivate::TStoreResultFunctor<T, TpVal>(target)); } - + template <typename T, typename TpDef> TOpt& StoreResult(T* target, const TpDef& def) { return StoreResultT<T>(target, def); } - + template <typename T> TOpt& StoreResultDef(T* target) { DefaultValue_ = ToString(*target); @@ -636,7 +636,7 @@ namespace NLastGetopt { TOpt& SetFlag(bool* target) { return DefaultValue("0").StoreResult(target, true); } - + // Similar to store_true in Python's argparse TOpt& StoreTrue(bool* target) { return NoArgument().SetFlag(target); @@ -646,12 +646,12 @@ namespace NLastGetopt { TOpt& StoreMappedResultT(T* target, const TpFunc& func) { return Handler1T<TpVal>(NPrivate::TStoreMappedResultFunctor<T, TpFunc, TpVal>(target, func)); } - + template <typename T, typename TpFunc> TOpt& StoreMappedResult(T* target, const TpFunc& func) { return StoreMappedResultT<T>(target, func); } - + // Stores given value in *target if the option is present. // TValue must be a copyable type, constructible from TParam. // T must be a copyable type, assignable from TValue. @@ -659,25 +659,25 @@ namespace NLastGetopt { TOpt& StoreValueT(T* target, const TParam& value) { return Handler1(NPrivate::TStoreValueFunctor<T, TValue>(target, value)); } - + // save value as target type template <typename T, typename TParam> TOpt& StoreValue(T* target, const TParam& value) { return StoreValueT<T>(target, value); } - + // save value as its original type (2nd template parameter) template <typename T, typename TValue> TOpt& StoreValue2(T* target, const TValue& value) { return StoreValueT<TValue>(target, value); } - + // Appends FromString<T>(arg) to *target for each argument template <typename T> TOpt& AppendTo(TVector<T>* target) { return Handler1T<T>([target](auto&& value) { target->push_back(std::move(value)); }); } - + // Appends FromString<T>(arg) to *target for each argument template <typename T> TOpt& InsertTo(THashSet<T>* target) { @@ -694,7 +694,7 @@ namespace NLastGetopt { TOpt& SplitHandler(Container* target, const char delim) { return Handler(new NLastGetopt::TOptSplitHandler<Container>(target, delim)); } - + template <class Container> TOpt& RangeSplitHandler(Container* target, const char elementsDelim, const char rangesDelim) { return Handler(new NLastGetopt::TOptRangeSplitHandler<Container>(target, elementsDelim, rangesDelim)); @@ -705,7 +705,7 @@ namespace NLastGetopt { return Handler(new NLastGetopt::TOptKVHandler<TpFunc>(func, kvdelim)); } }; - + /** * NLastGetopt::TFreeArgSpec is a storage of data about free argument. * The data is help information and (maybe) linked named argument. @@ -722,7 +722,7 @@ namespace NLastGetopt { , Optional_(optional) { } - + TString Title_; TString Help_; TString CompletionArgHelp_; diff --git a/library/cpp/getopt/small/last_getopt_opts.cpp b/library/cpp/getopt/small/last_getopt_opts.cpp index 03c432849f..7122bba10a 100644 --- a/library/cpp/getopt/small/last_getopt_opts.cpp +++ b/library/cpp/getopt/small/last_getopt_opts.cpp @@ -1,36 +1,36 @@ #include "completer_command.h" -#include "last_getopt_opts.h" +#include "last_getopt_opts.h" #include "wrap.h" #include "last_getopt_parser.h" - + #include <library/cpp/colorizer/colors.h> -#include <util/stream/format.h> +#include <util/stream/format.h> #include <util/charset/utf8.h> -#include <stdlib.h> - -namespace NLastGetoptPrivate { +#include <stdlib.h> + +namespace NLastGetoptPrivate { TString& VersionString() { static TString data; - return data; - } + return data; + } TString& ShortVersionString() { static TString data; return data; } } - + namespace NLastGetopt { static const TStringBuf SPad = " "; - + void PrintVersionAndExit(const TOptsParser*) { - Cout << (NLastGetoptPrivate::VersionString() ? NLastGetoptPrivate::VersionString() : "program version: not linked with library/cpp/getopt") << Endl; + Cout << (NLastGetoptPrivate::VersionString() ? NLastGetoptPrivate::VersionString() : "program version: not linked with library/cpp/getopt") << Endl; exit(NLastGetoptPrivate::VersionString().empty()); } - + void PrintShortVersionAndExit(const TString& appName) { - Cout << appName << " version " << (NLastGetoptPrivate::ShortVersionString() ? NLastGetoptPrivate::ShortVersionString() : "not linked with library/cpp/getopt") << Endl; + Cout << appName << " version " << (NLastGetoptPrivate::ShortVersionString() ? NLastGetoptPrivate::ShortVersionString() : "not linked with library/cpp/getopt") << Endl; exit(NLastGetoptPrivate::ShortVersionString().empty()); } @@ -44,24 +44,24 @@ namespace NLastGetopt { } return str; } - + namespace NPrivate { TString OptToString(char c) { TStringStream ss; ss << "-" << c; return ss.Str(); } - + TString OptToString(const TString& longOption) { TStringStream ss; ss << "--" << longOption; return ss.Str(); } - + TString OptToString(const TOpt* opt) { return opt->ToShortString(); } - } + } TOpts::TOpts(const TStringBuf& optstring) : ArgPermutation_(DEFAULT_ARG_PERMUTATION) @@ -76,8 +76,8 @@ namespace NLastGetopt { AddCharOptions(optstring); } AddVersionOption(0); - } - + } + void TOpts::AddCharOptions(const TStringBuf& optstring) { size_t p = 0; if (optstring[p] == '+') { @@ -102,8 +102,8 @@ namespace NLastGetopt { } AddCharOption(c, ha); } - } - + } + const TOpt* TOpts::FindLongOption(const TStringBuf& name) const { for (const auto& Opt : Opts_) { const TOpt* opt = Opt.Get(); @@ -111,8 +111,8 @@ namespace NLastGetopt { return opt; } return nullptr; - } - + } + TOpt* TOpts::FindLongOption(const TStringBuf& name) { for (auto& Opt : Opts_) { TOpt* opt = Opt.Get(); @@ -120,8 +120,8 @@ namespace NLastGetopt { return opt; } return nullptr; - } - + } + const TOpt* TOpts::FindCharOption(char c) const { for (const auto& Opt : Opts_) { const TOpt* opt = Opt.Get(); @@ -129,45 +129,45 @@ namespace NLastGetopt { return opt; } return nullptr; - } - + } + TOpt* TOpts::FindCharOption(char c) { for (auto& Opt : Opts_) { TOpt* opt = Opt.Get(); if (IsIn(opt->GetShortNames(), c)) return opt; - } + } return nullptr; - } - + } + const TOpt& TOpts::GetCharOption(char c) const { const TOpt* option = FindCharOption(c); if (!option) ythrow TException() << "unknown char option '" << c << "'"; return *option; - } - + } + TOpt& TOpts::GetCharOption(char c) { TOpt* option = FindCharOption(c); if (!option) ythrow TException() << "unknown char option '" << c << "'"; return *option; - } - + } + const TOpt& TOpts::GetLongOption(const TStringBuf& name) const { const TOpt* option = FindLongOption(name); if (!option) ythrow TException() << "unknown option " << name; return *option; - } - + } + TOpt& TOpts::GetLongOption(const TStringBuf& name) { TOpt* option = FindLongOption(name); if (!option) ythrow TException() << "unknown option " << name; return *option; - } - + } + bool TOpts::HasAnyShortOption() const { for (const auto& Opt : Opts_) { const TOpt* opt = Opt.Get(); @@ -175,8 +175,8 @@ namespace NLastGetopt { return true; } return false; - } - + } + bool TOpts::HasAnyLongOption() const { for (const auto& Opt : Opts_) { TOpt* opt = Opt.Get(); @@ -184,8 +184,8 @@ namespace NLastGetopt { return true; } return false; - } - + } + void TOpts::Validate() const { for (TOptsVector::const_iterator i = Opts_.begin(); i != Opts_.end(); ++i) { TOpt* opt = i->Get(); @@ -198,7 +198,7 @@ namespace NLastGetopt { << NPrivate::OptToString(c) << " is defined more than once"; } - } + } const TOpt::TLongNames& longNames = opt->GetLongNames(); for (const auto& longName : longNames) { for (TOptsVector::const_iterator j = i + 1; j != Opts_.end(); ++j) { @@ -208,22 +208,22 @@ namespace NLastGetopt { << NPrivate::OptToString(longName) << " is defined more than once"; } - } - } + } + } if (FreeArgsMax_ < FreeArgsMin_) { ythrow TConfException() << "FreeArgsMax must be >= FreeArgsMin"; } if (!FreeArgSpecs_.empty() && FreeArgSpecs_.rbegin()->first >= FreeArgsMax_) { ythrow TConfException() << "Described args count is greater than FreeArgsMax. Either increase FreeArgsMax or remove unreachable descriptions"; } - } + } TOpt& TOpts::AddOption(const TOpt& option) { if (option.GetShortNames().empty() && option.GetLongNames().empty()) ythrow TConfException() << "bad option: no chars, no long names"; Opts_.push_back(new TOpt(option)); return *Opts_.back(); - } + } TOpt& TOpts::AddCompletionOption(TString command, TString longName) { if (TOpt* o = FindLongOption(longName)) { @@ -257,28 +257,28 @@ namespace NLastGetopt { if (it == Opts_.end()) ythrow TException() << "unknown option"; return it - Opts_.begin(); - } - + } + TStringBuf TOpts::GetFreeArgTitle(size_t pos) const { if (FreeArgSpecs_.contains(pos)) { return FreeArgSpecs_.at(pos).GetTitle(DefaultFreeArgTitle_); } return DefaultFreeArgTitle_; } - + void TOpts::SetFreeArgTitle(size_t pos, const TString& title, const TString& help, bool optional) { FreeArgSpecs_[pos] = TFreeArgSpec(title, help, optional); - } - + } + TFreeArgSpec& TOpts::GetFreeArgSpec(size_t pos) { return FreeArgSpecs_[pos]; - } - + } + static TString FormatOption(const TOpt* option, const NColorizer::TColors& colors) { TStringStream result; const TOpt::TShortNames& shorts = option->GetShortNames(); const TOpt::TLongNames& longs = option->GetLongNames(); - + const size_t nopts = shorts.size() + longs.size(); const bool multiple = 1 < nopts; if (multiple) @@ -286,7 +286,7 @@ namespace NLastGetopt { for (size_t i = 0; i < nopts; ++i) { if (multiple && 0 != i) result << '|'; - + if (i < shorts.size()) // short result << colors.GreenColor() << '-' << shorts[i] << colors.OldColor(); else @@ -294,11 +294,11 @@ namespace NLastGetopt { } if (multiple) result << '}'; - + static const TString metavarDef("VAL"); const TString& title = option->GetArgTitle(); const TString& metavar = title.empty() ? metavarDef : title; - + if (option->GetHasArg() == OPTIONAL_ARGUMENT) { result << " [" << metavar; if (option->HasOptionalValue()) @@ -306,12 +306,12 @@ namespace NLastGetopt { result << ']'; } else if (option->GetHasArg() == REQUIRED_ARGUMENT) result << ' ' << metavar; - else + else Y_ASSERT(option->GetHasArg() == NO_ARGUMENT); - + return result.Str(); - } - + } + void TOpts::PrintCmdLine(const TStringBuf& program, IOutputStream& os, const NColorizer::TColors& colors) const { os << colors.BoldColor() << "Usage" << colors.OldColor() << ": "; if (CustomUsage) { @@ -322,12 +322,12 @@ namespace NLastGetopt { if (CustomCmdLineDescr) { os << CustomCmdLineDescr << Endl; return; - } + } os << "[OPTIONS]"; - + ui32 numDescribedFlags = FreeArgSpecs_.empty() ? 0 : FreeArgSpecs_.rbegin()->first + 1; ui32 numArgsToShow = Max(FreeArgsMin_, FreeArgsMax_ == UNLIMITED_ARGS ? numDescribedFlags : FreeArgsMax_); - + for (ui32 i = 0, nonOptionalFlagsPrinted = 0; i < numArgsToShow; ++i) { bool isOptional = nonOptionalFlagsPrinted >= FreeArgsMin_ || FreeArgSpecs_.Value(i, TFreeArgSpec()).Optional_; @@ -350,26 +350,26 @@ namespace NLastGetopt { os << Endl; } - + void TOpts::PrintUsage(const TStringBuf& program, IOutputStream& osIn, const NColorizer::TColors& colors) const { TStringStream os; - + if (!Title.empty()) os << Title << "\n\n"; - + PrintCmdLine(program, os, colors); - + TVector<TString> leftColumn(Opts_.size()); TVector<size_t> leftColumnSizes(leftColumn.size()); const size_t kMaxLeftWidth = 25; size_t leftWidth = 0; size_t requiredOptionsCount = 0; NColorizer::TColors disabledColors(false); - - for (size_t i = 0; i < Opts_.size(); i++) { - const TOpt* opt = Opts_[i].Get(); - if (opt->IsHidden()) - continue; + + for (size_t i = 0; i < Opts_.size(); i++) { + const TOpt* opt = Opts_[i].Get(); + if (opt->IsHidden()) + continue; leftColumn[i] = FormatOption(opt, colors); size_t leftColumnSize = leftColumn[i].size(); if (colors.IsTTY()) { @@ -382,7 +382,7 @@ namespace NLastGetopt { if (opt->IsRequired()) requiredOptionsCount++; } - + const TString leftPadding(leftWidth, ' '); for (size_t sectionId = 0; sectionId <= 1; sectionId++) { @@ -400,7 +400,7 @@ namespace NLastGetopt { else os << Endl << colors.BoldColor() << "Optional parameters" << colors.OldColor() << ":" << Endl; // optional options would be a tautology } - + for (size_t i = 0; i < Opts_.size(); i++) { const TOpt* opt = Opts_[i].Get(); @@ -415,8 +415,8 @@ namespace NLastGetopt { os << SPad << leftColumn[i] << ' '; if (leftColumnSizes[i] < leftWidth) os << TStringBuf(leftPadding.data(), leftWidth - leftColumnSizes[i]); - } - + } + TStringBuf help = opt->GetHelp(); while (help && isspace(help.back())) { help.Chop(1); @@ -452,8 +452,8 @@ namespace NLastGetopt { if (helpHasParagraphs) { os << Endl; } - } - } + } + } PrintFreeArgsDesc(os, colors); @@ -464,8 +464,8 @@ namespace NLastGetopt { } osIn << os.Str(); - } - + } + void TOpts::PrintUsage(const TStringBuf& program, IOutputStream& os) const { PrintUsage(program, os, NColorizer::AutoColors(os)); } @@ -473,19 +473,19 @@ namespace NLastGetopt { void TOpts::PrintFreeArgsDesc(IOutputStream& os, const NColorizer::TColors& colors) const { if (0 == FreeArgsMax_) return; - + size_t leftFreeWidth = 0; for (size_t i = 0; i < FreeArgSpecs_.size(); ++i) { leftFreeWidth = Max(leftFreeWidth, GetFreeArgTitle(i).size()); } - + if (!TrailingArgSpec_.IsDefault()) { leftFreeWidth = Max(leftFreeWidth, TrailingArgSpec_.GetTitle(DefaultFreeArgTitle_).size()); } - + leftFreeWidth = Min(leftFreeWidth, size_t(30)); os << Endl << colors.BoldColor() << "Free args" << colors.OldColor() << ":"; - + os << " min: " << colors.GreenColor() << FreeArgsMin_ << colors.OldColor() << ","; os << " max: " << colors.GreenColor(); if (FreeArgsMax_ != UNLIMITED_ARGS) { @@ -494,20 +494,20 @@ namespace NLastGetopt { os << "unlimited"; } os << colors.OldColor() << Endl; - + const size_t limit = FreeArgSpecs_.empty() ? 0 : FreeArgSpecs_.rbegin()->first; for (size_t i = 0; i <= limit; ++i) { if (!FreeArgSpecs_.contains(i)) { continue; } - + if (auto help = FreeArgSpecs_.at(i).GetHelp()) { auto title = GetFreeArgTitle(i); os << SPad << colors.GreenColor() << RightPad(title, leftFreeWidth, ' ') << colors.OldColor() << SPad << help << Endl; } } - + if (FreeArgsMax_ == UNLIMITED_ARGS) { auto title = TrailingArgSpec_.GetTitle(DefaultFreeArgTitle_); if (auto help = TrailingArgSpec_.GetHelp()) { @@ -515,5 +515,5 @@ namespace NLastGetopt { << SPad << help << Endl; } } - } -} + } +} diff --git a/library/cpp/getopt/small/last_getopt_opts.h b/library/cpp/getopt/small/last_getopt_opts.h index 825b99c871..be6978ed4d 100644 --- a/library/cpp/getopt/small/last_getopt_opts.h +++ b/library/cpp/getopt/small/last_getopt_opts.h @@ -1,19 +1,19 @@ -#pragma once - -#include "last_getopt_opt.h" - +#pragma once + +#include "last_getopt_opt.h" + #include <library/cpp/colorizer/fwd.h> -#include <util/generic/map.h> - -namespace NLastGetopt { +#include <util/generic/map.h> + +namespace NLastGetopt { enum EArgPermutation { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER, DEFAULT_ARG_PERMUTATION = PERMUTE }; - + /** * NLastGetopt::TOpts is a storage of program options' parse rules. * It contains information about all options, free args, some parsing options @@ -37,36 +37,36 @@ namespace NLastGetopt { class TOpts { friend class TOptsParseResult; friend class TOptsParser; - + public: static constexpr const ui32 UNLIMITED_ARGS = Max<ui32>(); typedef TVector<TSimpleSharedPtr<TOpt>> TOptsVector; TOptsVector Opts_; // infomation about named (short and long) options TVector<std::function<void(TStringBuf)>> ArgBindings_; - + EArgPermutation ArgPermutation_ = DEFAULT_ARG_PERMUTATION; // determines how to parse positions of named and free options. See information below. bool AllowSingleDashForLong_ = false; // bool AllowPlusForLong_ = false; // using '+' instead '--' for long options - + //Allows unknwon options: bool AllowUnknownCharOptions_ = false; bool AllowUnknownLongOptions_ = false; - + ui32 Wrap_ = 80; private: ui32 FreeArgsMin_; // minimal number of free args ui32 FreeArgsMax_; // maximal number of free args - + TMap<ui32, TFreeArgSpec> FreeArgSpecs_; // mapping [free arg position] -> [free arg specification] TFreeArgSpec TrailingArgSpec_; // spec for the trailing argument (when arguments are unlimited) TString DefaultFreeArgTitle_ = "ARG"; // title that's used for free args without a title - + TString Title; // title of the help string TString CustomCmdLineDescr; // user defined help string TString CustomUsage; // user defined usage string - + TVector<std::pair<TString, TString>> Sections; // additional help entries to print after usage public: @@ -74,7 +74,7 @@ namespace NLastGetopt { * Constructs TOpts from string as in getopt(3) */ TOpts(const TStringBuf& optstring = TStringBuf()); - + /** * Constructs TOpts from string as in getopt(3) and * additionally adds help option (for '?') and svn-verstion option (for 'V') @@ -85,7 +85,7 @@ namespace NLastGetopt { opts.AddVersionOption(); return opts; } - + /** * Checks correctness of options' descriptions. * Throws TConfException if validation failed. @@ -94,35 +94,35 @@ namespace NLastGetopt { * -compability of settings, that responsable for freeArgs parsing */ void Validate() const; - + /** * Search for the option with given long name * @param name long name for search * @return ptr on result (nullptr if not found) */ const TOpt* FindLongOption(const TStringBuf& name) const; - + /** * Search for the option with given short name * @param c short name for search * @return ptr on result (nullptr if not found) */ const TOpt* FindCharOption(char c) const; - + /** * Search for the option with given long name * @param name long name for search * @return ptr on result (nullptr if not found) */ TOpt* FindLongOption(const TStringBuf& name); - + /** * Search for the option with given short name * @param c short name for search * @return ptr on result (nullptr if not found) */ TOpt* FindCharOption(char c); - + /** * Search for the option with given name * @param name name for search @@ -155,7 +155,7 @@ namespace NLastGetopt { void SetTitle(const TString& title) { Title = title; } - + /** * @return true if there is an option with given long name * @@ -164,7 +164,7 @@ namespace NLastGetopt { bool HasLongOption(const TString& name) const { return FindLongOption(name) != nullptr; } - + /** * @return true if there is an option with given short name * @@ -173,35 +173,35 @@ namespace NLastGetopt { bool HasCharOption(char c) const { return FindCharOption(c) != nullptr; } - + /** * Search for the option with given long name * @param name long name for search * @return ref on result (throw exception if not found) */ const TOpt& GetLongOption(const TStringBuf& name) const; - + /** * Search for the option with given long name * @param name long name for search * @return ref on result (throw exception if not found) */ TOpt& GetLongOption(const TStringBuf& name); - + /** * Search for the option with given short name * @param c short name for search * @return ref on result (throw exception if not found) */ const TOpt& GetCharOption(char c) const; - + /** * Search for the option with given short name * @param c short name for search * @return ref on result (throw exception if not found) */ TOpt& GetCharOption(char c); - + /** * Search for the option with given name * @param name name for search @@ -231,19 +231,19 @@ namespace NLastGetopt { * @return true if short options exist */ bool HasAnyShortOption() const; - + /** * @return true if long options exist */ bool HasAnyLongOption() const; - + /** * Creates new [option description (TOpt)] as a copy of given one * @param option source * @return reference for created option */ TOpt& AddOption(const TOpt& option); - + /** * Creates new free argument handling * @param name name of free arg to show in help @@ -266,7 +266,7 @@ namespace NLastGetopt { * @param optstring source */ void AddCharOptions(const TStringBuf& optstring); - + /** * Creates new [option description (TOpt)] with given short name and given help string * @@ -277,7 +277,7 @@ namespace NLastGetopt { TOpt& AddCharOption(char c, const TString& help = "") { return AddCharOption(c, DEFAULT_HAS_ARG, help); } - + /** * Creates new [option description (TOpt)] with given short name and given help string * @@ -292,7 +292,7 @@ namespace NLastGetopt { option.HasArg(hasArg); return AddOption(option); } - + /** * Creates new [option description (TOpt)] with given long name and given help string * @@ -303,7 +303,7 @@ namespace NLastGetopt { TOpt& AddLongOption(const TString& name, const TString& help = "") { return AddLongOption(0, name, help); } - + /** * Creates new [option description (TOpt)] with given long and short names and given help string * @@ -320,7 +320,7 @@ namespace NLastGetopt { option.Help(help); return AddOption(option); } - + /** * Creates new [option description (TOpt)] for help printing, * adds appropriate handler for it @@ -338,8 +338,8 @@ namespace NLastGetopt { .HasArg(NO_ARGUMENT) .IfPresentDisableCompletion() .Handler(&PrintUsageAndExit); - } - + } + /** * Creates new [option description (TOpt)] for svn-revision printing, * adds appropriate handler for it. @@ -357,8 +357,8 @@ namespace NLastGetopt { .HasArg(NO_ARGUMENT) .IfPresentDisableCompletion() .Handler(&PrintVersionAndExit); - } - + } + /** * Creates new option for generating completion shell scripts. * @@ -379,8 +379,8 @@ namespace NLastGetopt { AddCharOption(c); return const_cast<TOpt&>(GetCharOption(c)); } - } - + } + /** * Indicate that some options can't appear together. * @@ -405,7 +405,7 @@ namespace NLastGetopt { * @param opt pointer of option to search */ size_t IndexOf(const TOpt* opt) const; - + /** * Replace help string with given * @@ -414,7 +414,7 @@ namespace NLastGetopt { void SetCmdLineDescr(const TString& descr) { CustomCmdLineDescr = descr; } - + /** * Replace usage string with given * @@ -448,7 +448,7 @@ namespace NLastGetopt { void SetFreeArgsMin(size_t min) { FreeArgsMin_ = ui32(min); } - + /** * Get current minimal number of free args @@ -466,7 +466,7 @@ namespace NLastGetopt { FreeArgsMax_ = ui32(max); FreeArgsMax_ = Max<ui32>(FreeArgsMax_, ArgBindings_.size()); } - + /** * Get current maximal number of free args */ @@ -490,7 +490,7 @@ namespace NLastGetopt { FreeArgsMin_ = ui32(count); FreeArgsMax_ = ui32(count); } - + /** * Set minimal and maximal number of free args * @@ -501,7 +501,7 @@ namespace NLastGetopt { FreeArgsMin_ = ui32(min); FreeArgsMax_ = ui32(max); } - + /** * Set title and help string of free argument * @@ -512,7 +512,7 @@ namespace NLastGetopt { * does not affect actual flags parsing */ void SetFreeArgTitle(size_t pos, const TString& title, const TString& help = TString(), bool optional = false); - + /** * Get free argument's spec for further modification. */ @@ -555,7 +555,7 @@ namespace NLastGetopt { TrailingArgSpec_.Help(std::move(help)); } /// @} - + /** * Get spec for the trailing argument. * @@ -578,7 +578,7 @@ namespace NLastGetopt { void SetAllowSingleDashForLong(bool value) { AllowSingleDashForLong_ = value; } - + /** * Wrap help text at this number of characters. 0 to disable wrapping. */ @@ -613,7 +613,7 @@ namespace NLastGetopt { } return ret; } - + private: /** * @return argument title of a free argument @@ -621,7 +621,7 @@ namespace NLastGetopt { * @param pos position of the argument */ TStringBuf GetFreeArgTitle(size_t pos) const; - + /** * Print usage helper * @@ -630,7 +630,7 @@ namespace NLastGetopt { * @param colors colorizer */ void PrintCmdLine(const TStringBuf& program, IOutputStream& os, const NColorizer::TColors& colors) const; - + /** * Print usage helper * @@ -639,5 +639,5 @@ namespace NLastGetopt { */ void PrintFreeArgsDesc(IOutputStream& os, const NColorizer::TColors& colors) const; }; - + } diff --git a/library/cpp/getopt/small/last_getopt_parse_result.cpp b/library/cpp/getopt/small/last_getopt_parse_result.cpp index f4b5607a90..423e035bc5 100644 --- a/library/cpp/getopt/small/last_getopt_parse_result.cpp +++ b/library/cpp/getopt/small/last_getopt_parse_result.cpp @@ -1,6 +1,6 @@ -#include "last_getopt_parse_result.h" - -namespace NLastGetopt { +#include "last_getopt_parse_result.h" + +namespace NLastGetopt { const TOptParseResult* TOptsParseResult::FindParseResult(const TdVec& vec, const TOpt* opt) { for (const auto& r : vec) { if (r.OptPtr() == opt) @@ -8,35 +8,35 @@ namespace NLastGetopt { } return nullptr; } - + const TOptParseResult* TOptsParseResult::FindOptParseResult(const TOpt* opt, bool includeDefault) const { const TOptParseResult* r = FindParseResult(Opts_, opt); if (nullptr == r && includeDefault) r = FindParseResult(OptsDef_, opt); return r; - } - + } + const TOptParseResult* TOptsParseResult::FindLongOptParseResult(const TString& name, bool includeDefault) const { return FindOptParseResult(&Parser_->Opts_->GetLongOption(name), includeDefault); } - + const TOptParseResult* TOptsParseResult::FindCharOptParseResult(char c, bool includeDefault) const { return FindOptParseResult(&Parser_->Opts_->GetCharOption(c), includeDefault); } - + bool TOptsParseResult::Has(const TOpt* opt, bool includeDefault) const { Y_ASSERT(opt); return FindOptParseResult(opt, includeDefault) != nullptr; } - + bool TOptsParseResult::Has(const TString& name, bool includeDefault) const { return FindLongOptParseResult(name, includeDefault) != nullptr; } - + bool TOptsParseResult::Has(char c, bool includeDefault) const { return FindCharOptParseResult(c, includeDefault) != nullptr; } - + const char* TOptsParseResult::Get(const TOpt* opt, bool includeDefault) const { Y_ASSERT(opt); const TOptParseResult* r = FindOptParseResult(opt, includeDefault); @@ -52,7 +52,7 @@ namespace NLastGetopt { return r->Back(); } } - + const char* TOptsParseResult::GetOrElse(const TOpt* opt, const char* defaultValue) const { Y_ASSERT(opt); const TOptParseResult* r = FindOptParseResult(opt); @@ -60,29 +60,29 @@ namespace NLastGetopt { return defaultValue; } else { return r->Back(); - } - } - + } + } + const char* TOptsParseResult::Get(const TString& name, bool includeDefault) const { return Get(&Parser_->Opts_->GetLongOption(name), includeDefault); - } - + } + const char* TOptsParseResult::Get(char c, bool includeDefault) const { return Get(&Parser_->Opts_->GetCharOption(c), includeDefault); } - + const char* TOptsParseResult::GetOrElse(const TString& name, const char* defaultValue) const { if (!Has(name)) return defaultValue; return Get(name); } - + const char* TOptsParseResult::GetOrElse(char c, const char* defaultValue) const { if (!Has(c)) return defaultValue; return Get(c); } - + TOptParseResult& TOptsParseResult::OptParseResult() { const TOpt* opt = Parser_->CurOpt(); Y_ASSERT(opt); @@ -94,11 +94,11 @@ namespace NLastGetopt { opts.push_back(TOptParseResult(opt)); return opts.back(); } - + TString TOptsParseResult::GetProgramName() const { return Parser_->ProgramName_; } - + void TOptsParseResult::PrintUsage(IOutputStream& os) const { Parser_->Opts_->PrintUsage(Parser_->ProgramName_, os); } @@ -106,7 +106,7 @@ namespace NLastGetopt { size_t TOptsParseResult::GetFreeArgsPos() const { return Parser_->Pos_; } - + TVector<TString> TOptsParseResult::GetFreeArgs() const { TVector<TString> v; for (size_t i = GetFreeArgsPos(); i < Parser_->Argc_; ++i) { @@ -114,11 +114,11 @@ namespace NLastGetopt { } return v; } - + size_t TOptsParseResult::GetFreeArgCount() const { return Parser_->Argc_ - GetFreeArgsPos(); - } - + } + void TOptsParseResult::Init(const TOpts* options, int argc, const char** argv) { try { Parser_.Reset(new TOptsParser(options, argc, argv)); @@ -138,9 +138,9 @@ namespace NLastGetopt { } } catch (...) { HandleError(); - } - } - + } + } + void TOptsParseResult::HandleError() const { Cerr << CurrentExceptionMessage() << Endl; if (Parser_.Get()) { // parser initializing can fail (and we get here, see Init) @@ -149,12 +149,12 @@ namespace NLastGetopt { } else { PrintUsage(); } - } + } exit(1); - } - + } + void TOptsParseResultException::HandleError() const { throw; } - -} + +} diff --git a/library/cpp/getopt/small/last_getopt_parse_result.h b/library/cpp/getopt/small/last_getopt_parse_result.h index 1ab6f598c9..e55a1a1eec 100644 --- a/library/cpp/getopt/small/last_getopt_parse_result.h +++ b/library/cpp/getopt/small/last_getopt_parse_result.h @@ -1,9 +1,9 @@ -#pragma once - -#include "last_getopt_opts.h" +#pragma once + +#include "last_getopt_opts.h" #include "last_getopt_parser.h" - -namespace NLastGetopt { + +namespace NLastGetopt { /** * NLastGetopt::TOptParseResult contains all arguments for exactly one TOpt, * that have been fetched during parsing @@ -13,13 +13,13 @@ namespace NLastGetopt { class TOptParseResult { public: typedef TVector<const char*> TValues; - + public: TOptParseResult(const TOpt* opt = nullptr) : Opt_(opt) { } - + public: const TOpt& Opt() const { return *Opt_; @@ -49,7 +49,7 @@ namespace NLastGetopt { const char* Back(const char* def = nullptr) const { return Empty() ? DefVal(def) : Values().back(); } - + private: const TOpt* Opt_; TValues Values_; @@ -67,16 +67,16 @@ namespace NLastGetopt { class TOptsParseResult { private: THolder<TOptsParser> Parser_; //The instance of parser. - + // XXX: make argc, argv typedef TVector<TOptParseResult> TdVec; - + TdVec Opts_; //Parsing result for all options, that have been explicitly defined in argc/argv TdVec OptsDef_; //Parsing result for options, that have been defined by default values only - + private: TOptParseResult& OptParseResult(); - + /** * Searchs for object in given container * @@ -86,15 +86,15 @@ namespace NLastGetopt { * @retunr ptr on corresponding TOptParseResult */ static const TOptParseResult* FindParseResult(const TdVec& vec, const TOpt* opt); - + protected: /** * Performs parsing of comand line arguments. */ void Init(const TOpts* options, int argc, const char** argv); - + TOptsParseResult() = default; - + public: /** * The action in case of parser failure. @@ -102,7 +102,7 @@ namespace NLastGetopt { * By default prints error string and aborts the program */ virtual void HandleError() const; - + /** * Constructs object by parsing arguments with given rules * @@ -113,7 +113,7 @@ namespace NLastGetopt { TOptsParseResult(const TOpts* options, int argc, const char* argv[]) { Init(options, argc, argv); } - + /** * Constructs object by parsing arguments with given rules * @@ -124,9 +124,9 @@ namespace NLastGetopt { TOptsParseResult(const TOpts* options, int argc, char* argv[]) { Init(options, argc, const_cast<const char**>(argv)); } - + virtual ~TOptsParseResult() = default; - + /** * Search for TOptParseResult that corresponds to given option (TOpt) * @@ -136,7 +136,7 @@ namespace NLastGetopt { * @return ptr on result */ const TOptParseResult* FindOptParseResult(const TOpt* opt, bool includeDefault = false) const; - + /** * Search for TOptParseResult that corresponds to given long name * @@ -146,7 +146,7 @@ namespace NLastGetopt { * @return ptr on result */ const TOptParseResult* FindLongOptParseResult(const TString& name, bool includeDefault = false) const; - + /** * Search for TOptParseResult that corresponds to given short name * @@ -156,12 +156,12 @@ namespace NLastGetopt { * @return ptr on result */ const TOptParseResult* FindCharOptParseResult(char c, bool includeDefault = false) const; - + /** * @return argv[0] */ TString GetProgramName() const; - + /** * Print usage string. */ @@ -171,17 +171,17 @@ namespace NLastGetopt { * @return position in [premuted argv] of the first free argument */ size_t GetFreeArgsPos() const; - + /** * @return number of fetched free arguments */ size_t GetFreeArgCount() const; - + /** * @return all fetched free arguments */ TVector<TString> GetFreeArgs() const; - + /** * @return true if given option exist in results of parsing * @@ -190,7 +190,7 @@ namespace NLastGetopt { * */ bool Has(const TOpt* opt, bool includeDefault = false) const; - + /** * @return nil terminated string on the last fetched argument of givne option * @@ -198,7 +198,7 @@ namespace NLastGetopt { * @param includeDefault search in results obtained from default values */ const char* Get(const TOpt* opt, bool includeDefault = true) const; - + /** * @return nil terminated string on the last fetched argument of givne option * if option haven't been fetched, given defaultValue will be returned @@ -207,7 +207,7 @@ namespace NLastGetopt { * @param defaultValue */ const char* GetOrElse(const TOpt* opt, const char* defaultValue) const; - + /** * @return true if given option exist in results of parsing * @@ -216,7 +216,7 @@ namespace NLastGetopt { * */ bool Has(const TString& name, bool includeDefault = false) const; - + /** * @return nil terminated string on the last fetched argument of givne option * @@ -224,7 +224,7 @@ namespace NLastGetopt { * @param includeDefault search in results obtained from default values */ const char* Get(const TString& name, bool includeDefault = true) const; - + /** * @return nil terminated string on the last fetched argument of givne option * if option haven't been fetched, given defaultValue will be returned @@ -233,7 +233,7 @@ namespace NLastGetopt { * @param defaultValue */ const char* GetOrElse(const TString& name, const char* defaultValue) const; - + /** * @return true if given option exist in results of parsing * @@ -242,7 +242,7 @@ namespace NLastGetopt { * */ bool Has(char name, bool includeDefault = false) const; - + /** * @return nil terminated string on the last fetched argument of givne option * @@ -250,7 +250,7 @@ namespace NLastGetopt { * @param includeDefault search in results obtained from default values */ const char* Get(char name, bool includeDefault = true) const; - + /** * @return nil terminated string on the last fetched argument of givne option * if option haven't been fetched, given defaultValue will be returned @@ -259,7 +259,7 @@ namespace NLastGetopt { * @param defaultValue */ const char* GetOrElse(char name, const char* defaultValue) const; - + /** * for givne option return parsed value of the last fetched argument * if option haven't been fetched, HandleError action is called @@ -277,8 +277,8 @@ namespace NLastGetopt { HandleError(); throw; } - } - + } + /** * for givne option return parsed value of the last fetched argument * if option haven't been fetched, given defaultValue will be returned @@ -296,7 +296,7 @@ namespace NLastGetopt { return defaultValue; } }; - + /** * NLastGetopt::TOptsParseResultException contains result of parsing argc,argv be parser. * @@ -317,5 +317,5 @@ namespace NLastGetopt { protected: TOptsParseResultException() = default; }; - -} + +} diff --git a/library/cpp/getopt/small/last_getopt_parser.cpp b/library/cpp/getopt/small/last_getopt_parser.cpp index 7668b12a03..7c474809ce 100644 --- a/library/cpp/getopt/small/last_getopt_parser.cpp +++ b/library/cpp/getopt/small/last_getopt_parser.cpp @@ -1,23 +1,23 @@ -#include "last_getopt_parser.h" - +#include "last_getopt_parser.h" + #include <library/cpp/colorizer/colors.h> -#include <util/string/escape.h> - -namespace NLastGetopt { +#include <util/string/escape.h> + +namespace NLastGetopt { void TOptsParser::Init(const TOpts* opts, int argc, const char* argv[]) { opts->Validate(); - + Opts_ = opts; - + if (argc < 1) throw TUsageException() << "argv must have at least one argument"; - + Argc_ = argc; Argv_ = argv; - + ProgramName_ = argv[0]; - + Pos_ = 1; Sop_ = 0; CurrentOpt_ = nullptr; @@ -27,11 +27,11 @@ namespace NLastGetopt { OptsSeen_.clear(); OptsDefault_.clear(); } - + void TOptsParser::Init(const TOpts* opts, int argc, char* argv[]) { Init(opts, argc, const_cast<const char**>(argv)); } - + void TOptsParser::Swap(TOptsParser& that) { DoSwap(Opts_, that.Opts_); DoSwap(Argc_, that.Argc_); @@ -46,7 +46,7 @@ namespace NLastGetopt { DoSwap(GotMinusMinus_, that.GotMinusMinus_); DoSwap(OptsSeen_, that.OptsSeen_); } - + bool TOptsParser::Commit(const TOpt* currentOpt, const TStringBuf& currentValue, size_t pos, size_t sop) { Pos_ = pos; Sop_ = sop; @@ -56,62 +56,62 @@ namespace NLastGetopt { OptsSeen_.insert(currentOpt); return true; } - + bool TOptsParser::CommitEndOfOptions(size_t pos) { Pos_ = pos; Sop_ = 0; Y_ASSERT(!CurOpt()); Y_ASSERT(!CurVal()); - + Y_ASSERT(!Stopped_); - + if (Opts_->FreeArgsMin_ == Opts_->FreeArgsMax_ && Argc_ - Pos_ != Opts_->FreeArgsMin_) throw TUsageException() << "required exactly " << Opts_->FreeArgsMin_ << " free args"; else if (Argc_ - Pos_ < Opts_->FreeArgsMin_) throw TUsageException() << "required at least " << Opts_->FreeArgsMin_ << " free args"; else if (Argc_ - Pos_ > Opts_->FreeArgsMax_) throw TUsageException() << "required at most " << Opts_->FreeArgsMax_ << " free args"; - + return false; } - + bool TOptsParser::ParseUnknownShortOptWithinArg(size_t pos, size_t sop) { Y_ASSERT(pos < Argc_); const TStringBuf arg(Argv_[pos]); Y_ASSERT(sop > 0); Y_ASSERT(sop < arg.length()); Y_ASSERT(EIO_NONE != IsOpt(arg)); - + if (!Opts_->AllowUnknownCharOptions_) throw TUsageException() << "unknown option '" << EscapeC(arg[sop]) << "' in '" << arg << "'"; - + TempCurrentOpt_.Reset(new TOpt); TempCurrentOpt_->AddShortName(arg[sop]); - + sop += 1; - + // mimic behavior of Opt: unknown option has arg only if char is last within arg if (sop < arg.length()) { return Commit(TempCurrentOpt_.Get(), nullptr, pos, sop); } - + pos += 1; sop = 0; if (pos == Argc_ || EIO_NONE != IsOpt(Argv_[pos])) { return Commit(TempCurrentOpt_.Get(), nullptr, pos, 0); } - + return Commit(TempCurrentOpt_.Get(), Argv_[pos], pos + 1, 0); - } - + } + bool TOptsParser::ParseShortOptWithinArg(size_t pos, size_t sop) { Y_ASSERT(pos < Argc_); const TStringBuf arg(Argv_[pos]); Y_ASSERT(sop > 0); Y_ASSERT(sop < arg.length()); Y_ASSERT(EIO_NONE != IsOpt(arg)); - + size_t p = sop; char c = arg[p]; const TOpt* opt = Opts_->FindCharOption(c); @@ -126,15 +126,15 @@ namespace NLastGetopt { } return Commit(opt, arg.SubStr(p), pos + 1, 0); } - + bool TOptsParser::ParseShortOptArg(size_t pos) { Y_ASSERT(pos < Argc_); const TStringBuf arg(Argv_[pos]); Y_ASSERT(EIO_NONE != IsOpt(arg)); Y_ASSERT(!arg.StartsWith("--")); return ParseShortOptWithinArg(pos, 1); - } - + } + bool TOptsParser::ParseOptArg(size_t pos) { Y_ASSERT(pos < Argc_); TStringBuf arg(Argv_[pos]); @@ -155,7 +155,7 @@ namespace NLastGetopt { throw TUsageException() << "unknown option '" << optionName << "' in '" << Argv_[pos] << "'"; } - } + } if (arg.IsInited()) { if (option->GetHasArg() == NO_ARGUMENT) throw TUsageException() << "option " << optionName << " must have no arg"; @@ -165,9 +165,9 @@ namespace NLastGetopt { return ParseOptParam(option, pos); } else { return ParseShortOptArg(pos); - } - } - + } + } + bool TOptsParser::ParseOptParam(const TOpt* opt, size_t pos) { Y_ASSERT(opt); if (opt->GetHasArg() == NO_ARGUMENT) { @@ -183,8 +183,8 @@ namespace NLastGetopt { return Commit(opt, arg, pos + 1, 0); } return Commit(opt, nullptr, pos, 0); - } - + } + TOptsParser::EIsOpt TOptsParser::IsOpt(const TStringBuf& arg) const { EIsOpt eio = EIO_NONE; if (1 < arg.length()) { @@ -202,35 +202,35 @@ namespace NLastGetopt { eio = EIO_PLUS; break; } - } + } return eio; - } - + } + static void memrotate(void* ptr, size_t size, size_t shift) { TTempBuf buf(shift); memcpy(buf.Data(), (char*)ptr + size - shift, shift); memmove((char*)ptr + shift, ptr, size - shift); memcpy(ptr, buf.Data(), shift); } - + bool TOptsParser::ParseWithPermutation() { Y_ASSERT(Sop_ == 0); Y_ASSERT(Opts_->ArgPermutation_ == PERMUTE); - + const size_t p0 = Pos_; - + size_t pc = Pos_; - + for (; pc < Argc_ && EIO_NONE == IsOpt(Argv_[pc]); ++pc) { // count non-args } - + if (pc == Argc_) { return CommitEndOfOptions(Pos_); } - + Pos_ = pc; - + bool r = ParseOptArg(Pos_); Y_ASSERT(r); while (Pos_ == pc) { @@ -238,33 +238,33 @@ namespace NLastGetopt { r = ParseShortOptWithinArg(Pos_, Sop_); Y_ASSERT(r); } - + size_t p2 = Pos_; - + Y_ASSERT(p2 - pc >= 1); Y_ASSERT(p2 - pc <= 2); - + memrotate(Argv_ + p0, (p2 - p0) * sizeof(void*), (p2 - pc) * sizeof(void*)); - + bool r2 = ParseOptArg(p0); Y_ASSERT(r2); return r2; } - + bool TOptsParser::DoNext() { Y_ASSERT(Pos_ <= Argc_); - + if (Pos_ == Argc_) return CommitEndOfOptions(Pos_); - + if (GotMinusMinus_ && Opts_->ArgPermutation_ == RETURN_IN_ORDER) { Y_ASSERT(Sop_ == 0); return Commit(nullptr, Argv_[Pos_], Pos_ + 1, 0); } - + if (Sop_ > 0) return ParseShortOptWithinArg(Pos_, Sop_); - + size_t pos = Pos_; const TStringBuf arg(Argv_[pos]); if (EIO_NONE != IsOpt(arg)) { @@ -283,59 +283,59 @@ namespace NLastGetopt { return Commit(nullptr, arg, pos + 1, 0); } else if (Opts_->ArgPermutation_ == REQUIRE_ORDER) { return CommitEndOfOptions(Pos_); - } else { + } else { return ParseWithPermutation(); - } - } - + } + } + bool TOptsParser::Next() { bool r = false; - + if (OptsDefault_.empty()) { CurrentOpt_ = nullptr; TempCurrentOpt_.Destroy(); - + CurrentValue_ = nullptr; - + if (Stopped_) return false; - + TOptsParser copy = *this; - + r = copy.DoNext(); - + Swap(copy); - + if (!r) { Stopped_ = true; // we are done; check for missing options Finish(); } - } - + } + if (!r && !OptsDefault_.empty()) { CurrentOpt_ = OptsDefault_.front(); CurrentValue_ = CurrentOpt_->GetDefaultValue(); OptsDefault_.pop_front(); r = true; } - + if (r) { if (CurOpt()) CurOpt()->FireHandlers(this); } return r; - } - + } + void TOptsParser::Finish() { const TOpts::TOptsVector& optvec = Opts_->Opts_; if (optvec.size() == OptsSeen_.size()) return; - + TVector<TString> missingLong; TVector<char> missingShort; - + TOpts::TOptsVector::const_iterator it; for (it = optvec.begin(); it != optvec.end(); ++it) { const TOpt* opt = (*it).Get(); @@ -343,7 +343,7 @@ namespace NLastGetopt { continue; if (OptsSeen_.contains(opt)) continue; - + if (opt->IsRequired()) { const TOpt::TLongNames& optnames = opt->GetLongNames(); if (!optnames.empty()) @@ -355,18 +355,18 @@ namespace NLastGetopt { } continue; } - + if (opt->HasDefaultValue()) OptsDefault_.push_back(opt); - } - + } + // also indicates subsequent options, if any, haven't been seen actually OptsSeen_.clear(); - + const size_t nmissing = missingLong.size() + missingShort.size(); if (0 == nmissing) return; - + TUsageException usage; usage << "The following option"; usage << ((1 == nmissing) ? " is" : "s are"); @@ -377,11 +377,11 @@ namespace NLastGetopt { usage << " -" << missingShort[i]; throw usage; // don't need lineinfo, just the message } - + void TOptsParser::PrintUsage(IOutputStream& os, const NColorizer::TColors& colors) const { Opts_->PrintUsage(ProgramName(), os, colors); } - + void TOptsParser::PrintUsage(IOutputStream& os) const { PrintUsage(os, NColorizer::AutoColors(os)); } diff --git a/library/cpp/getopt/small/last_getopt_parser.h b/library/cpp/getopt/small/last_getopt_parser.h index 2cf8a6c308..292fb49d11 100644 --- a/library/cpp/getopt/small/last_getopt_parser.h +++ b/library/cpp/getopt/small/last_getopt_parser.h @@ -1,20 +1,20 @@ -#pragma once - -#include "last_getopt_opts.h" - +#pragma once + +#include "last_getopt_opts.h" + #include <library/cpp/colorizer/fwd.h> -#include <util/generic/hash_set.h> -#include <util/generic/list.h> - -namespace NLastGetopt { +#include <util/generic/hash_set.h> +#include <util/generic/list.h> + +namespace NLastGetopt { /** -* NLastGetopt::TOptsParser is an implementation of parsing -* argv/argv into TOptsParseResult by rules of TOpts. -* -* The class allows to make complicated handlers. -* Note, that if PERMUTE mode is on, then data, pointed by argv can be changed. -*/ +* NLastGetopt::TOptsParser is an implementation of parsing +* argv/argv into TOptsParseResult by rules of TOpts. +* +* The class allows to make complicated handlers. +* Note, that if PERMUTE mode is on, then data, pointed by argv can be changed. +*/ class TOptsParser { enum EIsOpt { EIO_NONE, //is not an option name @@ -22,72 +22,72 @@ namespace NLastGetopt { EIO_DDASH, //double-dashed ("--opt") option name EIO_PLUS, //plus prefix ("+opt") option name }; - + public: // TODO: make private const TOpts* Opts_; //rules of parsing - + // argc/argv pair size_t Argc_; const char** Argv_; - + private: //the storage of last unkown options. TODO: can be moved to local-method scope TCopyPtr<TOpt> TempCurrentOpt_; - + public: //storage of argv[0] TString ProgramName_; - + //state of parsing: - + size_t Pos_; // current element withing argv size_t Sop_; // current char within arg bool Stopped_; bool GotMinusMinus_; //true if "--" have been seen in argv - + protected: const TOpt* CurrentOpt_; // ptr on the last meeted option TStringBuf CurrentValue_; // the value of the last met argument (corresponding to CurrentOpt_) - + private: typedef THashSet<const TOpt*> TdOptSet; TdOptSet OptsSeen_; //the set of options that have been met during parsing - + TList<const TOpt*> OptsDefault_; - + private: void Init(const TOpts* options, int argc, const char* argv[]); void Init(const TOpts* options, int argc, char* argv[]); - + bool CommitEndOfOptions(size_t pos); bool Commit(const TOpt* currentOption, const TStringBuf& currentValue, size_t pos, size_t sop); - + bool ParseShortOptArg(size_t pos); bool ParseOptArg(size_t pos); bool ParseOptParam(const TOpt* opt, size_t pos); bool ParseUnknownShortOptWithinArg(size_t pos, size_t sop); bool ParseShortOptWithinArg(size_t pos, size_t sop); bool ParseWithPermutation(); - + bool DoNext(); void Finish(); - + EIsOpt IsOpt(const TStringBuf& arg) const; - + void Swap(TOptsParser& that); - + public: TOptsParser(const TOpts* options, int argc, const char* argv[]) { Init(options, argc, argv); } - + TOptsParser(const TOpts* options, int argc, char* argv[]) { Init(options, argc, argv); } - + /// fetch next argument, false if no more arguments left bool Next(); - + bool Seen(const TOpt* opt) const { return OptsSeen_.contains(opt); } @@ -111,38 +111,38 @@ namespace NLastGetopt { const TOpt* CurOpt() const { return CurrentOpt_; } - + const char* CurVal() const { return CurrentValue_.data(); } - + const TStringBuf& CurValStr() const { return CurrentValue_; } - + TStringBuf CurValOrOpt() const { TStringBuf val(CurValStr()); if (!val.IsInited() && CurOpt()->HasOptionalValue()) val = CurOpt()->GetOptionalValue(); return val; } - + TStringBuf CurValOrDef(bool useDef = true) const { TStringBuf val(CurValOrOpt()); if (!val.IsInited() && useDef && CurOpt()->HasDefaultValue()) val = CurOpt()->GetDefaultValue(); return val; } - + // true if this option was actually specified by the user bool IsExplicit() const { return nullptr == CurrentOpt_ || !OptsSeen_.empty(); } - + bool CurrentIs(const TString& name) const { return CurOpt()->NameIs(name); } - + const TString& ProgramName() const { return ProgramName_; } diff --git a/library/cpp/getopt/small/last_getopt_support.h b/library/cpp/getopt/small/last_getopt_support.h index 17bed3e614..352a8616fb 100644 --- a/library/cpp/getopt/small/last_getopt_support.h +++ b/library/cpp/getopt/small/last_getopt_support.h @@ -136,21 +136,21 @@ namespace NLastGetopt { , Value(value) { } - + void operator()(const TOptsParser*) { *Target = Value; } }; - + TString OptToString(char c); TString OptToString(const TString& longOption); TString OptToString(const TOpt* opt); - + template <typename T> inline T OptFromStringImpl(const TStringBuf& value) { return FromString<T>(value); - } - + } + template <> inline TStringBuf OptFromStringImpl<TStringBuf>(const TStringBuf& value) { return value; diff --git a/library/cpp/getopt/small/opt.h b/library/cpp/getopt/small/opt.h index ecb57439bc..2a04caab29 100644 --- a/library/cpp/getopt/small/opt.h +++ b/library/cpp/getopt/small/opt.h @@ -25,7 +25,7 @@ == non-option forces getopt to return 1 and to place non-option into optarg 2. shortopts begins with '+' :=> REQUIRE_ORDER - GetEnv(_POSIX_OPTION_ORDER) :=> REQUIRE_ORDER + GetEnv(_POSIX_OPTION_ORDER) :=> REQUIRE_ORDER == 1st non-option forces getopt to return EOF 3. default :=> PERMUTE diff --git a/library/cpp/getopt/small/ya.make b/library/cpp/getopt/small/ya.make index 96de0f04b1..a11fc36ab3 100644 --- a/library/cpp/getopt/small/ya.make +++ b/library/cpp/getopt/small/ya.make @@ -12,11 +12,11 @@ SRCS( completion_generator.cpp formatted_output.cpp last_getopt.cpp - last_getopt_easy_setup.cpp - last_getopt_opt.cpp - last_getopt_opts.cpp - last_getopt_parser.cpp - last_getopt_parse_result.cpp + last_getopt_easy_setup.cpp + last_getopt_opt.cpp + last_getopt_opts.cpp + last_getopt_parser.cpp + last_getopt_parse_result.cpp modchooser.cpp opt.cpp opt2.cpp diff --git a/library/cpp/getopt/ut/last_getopt_ut.cpp b/library/cpp/getopt/ut/last_getopt_ut.cpp index c99a1d053d..1d5f19d25f 100644 --- a/library/cpp/getopt/ut/last_getopt_ut.cpp +++ b/library/cpp/getopt/ut/last_getopt_ut.cpp @@ -1,7 +1,7 @@ -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <library/cpp/colorizer/colors.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/array_size.h> #include <util/string/subst.h> diff --git a/library/cpp/getopt/ut/modchooser_ut.cpp b/library/cpp/getopt/ut/modchooser_ut.cpp index a14c8a5853..4e308c7ed3 100644 --- a/library/cpp/getopt/ut/modchooser_ut.cpp +++ b/library/cpp/getopt/ut/modchooser_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/getopt/modchooser.h> +#include <library/cpp/getopt/modchooser.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> diff --git a/library/cpp/getopt/ut/opt2_ut.cpp b/library/cpp/getopt/ut/opt2_ut.cpp index 0e7464747c..aedb2c24ea 100644 --- a/library/cpp/getopt/ut/opt2_ut.cpp +++ b/library/cpp/getopt/ut/opt2_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/getopt/opt2.h> +#include <library/cpp/getopt/opt2.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> //using namespace NLastGetopt; diff --git a/library/cpp/getopt/ut/opt_ut.cpp b/library/cpp/getopt/ut/opt_ut.cpp index 441aa493a0..c3d1ed3709 100644 --- a/library/cpp/getopt/ut/opt_ut.cpp +++ b/library/cpp/getopt/ut/opt_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/getopt/opt.h> +#include <library/cpp/getopt/opt.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/vector.h> Y_UNIT_TEST_SUITE(OptTest) { diff --git a/library/cpp/getopt/ut/posix_getopt_ut.cpp b/library/cpp/getopt/ut/posix_getopt_ut.cpp index b6d374bf28..b9edd9350f 100644 --- a/library/cpp/getopt/ut/posix_getopt_ut.cpp +++ b/library/cpp/getopt/ut/posix_getopt_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/getopt/posix_getopt.h> +#include <library/cpp/getopt/posix_getopt.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NLastGetopt; diff --git a/library/cpp/getopt/ut/wrap.cpp b/library/cpp/getopt/ut/wrap.cpp index 3444eea102..2d8bdf72b3 100644 --- a/library/cpp/getopt/ut/wrap.cpp +++ b/library/cpp/getopt/ut/wrap.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/getopt/small/wrap.h> +#include <library/cpp/getopt/small/wrap.h> Y_UNIT_TEST_SUITE(Wrap) { Y_UNIT_TEST(TestWrapping) { diff --git a/library/cpp/getopt/ut/ya.make b/library/cpp/getopt/ut/ya.make index 8d00669efb..c8e0b5377e 100644 --- a/library/cpp/getopt/ut/ya.make +++ b/library/cpp/getopt/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/getopt) +UNITTEST_FOR(library/cpp/getopt) OWNER(pg) diff --git a/library/cpp/getopt/ut/ygetopt_ut.cpp b/library/cpp/getopt/ut/ygetopt_ut.cpp index a76f117216..dfa4dfbfac 100644 --- a/library/cpp/getopt/ut/ygetopt_ut.cpp +++ b/library/cpp/getopt/ut/ygetopt_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/getopt/ygetopt.h> +#include <library/cpp/getopt/ygetopt.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TGetOptTest: public TTestBase { UNIT_TEST_SUITE(TGetOptTest); diff --git a/library/cpp/getopt/ya.make b/library/cpp/getopt/ya.make index 6df23b22b2..c8fc111c19 100644 --- a/library/cpp/getopt/ya.make +++ b/library/cpp/getopt/ya.make @@ -3,13 +3,13 @@ LIBRARY() OWNER(pg) PEERDIR( - library/cpp/getopt/small + library/cpp/getopt/small library/cpp/svnversion library/cpp/build_info ) SRCS( - GLOBAL print.cpp + GLOBAL print.cpp ) END() diff --git a/library/cpp/getopt/ygetopt.h b/library/cpp/getopt/ygetopt.h index fd018b3128..9e716e768d 100644 --- a/library/cpp/getopt/ygetopt.h +++ b/library/cpp/getopt/ygetopt.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/getopt/small/ygetopt.h> +#include <library/cpp/getopt/small/ygetopt.h> diff --git a/library/cpp/grpc/server/grpc_request_base.h b/library/cpp/grpc/server/grpc_request_base.h index fcfce1c181..a9eec8bce4 100644 --- a/library/cpp/grpc/server/grpc_request_base.h +++ b/library/cpp/grpc/server/grpc_request_base.h @@ -1,7 +1,7 @@ #pragma once #include <google/protobuf/message.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <grpc++/server_context.h> diff --git a/library/cpp/grpc/server/grpc_server.h b/library/cpp/grpc/server/grpc_server.h index d6814a90a0..9ebad4b321 100644 --- a/library/cpp/grpc/server/grpc_server.h +++ b/library/cpp/grpc/server/grpc_server.h @@ -3,7 +3,7 @@ #include "grpc_request_base.h" #include "logger.h" -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/ptr.h> #include <util/generic/string.h> diff --git a/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp b/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp index c34d3b8c2b..445ecf8f9d 100644 --- a/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp +++ b/library/cpp/grpc/server/ut/stream_adaptor_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/grpc/server/grpc_request.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/system/thread.h> #include <util/thread/pool.h> diff --git a/library/cpp/histogram/hdr/histogram_iter_ut.cpp b/library/cpp/histogram/hdr/histogram_iter_ut.cpp index 9c291a2547..a5a5dac057 100644 --- a/library/cpp/histogram/hdr/histogram_iter_ut.cpp +++ b/library/cpp/histogram/hdr/histogram_iter_ut.cpp @@ -1,6 +1,6 @@ #include "histogram_iter.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NHdr; diff --git a/library/cpp/histogram/hdr/histogram_ut.cpp b/library/cpp/histogram/hdr/histogram_ut.cpp index 4841b76e71..bfa65b496e 100644 --- a/library/cpp/histogram/hdr/histogram_ut.cpp +++ b/library/cpp/histogram/hdr/histogram_ut.cpp @@ -1,6 +1,6 @@ #include "histogram.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/cast.h> diff --git a/library/cpp/html/escape/ut/escape_ut.cpp b/library/cpp/html/escape/ut/escape_ut.cpp index cd7b955138..fba81e16a5 100644 --- a/library/cpp/html/escape/ut/escape_ut.cpp +++ b/library/cpp/html/escape/ut/escape_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/html/escape/escape.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NHtml; diff --git a/library/cpp/html/pcdata/pcdata_ut.cpp b/library/cpp/html/pcdata/pcdata_ut.cpp index 5833f8bc59..fcbe4ab0be 100644 --- a/library/cpp/html/pcdata/pcdata_ut.cpp +++ b/library/cpp/html/pcdata/pcdata_ut.cpp @@ -1,6 +1,6 @@ #include "pcdata.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TPcdata) { Y_UNIT_TEST(TestStress) { diff --git a/library/cpp/http/fetch/httpfsm_ut.cpp b/library/cpp/http/fetch/httpfsm_ut.cpp index b018e80101..7e6a7410b9 100644 --- a/library/cpp/http/fetch/httpfsm_ut.cpp +++ b/library/cpp/http/fetch/httpfsm_ut.cpp @@ -4,7 +4,7 @@ #include <util/generic/ptr.h> #include <library/cpp/charset/doccodes.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class THttpHeaderParserTestSuite: public TTestBase { UNIT_TEST_SUITE(THttpHeaderParserTestSuite); diff --git a/library/cpp/http/fetch/httpparser_ut.cpp b/library/cpp/http/fetch/httpparser_ut.cpp index 3b3b938e7a..3384e6d3ef 100644 --- a/library/cpp/http/fetch/httpparser_ut.cpp +++ b/library/cpp/http/fetch/httpparser_ut.cpp @@ -1,6 +1,6 @@ #include "httpparser.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #define ENUM_OUT(arg) \ case type ::arg: { \ diff --git a/library/cpp/http/io/chunk_ut.cpp b/library/cpp/http/io/chunk_ut.cpp index da283f8568..d47ca70a19 100644 --- a/library/cpp/http/io/chunk_ut.cpp +++ b/library/cpp/http/io/chunk_ut.cpp @@ -1,6 +1,6 @@ #include "chunk.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> #include <util/system/tempfile.h> diff --git a/library/cpp/http/io/compression_ut.cpp b/library/cpp/http/io/compression_ut.cpp index 2f3d131f8c..b6cf762ddc 100644 --- a/library/cpp/http/io/compression_ut.cpp +++ b/library/cpp/http/io/compression_ut.cpp @@ -1,8 +1,8 @@ #include "stream.h" #include "compression.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/zlib.h> #include <util/generic/hash_set.h> diff --git a/library/cpp/http/io/headers_ut.cpp b/library/cpp/http/io/headers_ut.cpp index 1d23ef8fdc..2fac93ebe1 100644 --- a/library/cpp/http/io/headers_ut.cpp +++ b/library/cpp/http/io/headers_ut.cpp @@ -4,7 +4,7 @@ #include <utility> #include <library/cpp/http/io/headers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace { class THeadersExistence { diff --git a/library/cpp/http/io/stream_ut.cpp b/library/cpp/http/io/stream_ut.cpp index 1ea35df675..c1a486d236 100644 --- a/library/cpp/http/io/stream_ut.cpp +++ b/library/cpp/http/io/stream_ut.cpp @@ -3,8 +3,8 @@ #include <library/cpp/http/server/http_ex.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/string/printf.h> #include <util/network/socket.h> diff --git a/library/cpp/http/io/stream_ut_medium.cpp b/library/cpp/http/io/stream_ut_medium.cpp index 2c125eb21e..4ac4fffb9b 100644 --- a/library/cpp/http/io/stream_ut_medium.cpp +++ b/library/cpp/http/io/stream_ut_medium.cpp @@ -1,5 +1,5 @@ #include "stream.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/zlib.h> Y_UNIT_TEST_SUITE(THttpTestMedium) { diff --git a/library/cpp/http/misc/httpdate_ut.cpp b/library/cpp/http/misc/httpdate_ut.cpp index c1a0103501..340a3a5774 100644 --- a/library/cpp/http/misc/httpdate_ut.cpp +++ b/library/cpp/http/misc/httpdate_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "httpdate.h" diff --git a/library/cpp/http/misc/httpreqdata.h b/library/cpp/http/misc/httpreqdata.h index 16e59c4d78..0384f62302 100644 --- a/library/cpp/http/misc/httpreqdata.h +++ b/library/cpp/http/misc/httpreqdata.h @@ -6,7 +6,7 @@ #include <util/system/defaults.h> #include <util/string/cast.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> #include <util/network/address.h> #include <util/network/socket.h> #include <util/generic/hash.h> diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/library/cpp/http/misc/httpreqdata_ut.cpp index e7f16ef27c..66525cba9c 100644 --- a/library/cpp/http/misc/httpreqdata_ut.cpp +++ b/library/cpp/http/misc/httpreqdata_ut.cpp @@ -1,6 +1,6 @@ #include "httpreqdata.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TRequestServerDataTest) { Y_UNIT_TEST(Headers) { diff --git a/library/cpp/http/misc/parsed_request_ut.cpp b/library/cpp/http/misc/parsed_request_ut.cpp index da6d95c6ab..a4f66c3b8d 100644 --- a/library/cpp/http/misc/parsed_request_ut.cpp +++ b/library/cpp/http/misc/parsed_request_ut.cpp @@ -1,6 +1,6 @@ #include "parsed_request.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(THttpParse) { Y_UNIT_TEST(TestParse) { diff --git a/library/cpp/http/misc/ya.make b/library/cpp/http/misc/ya.make index fceb3cf79c..94ab0b7d63 100644 --- a/library/cpp/http/misc/ya.make +++ b/library/cpp/http/misc/ya.make @@ -15,7 +15,7 @@ SRCS( ) PEERDIR( - library/cpp/cgiparam + library/cpp/cgiparam library/cpp/digest/lower_case ) diff --git a/library/cpp/http/server/http.cpp b/library/cpp/http/server/http.cpp index 128583bdd7..2132d0148f 100644 --- a/library/cpp/http/server/http.cpp +++ b/library/cpp/http/server/http.cpp @@ -1,7 +1,7 @@ #include "http.h" #include "http_ex.h" -#include <library/cpp/threading/equeue/equeue.h> +#include <library/cpp/threading/equeue/equeue.h> #include <util/generic/buffer.h> #include <util/generic/cast.h> @@ -260,12 +260,12 @@ public: }; if (!fail && Requests->Add(req.Get())) { - Y_UNUSED(req.Release()); + Y_UNUSED(req.Release()); } else { req = new TFailRequest(req); if (FailRequests->Add(req.Get())) { - Y_UNUSED(req.Release()); + Y_UNUSED(req.Release()); } else { Cb_->OnFailRequest(-1); } @@ -664,7 +664,7 @@ void TClientRequest::ReleaseConnection() { if (Conn_ && HttpConn_ && HttpServ()->Options().KeepAliveEnabled && HttpConn_->CanBeKeepAlive() && (!HttpServ()->Options().RejectExcessConnections || !HttpServ()->MaxRequestsReached())) { Output().Finish(); Conn_->DeActivate(); - Y_UNUSED(Conn_.Release()); + Y_UNUSED(Conn_.Release()); } } @@ -720,7 +720,7 @@ void TClientRequest::Process(void* ThreadSpecificResource) { throw; } - Y_UNUSED(this_.Release()); + Y_UNUSED(this_.Release()); } void TClientRequest::ProcessFailRequest(int failstate) { diff --git a/library/cpp/http/server/http_ut.cpp b/library/cpp/http/server/http_ut.cpp index cc62bb988e..8e46a6cb2e 100644 --- a/library/cpp/http/server/http_ut.cpp +++ b/library/cpp/http/server/http_ut.cpp @@ -1,8 +1,8 @@ #include "http.h" #include "http_ex.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/generic/cast.h> #include <util/stream/output.h> diff --git a/library/cpp/http/server/response_ut.cpp b/library/cpp/http/server/response_ut.cpp index 73e2112ad3..26389b6a0b 100644 --- a/library/cpp/http/server/response_ut.cpp +++ b/library/cpp/http/server/response_ut.cpp @@ -1,6 +1,6 @@ #include "response.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> diff --git a/library/cpp/http/server/ya.make b/library/cpp/http/server/ya.make index bae6f33306..36968edb73 100644 --- a/library/cpp/http/server/ya.make +++ b/library/cpp/http/server/ya.make @@ -19,7 +19,7 @@ SRCS( PEERDIR( library/cpp/http/misc library/cpp/http/io - library/cpp/threading/equeue + library/cpp/threading/equeue ) END() diff --git a/library/cpp/hyperloglog/hyperloglog_ut.cpp b/library/cpp/hyperloglog/hyperloglog_ut.cpp index b987aa0fa4..42fee13c43 100644 --- a/library/cpp/hyperloglog/hyperloglog_ut.cpp +++ b/library/cpp/hyperloglog/hyperloglog_ut.cpp @@ -4,7 +4,7 @@ #include <util/random/mersenne.h> #include <util/stream/buffer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <cmath> diff --git a/library/cpp/int128/bench/main.cpp b/library/cpp/int128/bench/main.cpp index be4f8d1500..c5549df69c 100644 --- a/library/cpp/int128/bench/main.cpp +++ b/library/cpp/int128/bench/main.cpp @@ -1,5 +1,5 @@ #include <library/cpp/int128/int128.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/xrange.h> #include <util/system/compiler.h> diff --git a/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp b/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp index dbb7507a73..50b93359bf 100644 --- a/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp +++ b/library/cpp/int128/ut/i128_and_intrinsic_identity_ut.cpp @@ -1,6 +1,6 @@ #include "int128_ut_helpers.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/i128_comparison_ut.cpp b/library/cpp/int128/ut/i128_comparison_ut.cpp index 7b8d508815..d17036444c 100644 --- a/library/cpp/int128/ut/i128_comparison_ut.cpp +++ b/library/cpp/int128/ut/i128_comparison_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/i128_division_ut.cpp b/library/cpp/int128/ut/i128_division_ut.cpp index 46b0ca27f5..b93661e637 100644 --- a/library/cpp/int128/ut/i128_division_ut.cpp +++ b/library/cpp/int128/ut/i128_division_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/i128_type_traits_ut.cpp b/library/cpp/int128/ut/i128_type_traits_ut.cpp index 4ed87bf229..69b57d9436 100644 --- a/library/cpp/int128/ut/i128_type_traits_ut.cpp +++ b/library/cpp/int128/ut/i128_type_traits_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/i128_ut.cpp b/library/cpp/int128/ut/i128_ut.cpp index c196d132a2..8eaf327867 100644 --- a/library/cpp/int128/ut/i128_ut.cpp +++ b/library/cpp/int128/ut/i128_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/int128_old_ut.cpp b/library/cpp/int128/ut/int128_old_ut.cpp index 2c5b9e9610..5abb1492d3 100644 --- a/library/cpp/int128/ut/int128_old_ut.cpp +++ b/library/cpp/int128/ut/int128_old_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> #include "int128_ut_helpers.h" diff --git a/library/cpp/int128/ut/int128_typetraits_ut.cpp b/library/cpp/int128/ut/int128_typetraits_ut.cpp index fd5f19d7b8..d9746af8cc 100644 --- a/library/cpp/int128/ut/int128_typetraits_ut.cpp +++ b/library/cpp/int128/ut/int128_typetraits_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/int128_ut.cpp b/library/cpp/int128/ut/int128_ut.cpp index 7339264017..0a11a9cfda 100644 --- a/library/cpp/int128/ut/int128_ut.cpp +++ b/library/cpp/int128/ut/int128_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp b/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp index 9decc2fd48..9ecc8036f5 100644 --- a/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp +++ b/library/cpp/int128/ut/int128_via_intrinsic_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/int128/int128.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> // from https://a.yandex-team.ru/arc/trunk/arcadia/library/ticket_parser/c/src/ut/utils_ut.cpp?rev=4221861 diff --git a/library/cpp/int128/ut/ui128_division_ut.cpp b/library/cpp/int128/ut/ui128_division_ut.cpp index 4826a531e0..bbfcc79d34 100644 --- a/library/cpp/int128/ut/ui128_division_ut.cpp +++ b/library/cpp/int128/ut/ui128_division_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/int128/int128.h> diff --git a/library/cpp/ipmath/ipmath_ut.cpp b/library/cpp/ipmath/ipmath_ut.cpp index 5fe459ecc8..fb4d7ac8da 100644 --- a/library/cpp/ipmath/ipmath_ut.cpp +++ b/library/cpp/ipmath/ipmath_ut.cpp @@ -1,7 +1,7 @@ #include "ipmath.h" #include "range_set.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/testing/gmock_in_unittest/gmock.h> #include <library/cpp/ipv6_address/ipv6_address.h> diff --git a/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp b/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp index 73bb7cffdd..9f791f7148 100644 --- a/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp +++ b/library/cpp/ipv6_address/ut/ipv6_address_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/ipv6_address/ipv6_address.h> #include <unordered_set> diff --git a/library/cpp/json/flex_buffers/ut/cvt_ut.cpp b/library/cpp/json/flex_buffers/ut/cvt_ut.cpp index 9fffef4d38..0fc0a94517 100644 --- a/library/cpp/json/flex_buffers/ut/cvt_ut.cpp +++ b/library/cpp/json/flex_buffers/ut/cvt_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/json/flex_buffers/cvt.h> using namespace NJson; diff --git a/library/cpp/json/json_prettifier.cpp b/library/cpp/json/json_prettifier.cpp index bb16aab44e..4135a0899c 100644 --- a/library/cpp/json/json_prettifier.cpp +++ b/library/cpp/json/json_prettifier.cpp @@ -5,7 +5,7 @@ #include <util/memory/pool.h> #include <util/string/util.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> namespace NJson { struct TRewritableOut { diff --git a/library/cpp/json/ut/json_prettifier_ut.cpp b/library/cpp/json/ut/json_prettifier_ut.cpp index ae5f8dd81a..d0f5aab8cb 100644 --- a/library/cpp/json/ut/json_prettifier_ut.cpp +++ b/library/cpp/json/ut/json_prettifier_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/json/json_prettifier.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(JsonPrettifier) { Y_UNIT_TEST(PrettifyJsonShort) { diff --git a/library/cpp/json/ut/json_reader_fast_ut.cpp b/library/cpp/json/ut/json_reader_fast_ut.cpp index 60dffc91c7..02ac7c50d9 100644 --- a/library/cpp/json/ut/json_reader_fast_ut.cpp +++ b/library/cpp/json/ut/json_reader_fast_ut.cpp @@ -1,8 +1,8 @@ #include <library/cpp/json/json_reader.h> #include <library/cpp/json/json_prettifier.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/string/cast.h> #include <util/string/printf.h> diff --git a/library/cpp/json/ut/json_reader_ut.cpp b/library/cpp/json/ut/json_reader_ut.cpp index cd31afa0b8..fc1dd0a192 100644 --- a/library/cpp/json/ut/json_reader_ut.cpp +++ b/library/cpp/json/ut/json_reader_ut.cpp @@ -1,7 +1,7 @@ #include <library/cpp/json/json_reader.h> #include <library/cpp/json/json_writer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> using namespace NJson; diff --git a/library/cpp/json/ut/json_saveload_ut.cpp b/library/cpp/json/ut/json_saveload_ut.cpp index b480a80fe4..2a8ba23104 100644 --- a/library/cpp/json/ut/json_saveload_ut.cpp +++ b/library/cpp/json/ut/json_saveload_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/json/json_value.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/buffer.h> #include <util/generic/buffer.h> #include <util/ysaveload.h> diff --git a/library/cpp/json/ut/json_writer_ut.cpp b/library/cpp/json/ut/json_writer_ut.cpp index ca11d34dad..13ff58bceb 100644 --- a/library/cpp/json/ut/json_writer_ut.cpp +++ b/library/cpp/json/ut/json_writer_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/json/json_writer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> diff --git a/library/cpp/json/ut/ya.make b/library/cpp/json/ut/ya.make index 8e0362d84b..4bb3fd66e5 100644 --- a/library/cpp/json/ut/ya.make +++ b/library/cpp/json/ut/ya.make @@ -3,7 +3,7 @@ OWNER(velavokr) UNITTEST_FOR(library/cpp/json) PEERDIR( - library/cpp/string_utils/relaxed_escaper + library/cpp/string_utils/relaxed_escaper ) SRCS( diff --git a/library/cpp/json/writer/json_ut.cpp b/library/cpp/json/writer/json_ut.cpp index 9980555683..cfe125ab52 100644 --- a/library/cpp/json/writer/json_ut.cpp +++ b/library/cpp/json/writer/json_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> #include "json.h" diff --git a/library/cpp/json/writer/json_value_ut.cpp b/library/cpp/json/writer/json_value_ut.cpp index dc7f6affdf..0fb37e1ffd 100644 --- a/library/cpp/json/writer/json_value_ut.cpp +++ b/library/cpp/json/writer/json_value_ut.cpp @@ -1,6 +1,6 @@ #include "json_value.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/input.h> diff --git a/library/cpp/json/ya.make b/library/cpp/json/ya.make index d58eead8ec..34b927654b 100644 --- a/library/cpp/json/ya.make +++ b/library/cpp/json/ya.make @@ -17,7 +17,7 @@ PEERDIR( library/cpp/json/common library/cpp/json/fast_sax library/cpp/json/writer - library/cpp/string_utils/relaxed_escaper + library/cpp/string_utils/relaxed_escaper ) END() diff --git a/library/cpp/json/yson/json2yson_ut.cpp b/library/cpp/json/yson/json2yson_ut.cpp index 9eb23354cf..bfd8c3b439 100644 --- a/library/cpp/json/yson/json2yson_ut.cpp +++ b/library/cpp/json/yson/json2yson_ut.cpp @@ -2,8 +2,8 @@ #include <library/cpp/blockcodecs/codecs.h> #include <library/cpp/histogram/simple/histogram.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/datetime/cputimer.h> #include <util/stream/file.h> diff --git a/library/cpp/json/yson/ut/ya.make b/library/cpp/json/yson/ut/ya.make index 4ceb65b279..e207c2d2de 100644 --- a/library/cpp/json/yson/ut/ya.make +++ b/library/cpp/json/yson/ut/ya.make @@ -12,7 +12,7 @@ DATA(sbr://363537653) PEERDIR( library/cpp/blockcodecs library/cpp/histogram/simple - library/cpp/testing/unittest + library/cpp/testing/unittest ) SIZE(LARGE) diff --git a/library/cpp/lcs/lcs_via_lis_ut.cpp b/library/cpp/lcs/lcs_via_lis_ut.cpp index f6ad5152b6..b3f32994dc 100644 --- a/library/cpp/lcs/lcs_via_lis_ut.cpp +++ b/library/cpp/lcs/lcs_via_lis_ut.cpp @@ -1,6 +1,6 @@ #include <util/generic/utility.h> #include <util/string/util.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "lcs_via_lis.h" class TLCSTest: public TTestBase { diff --git a/library/cpp/lfalloc/alloc_profiler/profiler.h b/library/cpp/lfalloc/alloc_profiler/profiler.h index 4ea49b9dcc..c07a6c0be6 100644 --- a/library/cpp/lfalloc/alloc_profiler/profiler.h +++ b/library/cpp/lfalloc/alloc_profiler/profiler.h @@ -2,7 +2,7 @@ #include "stackcollect.h" -#include <library/cpp/lfalloc/dbg_info/dbg_info.h> +#include <library/cpp/lfalloc/dbg_info/dbg_info.h> #include <util/generic/noncopyable.h> #include <util/stream/output.h> diff --git a/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp b/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp index 4341dda6ed..54acf18e71 100644 --- a/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp +++ b/library/cpp/lfalloc/alloc_profiler/profiler_ut.cpp @@ -1,6 +1,6 @@ #include "profiler.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NAllocProfiler { diff --git a/library/cpp/lfalloc/alloc_profiler/stackcollect.h b/library/cpp/lfalloc/alloc_profiler/stackcollect.h index 80715ed7cb..f90687d3cd 100644 --- a/library/cpp/lfalloc/alloc_profiler/stackcollect.h +++ b/library/cpp/lfalloc/alloc_profiler/stackcollect.h @@ -1,7 +1,7 @@ #pragma once -#include <library/cpp/containers/stack_vector/stack_vec.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/cache/cache.h> #include <util/generic/noncopyable.h> #include <util/generic/ptr.h> diff --git a/library/cpp/lfalloc/alloc_profiler/ut/ya.make b/library/cpp/lfalloc/alloc_profiler/ut/ya.make index 8a7daa74af..64906384c1 100644 --- a/library/cpp/lfalloc/alloc_profiler/ut/ya.make +++ b/library/cpp/lfalloc/alloc_profiler/ut/ya.make @@ -1,9 +1,9 @@ -UNITTEST_FOR(library/cpp/lfalloc/alloc_profiler) +UNITTEST_FOR(library/cpp/lfalloc/alloc_profiler) OWNER(g:rtmr g:kikimr) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ) IF (ARCH_AARCH64) diff --git a/library/cpp/lfalloc/alloc_profiler/ya.make b/library/cpp/lfalloc/alloc_profiler/ya.make index 0f58d91767..dd6d6fe13e 100644 --- a/library/cpp/lfalloc/alloc_profiler/ya.make +++ b/library/cpp/lfalloc/alloc_profiler/ya.make @@ -8,8 +8,8 @@ SRCS( ) PEERDIR( - library/cpp/lfalloc/dbg_info - library/cpp/cache + library/cpp/lfalloc/dbg_info + library/cpp/cache ) END() diff --git a/library/cpp/lfalloc/lf_allocX64.h b/library/cpp/lfalloc/lf_allocX64.h index fd2a906d6f..b9dcc3d46f 100644 --- a/library/cpp/lfalloc/lf_allocX64.h +++ b/library/cpp/lfalloc/lf_allocX64.h @@ -53,7 +53,7 @@ static inline long AtomicSub(TAtomic& a, long b) { assert(x); \ } #else -#define Y_ASSERT_NOBT(x) ((void)0) +#define Y_ASSERT_NOBT(x) ((void)0) #endif #else @@ -62,35 +62,35 @@ static inline long AtomicSub(TAtomic& a, long b) { #include <util/system/atomic.h> #include <util/system/yassert.h> -#if !defined(NDEBUG) && !defined(__GCCXML__) -#define Y_ASSERT_NOBT(a) \ - do { \ - try { \ - if (Y_UNLIKELY(!(a))) { \ - if (YaIsDebuggerPresent()) \ - __debugbreak(); \ - else { \ - assert(false && (a)); \ - } \ - } \ - } catch (...) { \ - if (YaIsDebuggerPresent()) \ - __debugbreak(); \ - else { \ - assert(false && "Exception during assert"); \ - } \ - } \ - } while (0) -#else -#define Y_ASSERT_NOBT(a) \ - do { \ - if (false) { \ - bool __xxx = static_cast<bool>(a); \ - Y_UNUSED(__xxx); \ - } \ - } while (0) -#endif - +#if !defined(NDEBUG) && !defined(__GCCXML__) +#define Y_ASSERT_NOBT(a) \ + do { \ + try { \ + if (Y_UNLIKELY(!(a))) { \ + if (YaIsDebuggerPresent()) \ + __debugbreak(); \ + else { \ + assert(false && (a)); \ + } \ + } \ + } catch (...) { \ + if (YaIsDebuggerPresent()) \ + __debugbreak(); \ + else { \ + assert(false && "Exception during assert"); \ + } \ + } \ + } while (0) +#else +#define Y_ASSERT_NOBT(a) \ + do { \ + if (false) { \ + bool __xxx = static_cast<bool>(a); \ + Y_UNUSED(__xxx); \ + } \ + } while (0) +#endif + #include <pthread.h> #include <sys/mman.h> #include <stdlib.h> @@ -433,7 +433,7 @@ static void LargeBlockUnmap(void* p, size_t pages) { IncrementCounter(CT_MUNMAP, bytes); IncrementCounter(CT_MUNMAP_CNT, 1); #ifdef _MSC_VER - Y_ASSERT_NOBT(0); + Y_ASSERT_NOBT(0); #else TLargeBlk::As(p)->Mark(ELarge::Gone); munmap((char*)p - 4096ll, bytes); @@ -796,7 +796,7 @@ static bool DefragmentMem() { if (pData) { uintptr_t nChunk = (pData - ALLOC_START) / N_CHUNK_SIZE; ++nFreeCount[nChunk]; - Y_ASSERT_NOBT(chunkSizeIdx[nChunk] == nSizeIdx); + Y_ASSERT_NOBT(chunkSizeIdx[nChunk] == nSizeIdx); } } } @@ -809,7 +809,7 @@ static bool DefragmentMem() { if (chunkSizeIdx[nChunk] <= 0) continue; int nEntries = N_CHUNK_SIZE / nSizeIdxToSize[static_cast<int>(chunkSizeIdx[nChunk])]; - Y_ASSERT_NOBT(fc <= nEntries); // can not have more free blocks then total count + Y_ASSERT_NOBT(fc <= nEntries); // can not have more free blocks then total count if (fc == nEntries) { bRes = true; nFreeCount[nChunk] = 1; @@ -905,7 +905,7 @@ static void* SlowLFAlloc(int nSizeIdx, int blockSize, EDefrag defrag) { char* newPlace = ALLOC_START + nChunk * N_CHUNK_SIZE; #ifdef _MSC_VER void* pTest = VirtualAlloc(newPlace, N_CHUNK_SIZE, MEM_COMMIT, PAGE_READWRITE); - Y_ASSERT_NOBT(pTest == newPlace); + Y_ASSERT_NOBT(pTest == newPlace); #endif chunkSizeIdx[nChunk] = (char)nSizeIdx; globalCurrentPtr[nSizeIdx] = newPlace + blockSize; @@ -922,8 +922,8 @@ static void* SlowLFAlloc(int nSizeIdx, int blockSize, EDefrag defrag) { uintptr_t endAddr = ((largeBlock - ALLOC_START) + N_LARGE_ALLOC_SIZE) & (~(N_CHUNK_SIZE - 1)); for (uintptr_t p = addr; p < endAddr; p += N_CHUNK_SIZE) { uintptr_t chunk = p / N_CHUNK_SIZE; - Y_ASSERT_NOBT(chunk * N_CHUNK_SIZE == p); - Y_ASSERT_NOBT(chunkSizeIdx[chunk] == 0); + Y_ASSERT_NOBT(chunk * N_CHUNK_SIZE == p); + Y_ASSERT_NOBT(chunkSizeIdx[chunk] == 0); AddFreeChunk(chunk); } } @@ -980,7 +980,7 @@ static Y_FORCE_INLINE int TakeBlocksFromGlobalFreeList(int nSizeIdx, char** buf) static Y_FORCE_INLINE void PutBlocksToGlobalFreeList(ptrdiff_t nSizeIdx, char** buf, int count) { for (int startIdx = 0; startIdx < count;) { TFreeListGroup* g = (TFreeListGroup*)blockFreeList.Alloc(); - Y_ASSERT_NOBT(sizeof(TFreeListGroup) == nSizeIdxToSize[FREE_LIST_GROUP_SIZEIDX]); + Y_ASSERT_NOBT(sizeof(TFreeListGroup) == nSizeIdxToSize[FREE_LIST_GROUP_SIZEIDX]); if (!g) { g = (TFreeListGroup*)LFAllocNoCache(FREE_LIST_GROUP_SIZEIDX, NO_MEM_DEFRAG); } @@ -1123,7 +1123,7 @@ struct TThreadAllocInfo { GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hThread, 0, FALSE, DUPLICATE_SAME_ACCESS); - Y_ASSERT_NOBT(b); + Y_ASSERT_NOBT(b); #endif pNextInfo = *pHead; *pHead = this; @@ -1147,7 +1147,7 @@ struct TThreadAllocInfo { } void Done() { for (auto sizeIdx : FreePtrIndex) { - Y_ASSERT_NOBT(sizeIdx == THREAD_BUF); + Y_ASSERT_NOBT(sizeIdx == THREAD_BUF); } for (auto& localCounter : LocalCounters) { localCounter.Flush(); @@ -1418,7 +1418,7 @@ static inline void SampleDeallocation(TAllocHeader* p, int sizeIdx) { static inline void TrackPerTagAllocation(TAllocHeader* p, int sizeIdx) { if (p->Tag < DBG_ALLOC_MAX_TAG && p->Tag >= 0) { - Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES); + Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES); auto& global = GlobalPerTagAllocCounters[p->Tag][sizeIdx]; TThreadAllocInfo* thr = pThreadInfo; @@ -1433,7 +1433,7 @@ static inline void TrackPerTagAllocation(TAllocHeader* p, int sizeIdx) { static inline void TrackPerTagDeallocation(TAllocHeader* p, int sizeIdx) { if (p->Tag < DBG_ALLOC_MAX_TAG && p->Tag >= 0) { - Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES); + Y_ASSERT_NOBT(sizeIdx < DBG_ALLOC_NUM_SIZES); auto& global = GlobalPerTagAllocCounters[p->Tag][sizeIdx]; TThreadAllocInfo* thr = pThreadInfo; diff --git a/library/cpp/linear_regression/linear_regression_ut.cpp b/library/cpp/linear_regression/linear_regression_ut.cpp index e71a16b67a..4a52387a3b 100644 --- a/library/cpp/linear_regression/linear_regression_ut.cpp +++ b/library/cpp/linear_regression/linear_regression_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/linear_regression/linear_regression.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/generic/ymath.h> diff --git a/library/cpp/logger/element_ut.cpp b/library/cpp/logger/element_ut.cpp index 32edc52dfb..91fe57126e 100644 --- a/library/cpp/logger/element_ut.cpp +++ b/library/cpp/logger/element_ut.cpp @@ -7,7 +7,7 @@ #include <util/generic/ptr.h> #include <utility> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TLogElementTest: public TTestBase { UNIT_TEST_SUITE(TLogElementTest); diff --git a/library/cpp/logger/global/rty_formater_ut.cpp b/library/cpp/logger/global/rty_formater_ut.cpp index 551a97c5bf..a661f884ca 100644 --- a/library/cpp/logger/global/rty_formater_ut.cpp +++ b/library/cpp/logger/global/rty_formater_ut.cpp @@ -1,6 +1,6 @@ #include "rty_formater.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace { const TStringBuf SampleISO8601("2017-07-25T19:26:09.894000+03:00"); diff --git a/library/cpp/logger/log_ut.cpp b/library/cpp/logger/log_ut.cpp index 8de46f17f5..6f29d247af 100644 --- a/library/cpp/logger/log_ut.cpp +++ b/library/cpp/logger/log_ut.cpp @@ -1,6 +1,6 @@ #include "all.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/fs.h> #include <util/system/rwlock.h> diff --git a/library/cpp/logger/rotating_file_ut.cpp b/library/cpp/logger/rotating_file_ut.cpp index 84966933d9..bd12213629 100644 --- a/library/cpp/logger/rotating_file_ut.cpp +++ b/library/cpp/logger/rotating_file_ut.cpp @@ -5,8 +5,8 @@ #include <util/system/fstat.h> #include <util/system/fs.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> Y_UNIT_TEST_SUITE(NewRotatingFileSuite) { const TString PATH = GetWorkPath() + "/my.log"; diff --git a/library/cpp/lwtrace/example2/lwtrace_example2.cpp b/library/cpp/lwtrace/example2/lwtrace_example2.cpp index 7a4f7a1daf..0f66fdbb91 100644 --- a/library/cpp/lwtrace/example2/lwtrace_example2.cpp +++ b/library/cpp/lwtrace/example2/lwtrace_example2.cpp @@ -1,7 +1,7 @@ #include <library/cpp/lwtrace/control.h> #include <library/cpp/lwtrace/all.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <google/protobuf/text_format.h> #include <util/stream/file.h> diff --git a/library/cpp/lwtrace/example2/ya.make b/library/cpp/lwtrace/example2/ya.make index 22e34239c8..448054ba39 100644 --- a/library/cpp/lwtrace/example2/ya.make +++ b/library/cpp/lwtrace/example2/ya.make @@ -8,7 +8,7 @@ SRCS( PEERDIR( library/cpp/lwtrace - library/cpp/getopt + library/cpp/getopt ) END() diff --git a/library/cpp/lwtrace/mon/mon_lwtrace.cpp b/library/cpp/lwtrace/mon/mon_lwtrace.cpp index a61ee9ce22..45296327b4 100644 --- a/library/cpp/lwtrace/mon/mon_lwtrace.cpp +++ b/library/cpp/lwtrace/mon/mon_lwtrace.cpp @@ -10,7 +10,7 @@ #include <library/cpp/monlib/service/pages/resource_mon_page.h> #include <library/cpp/monlib/service/pages/templates.h> #include <library/cpp/resource/resource.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <library/cpp/html/pcdata/pcdata.h> #include <util/string/escape.h> #include <util/system/condvar.h> diff --git a/library/cpp/lwtrace/shuttle.h b/library/cpp/lwtrace/shuttle.h index 85c6e4da61..0e6b57e937 100644 --- a/library/cpp/lwtrace/shuttle.h +++ b/library/cpp/lwtrace/shuttle.h @@ -2,7 +2,7 @@ #include "event.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/ptr.h> #include <util/system/spinlock.h> diff --git a/library/cpp/lwtrace/start.cpp b/library/cpp/lwtrace/start.cpp index 121d5472b6..cb9413ef8e 100644 --- a/library/cpp/lwtrace/start.cpp +++ b/library/cpp/lwtrace/start.cpp @@ -7,7 +7,7 @@ #include <util/generic/singleton.h> #include <util/stream/file.h> #include <util/stream/output.h> -#include <util/system/env.h> +#include <util/system/env.h> #include <stdlib.h> @@ -40,8 +40,8 @@ void NLWTrace::StartLwtraceFromEnv() { started = true; } - TString path = GetEnv("LWTRACE"); - if (!path) { + TString path = GetEnv("LWTRACE"); + if (!path) { return; } @@ -54,8 +54,8 @@ void NLWTrace::StartLwtraceFromEnv() { } void NLWTrace::StartLwtraceFromEnv(std::function<void(TManager&)> prepare) { - TString path = GetEnv("LWTRACE"); - if (Y_LIKELY(!path)) { + TString path = GetEnv("LWTRACE"); + if (Y_LIKELY(!path)) { return; } diff --git a/library/cpp/lwtrace/tests/trace_tests.cpp b/library/cpp/lwtrace/tests/trace_tests.cpp index 6762e344a7..f602628bb5 100644 --- a/library/cpp/lwtrace/tests/trace_tests.cpp +++ b/library/cpp/lwtrace/tests/trace_tests.cpp @@ -1,6 +1,6 @@ #include <library/cpp/lwtrace/all.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <google/protobuf/text_format.h> diff --git a/library/cpp/lwtrace/tests/ya.make b/library/cpp/lwtrace/tests/ya.make index 6225ab1fa0..571ef36220 100644 --- a/library/cpp/lwtrace/tests/ya.make +++ b/library/cpp/lwtrace/tests/ya.make @@ -8,7 +8,7 @@ SRCS( PEERDIR( contrib/libs/protobuf - library/cpp/getopt + library/cpp/getopt library/cpp/lwtrace ) diff --git a/library/cpp/lwtrace/trace_ut.cpp b/library/cpp/lwtrace/trace_ut.cpp index cb03e4fbde..042f236e4f 100644 --- a/library/cpp/lwtrace/trace_ut.cpp +++ b/library/cpp/lwtrace/trace_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/lwtrace/protos/lwtrace.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> diff --git a/library/cpp/malloc/api/ut/ut.cpp b/library/cpp/malloc/api/ut/ut.cpp index 7eccd0bf8d..510bc9f226 100644 --- a/library/cpp/malloc/api/ut/ut.cpp +++ b/library/cpp/malloc/api/ut/ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/malloc/api/malloc.h> diff --git a/library/cpp/messagebus/actor/actor_ut.cpp b/library/cpp/messagebus/actor/actor_ut.cpp index b76ab55bfa..b74c8d4fcb 100644 --- a/library/cpp/messagebus/actor/actor_ut.cpp +++ b/library/cpp/messagebus/actor/actor_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "actor.h" #include "queue_in_actor.h" diff --git a/library/cpp/messagebus/actor/ring_buffer_ut.cpp b/library/cpp/messagebus/actor/ring_buffer_ut.cpp index bdb379b3a9..068023e8ab 100644 --- a/library/cpp/messagebus/actor/ring_buffer_ut.cpp +++ b/library/cpp/messagebus/actor/ring_buffer_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "ring_buffer.h" diff --git a/library/cpp/messagebus/actor/tasks_ut.cpp b/library/cpp/messagebus/actor/tasks_ut.cpp index d80e8451a5..ddc97ee5ec 100644 --- a/library/cpp/messagebus/actor/tasks_ut.cpp +++ b/library/cpp/messagebus/actor/tasks_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "tasks.h" diff --git a/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp b/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp index e4b218a7ca..82f1cf840e 100644 --- a/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp +++ b/library/cpp/messagebus/actor/what_thread_does_guard_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "what_thread_does_guard.h" diff --git a/library/cpp/messagebus/async_result_ut.cpp b/library/cpp/messagebus/async_result_ut.cpp index 2e96492afd..919501915c 100644 --- a/library/cpp/messagebus/async_result_ut.cpp +++ b/library/cpp/messagebus/async_result_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "async_result.h" diff --git a/library/cpp/messagebus/cc_semaphore_ut.cpp b/library/cpp/messagebus/cc_semaphore_ut.cpp index 206bb7c96a..9f2594b26a 100644 --- a/library/cpp/messagebus/cc_semaphore_ut.cpp +++ b/library/cpp/messagebus/cc_semaphore_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "cc_semaphore.h" diff --git a/library/cpp/messagebus/config/session_config.h b/library/cpp/messagebus/config/session_config.h index 84753350a9..312d776e26 100644 --- a/library/cpp/messagebus/config/session_config.h +++ b/library/cpp/messagebus/config/session_config.h @@ -3,7 +3,7 @@ #include "codegen.h" #include "defs.h" -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <util/generic/string.h> diff --git a/library/cpp/messagebus/config/ya.make b/library/cpp/messagebus/config/ya.make index 20c7dfed19..0d3f599f02 100644 --- a/library/cpp/messagebus/config/ya.make +++ b/library/cpp/messagebus/config/ya.make @@ -3,7 +3,7 @@ LIBRARY() OWNER(g:messagebus) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/deprecated/enum_codegen ) diff --git a/library/cpp/messagebus/connection.h b/library/cpp/messagebus/connection.h index b1df64ddc1..03436335fd 100644 --- a/library/cpp/messagebus/connection.h +++ b/library/cpp/messagebus/connection.h @@ -22,7 +22,7 @@ namespace NBus { EMessageStatus SendMessageAutoPtr(const TAutoPtr<T>& mes, bool wait = false) { EMessageStatus status = SendMessage(mes.Get(), wait); if (status == MESSAGE_OK) - Y_UNUSED(mes.Release()); + Y_UNUSED(mes.Release()); return status; } @@ -31,7 +31,7 @@ namespace NBus { EMessageStatus SendMessageOneWayAutoPtr(const TAutoPtr<T>& mes, bool wait = false) { EMessageStatus status = SendMessageOneWay(mes.Get(), wait); if (status == MESSAGE_OK) - Y_UNUSED(mes.Release()); + Y_UNUSED(mes.Release()); return status; } diff --git a/library/cpp/messagebus/coreconn_ut.cpp b/library/cpp/messagebus/coreconn_ut.cpp index beb6850f26..d097c762fc 100644 --- a/library/cpp/messagebus/coreconn_ut.cpp +++ b/library/cpp/messagebus/coreconn_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "coreconn.h" diff --git a/library/cpp/messagebus/debug_receiver/debug_receiver.cpp b/library/cpp/messagebus/debug_receiver/debug_receiver.cpp index 23b02d1003..4e2322fc5b 100644 --- a/library/cpp/messagebus/debug_receiver/debug_receiver.cpp +++ b/library/cpp/messagebus/debug_receiver/debug_receiver.cpp @@ -3,7 +3,7 @@ #include <library/cpp/messagebus/ybus.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <library/cpp/lwtrace/all.h> using namespace NBus; diff --git a/library/cpp/messagebus/debug_receiver/ya.make b/library/cpp/messagebus/debug_receiver/ya.make index f1b14d35bb..8e84fdfc14 100644 --- a/library/cpp/messagebus/debug_receiver/ya.make +++ b/library/cpp/messagebus/debug_receiver/ya.make @@ -9,7 +9,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/lwtrace library/cpp/messagebus ) diff --git a/library/cpp/messagebus/duration_histogram_ut.cpp b/library/cpp/messagebus/duration_histogram_ut.cpp index 01bcc095e9..7151dd1a91 100644 --- a/library/cpp/messagebus/duration_histogram_ut.cpp +++ b/library/cpp/messagebus/duration_histogram_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "duration_histogram.h" diff --git a/library/cpp/messagebus/latch_ut.cpp b/library/cpp/messagebus/latch_ut.cpp index bfab04f527..350e56a245 100644 --- a/library/cpp/messagebus/latch_ut.cpp +++ b/library/cpp/messagebus/latch_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "latch.h" diff --git a/library/cpp/messagebus/lfqueue_batch_ut.cpp b/library/cpp/messagebus/lfqueue_batch_ut.cpp index f80434c0d4..7fd7562216 100644 --- a/library/cpp/messagebus/lfqueue_batch_ut.cpp +++ b/library/cpp/messagebus/lfqueue_batch_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "lfqueue_batch.h" diff --git a/library/cpp/messagebus/local_flags_ut.cpp b/library/cpp/messagebus/local_flags_ut.cpp index 189d73eb0f..e2d3d3a9c7 100644 --- a/library/cpp/messagebus/local_flags_ut.cpp +++ b/library/cpp/messagebus/local_flags_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "local_flags.h" diff --git a/library/cpp/messagebus/memory_ut.cpp b/library/cpp/messagebus/memory_ut.cpp index 00654f28a1..34bf272379 100644 --- a/library/cpp/messagebus/memory_ut.cpp +++ b/library/cpp/messagebus/memory_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "memory.h" diff --git a/library/cpp/messagebus/message_status_counter_ut.cpp b/library/cpp/messagebus/message_status_counter_ut.cpp index 9598651329..ff56972073 100644 --- a/library/cpp/messagebus/message_status_counter_ut.cpp +++ b/library/cpp/messagebus/message_status_counter_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "message_status_counter.h" diff --git a/library/cpp/messagebus/misc/weak_ptr_ut.cpp b/library/cpp/messagebus/misc/weak_ptr_ut.cpp index 5a325278db..5b918eb086 100644 --- a/library/cpp/messagebus/misc/weak_ptr_ut.cpp +++ b/library/cpp/messagebus/misc/weak_ptr_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "weak_ptr.h" diff --git a/library/cpp/messagebus/moved_ut.cpp b/library/cpp/messagebus/moved_ut.cpp index c1a07cce7e..63a67a7c77 100644 --- a/library/cpp/messagebus/moved_ut.cpp +++ b/library/cpp/messagebus/moved_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "moved.h" diff --git a/library/cpp/messagebus/netaddr_ut.cpp b/library/cpp/messagebus/netaddr_ut.cpp index e5c68bf402..bfe5467ddb 100644 --- a/library/cpp/messagebus/netaddr_ut.cpp +++ b/library/cpp/messagebus/netaddr_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "netaddr.h" #include "test_utils.h" diff --git a/library/cpp/messagebus/network_ut.cpp b/library/cpp/messagebus/network_ut.cpp index f1798419db..3172fdf655 100644 --- a/library/cpp/messagebus/network_ut.cpp +++ b/library/cpp/messagebus/network_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "network.h" diff --git a/library/cpp/messagebus/nondestroying_holder_ut.cpp b/library/cpp/messagebus/nondestroying_holder_ut.cpp index 208042a2ba..f165781fb8 100644 --- a/library/cpp/messagebus/nondestroying_holder_ut.cpp +++ b/library/cpp/messagebus/nondestroying_holder_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "nondestroying_holder.h" diff --git a/library/cpp/messagebus/queue_config.h b/library/cpp/messagebus/queue_config.h index a9955f0c70..e442df1447 100644 --- a/library/cpp/messagebus/queue_config.h +++ b/library/cpp/messagebus/queue_config.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> namespace NBus { ////////////////////////////////////////////////////////////////// diff --git a/library/cpp/messagebus/rain_check/core/coro_ut.cpp b/library/cpp/messagebus/rain_check/core/coro_ut.cpp index 61a33584a5..e39b197cbc 100644 --- a/library/cpp/messagebus/rain_check/core/coro_ut.cpp +++ b/library/cpp/messagebus/rain_check/core/coro_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "coro.h" #include "spawn.h" diff --git a/library/cpp/messagebus/rain_check/core/simple_ut.cpp b/library/cpp/messagebus/rain_check/core/simple_ut.cpp index d4545e05aa..1baede3396 100644 --- a/library/cpp/messagebus/rain_check/core/simple_ut.cpp +++ b/library/cpp/messagebus/rain_check/core/simple_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/rain_check/test/ut/test.h> diff --git a/library/cpp/messagebus/rain_check/core/sleep_ut.cpp b/library/cpp/messagebus/rain_check/core/sleep_ut.cpp index 2ae85a87b1..5703511bfa 100644 --- a/library/cpp/messagebus/rain_check/core/sleep_ut.cpp +++ b/library/cpp/messagebus/rain_check/core/sleep_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/rain_check/test/ut/test.h> diff --git a/library/cpp/messagebus/rain_check/core/spawn_ut.cpp b/library/cpp/messagebus/rain_check/core/spawn_ut.cpp index ba5a5e41cf..8559d56d91 100644 --- a/library/cpp/messagebus/rain_check/core/spawn_ut.cpp +++ b/library/cpp/messagebus/rain_check/core/spawn_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/rain_check/test/helper/misc.h> #include <library/cpp/messagebus/rain_check/test/ut/test.h> diff --git a/library/cpp/messagebus/rain_check/core/track_ut.cpp b/library/cpp/messagebus/rain_check/core/track_ut.cpp index 05f7de1319..e73cc5ebc1 100644 --- a/library/cpp/messagebus/rain_check/core/track_ut.cpp +++ b/library/cpp/messagebus/rain_check/core/track_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "track.h" diff --git a/library/cpp/messagebus/rain_check/http/client.cpp b/library/cpp/messagebus/rain_check/http/client.cpp index 5ef5ceeece..a8fbc8b820 100644 --- a/library/cpp/messagebus/rain_check/http/client.cpp +++ b/library/cpp/messagebus/rain_check/http/client.cpp @@ -79,7 +79,7 @@ namespace NRainCheck { headers.OutTo(&headersText); NNeh::NHttp::MakeFullRequest(msg, headersText.Str(), TString()); FullProtocol->ScheduleRequest(msg, callback.Get(), stat); - Y_UNUSED(callback.Release()); + Y_UNUSED(callback.Release()); } catch (const TNetworkResolutionError& err) { future->SetFail(THttpFuture::CantResolveNameError, err.AsStrBuf()); } catch (const yexception& err) { @@ -100,7 +100,7 @@ namespace NRainCheck { GetProtocol->ScheduleRequest(NNeh::TMessage::FromString(request), callback.Get(), stat); - Y_UNUSED(callback.Release()); + Y_UNUSED(callback.Release()); } catch (const TNetworkResolutionError& err) { future->SetFail(THttpFuture::CantResolveNameError, err.AsStrBuf()); } catch (const yexception& err) { diff --git a/library/cpp/messagebus/rain_check/http/client_ut.cpp b/library/cpp/messagebus/rain_check/http/client_ut.cpp index 1628114391..96fc8e213e 100644 --- a/library/cpp/messagebus/rain_check/http/client_ut.cpp +++ b/library/cpp/messagebus/rain_check/http/client_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "client.h" #include "http_code_extractor.h" diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp index daac8d9a99..bad491bf7c 100644 --- a/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp +++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_client.cpp @@ -31,7 +31,7 @@ void TBusClientService::SendCommon(NBus::TBusMessage* message, const NBus::TNetA void TBusClientService::ProcessResultCommon(NBus::TBusMessageAutoPtr message, const NBus::TNetAddr&, TBusFuture* future, NBus::EMessageStatus status) { - Y_UNUSED(message.Release()); + Y_UNUSED(message.Release()); if (status == NBus::MESSAGE_OK) { return; @@ -67,7 +67,7 @@ void TBusClientService::OnReply( TAutoPtr<TBusMessage> response) { TBusFuture* future = (TBusFuture*)request->Data; Y_ASSERT(future->Request.Get() == request.Get()); - Y_UNUSED(request.Release()); + Y_UNUSED(request.Release()); future->SetDoneAndSchedule(MESSAGE_OK, response); } @@ -75,7 +75,7 @@ void NRainCheck::TBusClientService::OnMessageSentOneWay( TAutoPtr<NBus::TBusMessage> request) { TBusFuture* future = (TBusFuture*)request->Data; Y_ASSERT(future->Request.Get() == request.Get()); - Y_UNUSED(request.Release()); + Y_UNUSED(request.Release()); future->SetDoneAndSchedule(MESSAGE_OK, nullptr); } @@ -87,7 +87,7 @@ void TBusClientService::OnError( TBusFuture* future = (TBusFuture*)message->Data; Y_ASSERT(future->Request.Get() == message.Get()); - Y_UNUSED(message.Release()); + Y_UNUSED(message.Release()); future->SetDoneAndSchedule(status, nullptr); } diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp index 1b3618558b..3dbe762745 100644 --- a/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp +++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_client_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "messagebus_client.h" diff --git a/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp b/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp index 7c11399f1b..0788571750 100644 --- a/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp +++ b/library/cpp/messagebus/rain_check/messagebus/messagebus_server_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "messagebus_server.h" diff --git a/library/cpp/messagebus/rain_check/test/ut/ya.make b/library/cpp/messagebus/rain_check/test/ut/ya.make index 9f7a93417a..ba9a286b59 100644 --- a/library/cpp/messagebus/rain_check/test/ut/ya.make +++ b/library/cpp/messagebus/rain_check/test/ut/ya.make @@ -3,7 +3,7 @@ PROGRAM(library-messagebus-rain_check-test-ut) OWNER(g:messagebus) PEERDIR( - library/cpp/testing/unittest_main + library/cpp/testing/unittest_main library/cpp/messagebus/rain_check/core library/cpp/messagebus/rain_check/http library/cpp/messagebus/rain_check/messagebus diff --git a/library/cpp/messagebus/scheduler/scheduler.h b/library/cpp/messagebus/scheduler/scheduler.h index afcc0de55d..0c9ec71af8 100644 --- a/library/cpp/messagebus/scheduler/scheduler.h +++ b/library/cpp/messagebus/scheduler/scheduler.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> #include <util/datetime/base.h> #include <util/generic/object_counter.h> diff --git a/library/cpp/messagebus/scheduler/scheduler_ut.cpp b/library/cpp/messagebus/scheduler/scheduler_ut.cpp index a5ea641c10..f26e5b6280 100644 --- a/library/cpp/messagebus/scheduler/scheduler_ut.cpp +++ b/library/cpp/messagebus/scheduler/scheduler_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "scheduler.h" diff --git a/library/cpp/messagebus/scheduler/ya.make b/library/cpp/messagebus/scheduler/ya.make index dcb7408a20..2f23896d13 100644 --- a/library/cpp/messagebus/scheduler/ya.make +++ b/library/cpp/messagebus/scheduler/ya.make @@ -3,7 +3,7 @@ LIBRARY() OWNER(g:messagebus) PEERDIR( - library/cpp/threading/future + library/cpp/threading/future ) SRCS( diff --git a/library/cpp/messagebus/scheduler_actor_ut.cpp b/library/cpp/messagebus/scheduler_actor_ut.cpp index e81ffd3186..c7ecd82967 100644 --- a/library/cpp/messagebus/scheduler_actor_ut.cpp +++ b/library/cpp/messagebus/scheduler_actor_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "scheduler_actor.h" #include "misc/test_sync.h" diff --git a/library/cpp/messagebus/session.h b/library/cpp/messagebus/session.h index fb12ab7c22..0e47ea1351 100644 --- a/library/cpp/messagebus/session.h +++ b/library/cpp/messagebus/session.h @@ -88,7 +88,7 @@ namespace NBus { EMessageStatus SendMessageAutoPtr(const TAutoPtr<T>& mes, const TNetAddr* addr = nullptr, bool wait = false) { EMessageStatus status = SendMessage(mes.Get(), addr, wait); if (status == MESSAGE_OK) - Y_UNUSED(mes.Release()); + Y_UNUSED(mes.Release()); return status; } @@ -97,7 +97,7 @@ namespace NBus { EMessageStatus SendMessageOneWayAutoPtr(const TAutoPtr<T>& mes, const TNetAddr* addr = nullptr, bool wait = false) { EMessageStatus status = SendMessageOneWay(mes.Get(), addr, wait); if (status == MESSAGE_OK) - Y_UNUSED(mes.Release()); + Y_UNUSED(mes.Release()); return status; } @@ -138,7 +138,7 @@ namespace NBus { EMessageStatus SendReplyAutoPtr(TBusIdentity& ident, TAutoPtr<U>& resp) { EMessageStatus status = SendReply(const_cast<const TBusIdentity&>(ident), resp.Get()); if (status == MESSAGE_OK) { - Y_UNUSED(resp.Release()); + Y_UNUSED(resp.Release()); } return status; } diff --git a/library/cpp/messagebus/session_impl.h b/library/cpp/messagebus/session_impl.h index 90ef246ff8..ba6a47cca8 100644 --- a/library/cpp/messagebus/session_impl.h +++ b/library/cpp/messagebus/session_impl.h @@ -14,7 +14,7 @@ #include <library/cpp/messagebus/actor/queue_in_actor.h> #include <library/cpp/messagebus/monitoring/mon_proto.pb.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> #include <util/generic/array_ref.h> #include <util/generic/string.h> diff --git a/library/cpp/messagebus/socket_addr_ut.cpp b/library/cpp/messagebus/socket_addr_ut.cpp index 783bb62a86..6f82f54ad3 100644 --- a/library/cpp/messagebus/socket_addr_ut.cpp +++ b/library/cpp/messagebus/socket_addr_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "netaddr.h" #include "socket_addr.h" diff --git a/library/cpp/messagebus/synchandler.cpp b/library/cpp/messagebus/synchandler.cpp index 8e891d66b3..09613fca06 100644 --- a/library/cpp/messagebus/synchandler.cpp +++ b/library/cpp/messagebus/synchandler.cpp @@ -194,5 +194,5 @@ TBusSyncClientSessionPtr TBusMessageQueue::CreateSyncSource(TBusProtocol* proto, void TBusMessageQueue::Destroy(TBusSyncClientSessionPtr session) { Destroy(session->Session.Get()); - Y_UNUSED(session->Session.Release()); + Y_UNUSED(session->Session.Release()); } diff --git a/library/cpp/messagebus/test/helper/example.cpp b/library/cpp/messagebus/test/helper/example.cpp index 7c6d704042..957887ed3d 100644 --- a/library/cpp/messagebus/test/helper/example.cpp +++ b/library/cpp/messagebus/test/helper/example.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "example.h" diff --git a/library/cpp/messagebus/test/helper/example.h b/library/cpp/messagebus/test/helper/example.h index 26b7475308..acd5615ddc 100644 --- a/library/cpp/messagebus/test/helper/example.h +++ b/library/cpp/messagebus/test/helper/example.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "alloc_counter.h" #include "message_handler_error.h" diff --git a/library/cpp/messagebus/test/helper/fixed_port.cpp b/library/cpp/messagebus/test/helper/fixed_port.cpp index 258da0d1a5..271fb1f868 100644 --- a/library/cpp/messagebus/test/helper/fixed_port.cpp +++ b/library/cpp/messagebus/test/helper/fixed_port.cpp @@ -1,10 +1,10 @@ #include "fixed_port.h" -#include <util/system/env.h> +#include <util/system/env.h> #include <stdlib.h> bool NBus::NTest::IsFixedPortTestAllowed() { // TODO: report skipped tests to test - return !GetEnv("MB_TESTS_SKIP_FIXED_PORT"); + return !GetEnv("MB_TESTS_SKIP_FIXED_PORT"); } diff --git a/library/cpp/messagebus/test/helper/object_count_check.h b/library/cpp/messagebus/test/helper/object_count_check.h index 1c4756e58c..304f7575ee 100644 --- a/library/cpp/messagebus/test/helper/object_count_check.h +++ b/library/cpp/messagebus/test/helper/object_count_check.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/remote_client_connection.h> #include <library/cpp/messagebus/remote_client_session.h> diff --git a/library/cpp/messagebus/test/perftest/perftest.cpp b/library/cpp/messagebus/test/perftest/perftest.cpp index 8489319278..befae8c2d0 100644 --- a/library/cpp/messagebus/test/perftest/perftest.cpp +++ b/library/cpp/messagebus/test/perftest/perftest.cpp @@ -11,10 +11,10 @@ #include <library/cpp/deprecated/threadable/threadable.h> #include <library/cpp/execprofile/profile.h> -#include <library/cpp/getopt/opt.h> +#include <library/cpp/getopt/opt.h> #include <library/cpp/lwtrace/start.h> #include <library/cpp/sighandler/async_signals_handler.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> #include <util/generic/ptr.h> #include <util/generic/string.h> diff --git a/library/cpp/messagebus/test/perftest/ya.make b/library/cpp/messagebus/test/perftest/ya.make index 24c2848ed5..7cd3e59446 100644 --- a/library/cpp/messagebus/test/perftest/ya.make +++ b/library/cpp/messagebus/test/perftest/ya.make @@ -5,14 +5,14 @@ OWNER(g:messagebus) PEERDIR( library/cpp/deprecated/threadable library/cpp/execprofile - library/cpp/getopt + library/cpp/getopt library/cpp/lwtrace library/cpp/messagebus library/cpp/messagebus/oldmodule library/cpp/messagebus/protobuf library/cpp/messagebus/www library/cpp/sighandler - library/cpp/threading/future + library/cpp/threading/future ) SRCS( diff --git a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp index 3fdd175d73..1e0cbe3432 100644 --- a/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp +++ b/library/cpp/messagebus/test/ut/locator_uniq_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/test_utils.h> #include <library/cpp/messagebus/ybus.h> diff --git a/library/cpp/messagebus/test/ut/messagebus_ut.cpp b/library/cpp/messagebus/test/ut/messagebus_ut.cpp index 040f9b7702..8de18eeccb 100644 --- a/library/cpp/messagebus/test/ut/messagebus_ut.cpp +++ b/library/cpp/messagebus/test/ut/messagebus_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/test/helper/example.h> #include <library/cpp/messagebus/test/helper/fixed_port.h> @@ -733,7 +733,7 @@ Y_UNIT_TEST_SUITE(TMessageBusTests) { // intentionally don't destroy the message // we will try to resend it - Y_UNUSED(message.Release()); + Y_UNUSED(message.Release()); TestSync.CheckAndIncrement(1); } diff --git a/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp b/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp index 4083cf3b7b..70981848ed 100644 --- a/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp +++ b/library/cpp/messagebus/test/ut/module_client_one_way_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/test/helper/example.h> #include <library/cpp/messagebus/test/helper/message_handler_error.h> diff --git a/library/cpp/messagebus/test/ut/module_client_ut.cpp b/library/cpp/messagebus/test/ut/module_client_ut.cpp index ebfe185cc6..9b4157ef30 100644 --- a/library/cpp/messagebus/test/ut/module_client_ut.cpp +++ b/library/cpp/messagebus/test/ut/module_client_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "count_down_latch.h" #include "moduletest.h" diff --git a/library/cpp/messagebus/test/ut/module_server_ut.cpp b/library/cpp/messagebus/test/ut/module_server_ut.cpp index 88fe1dd9b6..97ac28ee6f 100644 --- a/library/cpp/messagebus/test/ut/module_server_ut.cpp +++ b/library/cpp/messagebus/test/ut/module_server_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "count_down_latch.h" #include "moduletest.h" diff --git a/library/cpp/messagebus/test/ut/starter_ut.cpp b/library/cpp/messagebus/test/ut/starter_ut.cpp index dd4d3aaa5e..ccb927ca5d 100644 --- a/library/cpp/messagebus/test/ut/starter_ut.cpp +++ b/library/cpp/messagebus/test/ut/starter_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/messagebus/test/helper/example_module.h> #include <library/cpp/messagebus/test/helper/object_count_check.h> diff --git a/library/cpp/messagebus/test/ut/ya.make b/library/cpp/messagebus/test/ut/ya.make index fe1b4961d6..a4539687f9 100644 --- a/library/cpp/messagebus/test/ut/ya.make +++ b/library/cpp/messagebus/test/ut/ya.make @@ -14,7 +14,7 @@ TAG( FORK_SUBTESTS() PEERDIR( - library/cpp/testing/unittest_main + library/cpp/testing/unittest_main library/cpp/messagebus library/cpp/messagebus/test/helper library/cpp/messagebus/www diff --git a/library/cpp/messagebus/text_utils.h b/library/cpp/messagebus/text_utils.h index c2dcad834c..5014e963fc 100644 --- a/library/cpp/messagebus/text_utils.h +++ b/library/cpp/messagebus/text_utils.h @@ -1,3 +1,3 @@ #pragma once -#include <library/cpp/string_utils/indent_text/indent_text.h> +#include <library/cpp/string_utils/indent_text/indent_text.h> diff --git a/library/cpp/messagebus/vector_swaps_ut.cpp b/library/cpp/messagebus/vector_swaps_ut.cpp index 693cc6857b..3d76f67963 100644 --- a/library/cpp/messagebus/vector_swaps_ut.cpp +++ b/library/cpp/messagebus/vector_swaps_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "vector_swaps.h" diff --git a/library/cpp/messagebus/www/www.h b/library/cpp/messagebus/www/www.h index 6cd652b477..4168a617cf 100644 --- a/library/cpp/messagebus/www/www.h +++ b/library/cpp/messagebus/www/www.h @@ -5,7 +5,7 @@ #include <util/generic/ptr.h> #include <util/generic/string.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> namespace NBus { class TBusWww: public TAtomicRefCount<TBusWww> { diff --git a/library/cpp/messagebus/www/ya.make b/library/cpp/messagebus/www/ya.make index 972390cea3..9c9f7c9c03 100644 --- a/library/cpp/messagebus/www/ya.make +++ b/library/cpp/messagebus/www/ya.make @@ -15,7 +15,7 @@ ARCHIVE( PEERDIR( library/cpp/archive - library/cpp/cgiparam + library/cpp/cgiparam library/cpp/html/pcdata library/cpp/http/fetch library/cpp/http/server diff --git a/library/cpp/messagebus/ya.make b/library/cpp/messagebus/ya.make index e13cf06dea..49d88353ea 100644 --- a/library/cpp/messagebus/ya.make +++ b/library/cpp/messagebus/ya.make @@ -55,14 +55,14 @@ PEERDIR( contrib/libs/sparsehash library/cpp/codecs library/cpp/deprecated/enum_codegen - library/cpp/getopt/small + library/cpp/getopt/small library/cpp/lwtrace library/cpp/messagebus/actor library/cpp/messagebus/config library/cpp/messagebus/monitoring library/cpp/messagebus/scheduler - library/cpp/string_utils/indent_text - library/cpp/threading/future + library/cpp/string_utils/indent_text + library/cpp/threading/future ) END() diff --git a/library/cpp/monlib/counters/counters_ut.cpp b/library/cpp/monlib/counters/counters_ut.cpp index 2845efb97b..c5bdd1aa00 100644 --- a/library/cpp/monlib/counters/counters_ut.cpp +++ b/library/cpp/monlib/counters/counters_ut.cpp @@ -1,6 +1,6 @@ #include "counters.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/set.h> #include <util/thread/pool.h> diff --git a/library/cpp/monlib/counters/histogram_ut.cpp b/library/cpp/monlib/counters/histogram_ut.cpp index 5a0800505a..2645ba6b73 100644 --- a/library/cpp/monlib/counters/histogram_ut.cpp +++ b/library/cpp/monlib/counters/histogram_ut.cpp @@ -1,6 +1,6 @@ #include "histogram.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/counters/meter_ut.cpp b/library/cpp/monlib/counters/meter_ut.cpp index b507d16fbd..dd9d27625f 100644 --- a/library/cpp/monlib/counters/meter_ut.cpp +++ b/library/cpp/monlib/counters/meter_ut.cpp @@ -1,6 +1,6 @@ #include "meter.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/counters/timer_ut.cpp b/library/cpp/monlib/counters/timer_ut.cpp index c5cd07e89d..e29b8e22b4 100644 --- a/library/cpp/monlib/counters/timer_ut.cpp +++ b/library/cpp/monlib/counters/timer_ut.cpp @@ -1,6 +1,6 @@ #include "timer.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; using namespace std::literals::chrono_literals; diff --git a/library/cpp/monlib/deprecated/json/writer_ut.cpp b/library/cpp/monlib/deprecated/json/writer_ut.cpp index 1f9fc8f393..d2d75e5aa7 100644 --- a/library/cpp/monlib/deprecated/json/writer_ut.cpp +++ b/library/cpp/monlib/deprecated/json/writer_ut.cpp @@ -1,6 +1,6 @@ #include "writer.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/contention_ut.cpp b/library/cpp/monlib/dynamic_counters/contention_ut.cpp index 8798044ee3..ffccc9b702 100644 --- a/library/cpp/monlib/dynamic_counters/contention_ut.cpp +++ b/library/cpp/monlib/dynamic_counters/contention_ut.cpp @@ -1,5 +1,5 @@ #include "counters.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/event.h> #include <util/system/thread.h> diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h index dc178cfbe0..c7098659ad 100644 --- a/library/cpp/monlib/dynamic_counters/counters.h +++ b/library/cpp/monlib/dynamic_counters/counters.h @@ -3,8 +3,8 @@ #include <library/cpp/monlib/counters/counters.h> #include <library/cpp/monlib/metrics/histogram_collector.h> -#include <library/cpp/threading/light_rw_lock/lightrwlock.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/threading/light_rw_lock/lightrwlock.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/cast.h> #include <util/generic/map.h> diff --git a/library/cpp/monlib/dynamic_counters/counters_ut.cpp b/library/cpp/monlib/dynamic_counters/counters_ut.cpp index 3591037e0a..727bc21840 100644 --- a/library/cpp/monlib/dynamic_counters/counters_ut.cpp +++ b/library/cpp/monlib/dynamic_counters/counters_ut.cpp @@ -1,6 +1,6 @@ #include "counters.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/encode_ut.cpp b/library/cpp/monlib/dynamic_counters/encode_ut.cpp index 52d77b6b41..9567fea3cf 100644 --- a/library/cpp/monlib/dynamic_counters/encode_ut.cpp +++ b/library/cpp/monlib/dynamic_counters/encode_ut.cpp @@ -5,7 +5,7 @@ #include <library/cpp/monlib/encode/protobuf/protobuf.h> #include <library/cpp/monlib/encode/protobuf/protos/samples.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/buffer.h> #include <util/stream/buffer.h> diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h b/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h index 0042cd9a6a..8090c96192 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h +++ b/library/cpp/monlib/dynamic_counters/percentile/percentile_lg.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/bitops.h> diff --git a/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp b/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp index 6c8bb54ec9..d283f0179d 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp +++ b/library/cpp/monlib/dynamic_counters/percentile/percentile_ut.cpp @@ -1,5 +1,5 @@ #include "percentile_lg.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/dynamic_counters/percentile/ya.make b/library/cpp/monlib/dynamic_counters/percentile/ya.make index cb52cdd9ad..9f7dd9d4e8 100644 --- a/library/cpp/monlib/dynamic_counters/percentile/ya.make +++ b/library/cpp/monlib/dynamic_counters/percentile/ya.make @@ -8,7 +8,7 @@ LIBRARY() ) PEERDIR( - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/monlib/dynamic_counters ) diff --git a/library/cpp/monlib/dynamic_counters/ya.make b/library/cpp/monlib/dynamic_counters/ya.make index aafe1c34be..c98e4e4d3e 100644 --- a/library/cpp/monlib/dynamic_counters/ya.make +++ b/library/cpp/monlib/dynamic_counters/ya.make @@ -15,13 +15,13 @@ SRCS( ) PEERDIR( - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/monlib/encode/json library/cpp/monlib/encode/spack library/cpp/monlib/encode/prometheus library/cpp/monlib/service/pages - library/cpp/string_utils/quote - library/cpp/threading/light_rw_lock + library/cpp/string_utils/quote + library/cpp/threading/light_rw_lock ) END() diff --git a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp b/library/cpp/monlib/encode/buffered/string_pool_ut.cpp index 9fc3421d0b..41aaecad6d 100644 --- a/library/cpp/monlib/encode/buffered/string_pool_ut.cpp +++ b/library/cpp/monlib/encode/buffered/string_pool_ut.cpp @@ -1,6 +1,6 @@ #include "string_pool.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/encode/format_ut.cpp b/library/cpp/monlib/encode/format_ut.cpp index 22a0e30c03..89888257c8 100644 --- a/library/cpp/monlib/encode/format_ut.cpp +++ b/library/cpp/monlib/encode/format_ut.cpp @@ -1,6 +1,6 @@ #include "format.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/string/builder.h> diff --git a/library/cpp/monlib/encode/json/json_ut.cpp b/library/cpp/monlib/encode/json/json_ut.cpp index 09e7909289..096735573b 100644 --- a/library/cpp/monlib/encode/json/json_ut.cpp +++ b/library/cpp/monlib/encode/json/json_ut.cpp @@ -5,7 +5,7 @@ #include <library/cpp/json/json_reader.h> #include <library/cpp/resource/resource.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> #include <util/string/builder.h> diff --git a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp index 53683cb39c..794b94fac9 100644 --- a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp +++ b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp @@ -1,6 +1,6 @@ #include "legacy_protobuf.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.pb.h> #include <library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.h> diff --git a/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp b/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp index 49c2244fb4..a084f1632e 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp +++ b/library/cpp/monlib/encode/prometheus/prometheus_decoder_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/monlib/encode/protobuf/protobuf.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp b/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp index fd9debb060..f10fe2282d 100644 --- a/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp +++ b/library/cpp/monlib/encode/prometheus/prometheus_encoder_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/monlib/metrics/metric_value.h> #include <library/cpp/monlib/metrics/histogram_snapshot.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> diff --git a/library/cpp/monlib/encode/spack/spack_v1_ut.cpp b/library/cpp/monlib/encode/spack/spack_v1_ut.cpp index fe778eb7e0..57c163abaa 100644 --- a/library/cpp/monlib/encode/spack/spack_v1_ut.cpp +++ b/library/cpp/monlib/encode/spack/spack_v1_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/monlib/metrics/labels.h> #include <library/cpp/monlib/metrics/metric.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/buffer.h> #include <util/stream/buffer.h> diff --git a/library/cpp/monlib/encode/text/text_encoder_ut.cpp b/library/cpp/monlib/encode/text/text_encoder_ut.cpp index 554b6f5fa9..c387072a7c 100644 --- a/library/cpp/monlib/encode/text/text_encoder_ut.cpp +++ b/library/cpp/monlib/encode/text/text_encoder_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/monlib/metrics/histogram_collector.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/encode/unistat/unistat_ut.cpp b/library/cpp/monlib/encode/unistat/unistat_ut.cpp index dbbc238bf3..1185ce2a4e 100644 --- a/library/cpp/monlib/encode/unistat/unistat_ut.cpp +++ b/library/cpp/monlib/encode/unistat/unistat_ut.cpp @@ -3,7 +3,7 @@ #include <library/cpp/monlib/encode/protobuf/protobuf.h> #include <library/cpp/monlib/metrics/labels.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/ewma_ut.cpp b/library/cpp/monlib/metrics/ewma_ut.cpp index 01ef2478f7..d2d1adadb4 100644 --- a/library/cpp/monlib/metrics/ewma_ut.cpp +++ b/library/cpp/monlib/metrics/ewma_ut.cpp @@ -1,7 +1,7 @@ #include "ewma.h" #include "metric.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/histogram_collector_ut.cpp b/library/cpp/monlib/metrics/histogram_collector_ut.cpp index 1cf66507fa..b77317f614 100644 --- a/library/cpp/monlib/metrics/histogram_collector_ut.cpp +++ b/library/cpp/monlib/metrics/histogram_collector_ut.cpp @@ -1,6 +1,6 @@ #include "histogram_collector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/labels_ut.cpp b/library/cpp/monlib/metrics/labels_ut.cpp index f0e4f532ab..f5270fe5f6 100644 --- a/library/cpp/monlib/metrics/labels_ut.cpp +++ b/library/cpp/monlib/metrics/labels_ut.cpp @@ -1,6 +1,6 @@ #include "labels.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/metric_registry.h b/library/cpp/monlib/metrics/metric_registry.h index 670cf8651e..3904302953 100644 --- a/library/cpp/monlib/metrics/metric_registry.h +++ b/library/cpp/monlib/metrics/metric_registry.h @@ -5,7 +5,7 @@ #include <util/system/rwlock.h> -#include <library/cpp/threading/light_rw_lock/lightrwlock.h> +#include <library/cpp/threading/light_rw_lock/lightrwlock.h> namespace NMonitoring { diff --git a/library/cpp/monlib/metrics/metric_registry_ut.cpp b/library/cpp/monlib/metrics/metric_registry_ut.cpp index 86d9a52ec0..6f826864c5 100644 --- a/library/cpp/monlib/metrics/metric_registry_ut.cpp +++ b/library/cpp/monlib/metrics/metric_registry_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/monlib/encode/json/json.h> #include <library/cpp/resource/resource.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/str.h> diff --git a/library/cpp/monlib/metrics/metric_value_ut.cpp b/library/cpp/monlib/metrics/metric_value_ut.cpp index 49b47c4057..e3d99befdd 100644 --- a/library/cpp/monlib/metrics/metric_value_ut.cpp +++ b/library/cpp/monlib/metrics/metric_value_ut.cpp @@ -1,6 +1,6 @@ #include "metric_value.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NMonitoring; diff --git a/library/cpp/monlib/metrics/summary_collector_ut.cpp b/library/cpp/monlib/metrics/summary_collector_ut.cpp index 191929550f..08dcb87d76 100644 --- a/library/cpp/monlib/metrics/summary_collector_ut.cpp +++ b/library/cpp/monlib/metrics/summary_collector_ut.cpp @@ -1,6 +1,6 @@ #include "summary_collector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> diff --git a/library/cpp/monlib/metrics/timer_ut.cpp b/library/cpp/monlib/metrics/timer_ut.cpp index c244a8c9e1..e1039b06d9 100644 --- a/library/cpp/monlib/metrics/timer_ut.cpp +++ b/library/cpp/monlib/metrics/timer_ut.cpp @@ -1,8 +1,8 @@ #include "timer.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/threading/future/async.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/threading/future/async.h> +#include <library/cpp/threading/future/future.h> using namespace NMonitoring; using namespace NThreading; diff --git a/library/cpp/monlib/service/monservice.cpp b/library/cpp/monlib/service/monservice.cpp index d1b9cda1d2..6f3a01a332 100644 --- a/library/cpp/monlib/service/monservice.cpp +++ b/library/cpp/monlib/service/monservice.cpp @@ -1,7 +1,7 @@ #include "monservice.h" #include <library/cpp/malloc/api/malloc.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <library/cpp/svnversion/svnversion.h> #include <util/generic/map.h> diff --git a/library/cpp/monlib/service/service.cpp b/library/cpp/monlib/service/service.cpp index 929efbf816..8a9b3d2f4c 100644 --- a/library/cpp/monlib/service/service.cpp +++ b/library/cpp/monlib/service/service.cpp @@ -158,7 +158,7 @@ namespace NMonitoring { void TCoHttpServer::OnAcceptFull(const TAcceptFull& acc) { THolder<TConnection> conn(new TConnection(acc, *this)); Executor.Create(*conn, "client"); - Y_UNUSED(conn.Release()); + Y_UNUSED(conn.Release()); } void TCoHttpServer::OnError() { diff --git a/library/cpp/monlib/service/service.h b/library/cpp/monlib/service/service.h index 2f66dddaf8..99d23ff79c 100644 --- a/library/cpp/monlib/service/service.h +++ b/library/cpp/monlib/service/service.h @@ -7,7 +7,7 @@ #include <library/cpp/logger/all.h> #include <util/network/ip.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> #include <functional> diff --git a/library/cpp/monlib/service/ya.make b/library/cpp/monlib/service/ya.make index ad088fc2c6..2e37724945 100644 --- a/library/cpp/monlib/service/ya.make +++ b/library/cpp/monlib/service/ya.make @@ -11,7 +11,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 contrib/libs/protobuf library/cpp/coroutine/engine library/cpp/coroutine/listener @@ -22,7 +22,7 @@ PEERDIR( library/cpp/malloc/api library/cpp/svnversion library/cpp/uri - library/cpp/cgiparam + library/cpp/cgiparam ) END() diff --git a/library/cpp/object_factory/object_factory_ut.cpp b/library/cpp/object_factory/object_factory_ut.cpp index 06fb0739ff..6e9dcfbcc5 100644 --- a/library/cpp/object_factory/object_factory_ut.cpp +++ b/library/cpp/object_factory/object_factory_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/object_factory/object_factory.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/noncopyable.h> #include <util/generic/string.h> diff --git a/library/cpp/on_disk/chunks/chunks_ut.cpp b/library/cpp/on_disk/chunks/chunks_ut.cpp index f727647f7f..f79a9c8cf4 100644 --- a/library/cpp/on_disk/chunks/chunks_ut.cpp +++ b/library/cpp/on_disk/chunks/chunks_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> #include <util/system/filemap.h> diff --git a/library/cpp/on_disk/ya.make b/library/cpp/on_disk/ya.make index 42a79d37bd..0137c23c9f 100644 --- a/library/cpp/on_disk/ya.make +++ b/library/cpp/on_disk/ya.make @@ -1,4 +1,4 @@ -RECURSE( +RECURSE( 2d_array 2d_array/ut 4d_array @@ -14,8 +14,8 @@ RECURSE( coded_blob/common coded_blob/keys coded_blob/ut - file_with_header - file_with_header/ut + file_with_header + file_with_header/ut fried_trie head_ar head_ar/ut @@ -28,4 +28,4 @@ RECURSE( tar_archive/ut st_hash st_hash/ut -) +) diff --git a/library/cpp/openssl/holders/ut/evp_ut.cpp b/library/cpp/openssl/holders/ut/evp_ut.cpp index 0f8c0aed01..49463cd9c3 100644 --- a/library/cpp/openssl/holders/ut/evp_ut.cpp +++ b/library/cpp/openssl/holders/ut/evp_ut.cpp @@ -1,6 +1,6 @@ #include "evp.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(Evp) { Y_UNIT_TEST(Cipher) { diff --git a/library/cpp/openssl/holders/ut/hmac_ut.cpp b/library/cpp/openssl/holders/ut/hmac_ut.cpp index 60f561c337..a452745263 100644 --- a/library/cpp/openssl/holders/ut/hmac_ut.cpp +++ b/library/cpp/openssl/holders/ut/hmac_ut.cpp @@ -1,6 +1,6 @@ #include "hmac.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(Hmac) { Y_UNIT_TEST(Ctx) { diff --git a/library/cpp/openssl/io/ut/builtin_ut.cpp b/library/cpp/openssl/io/ut/builtin_ut.cpp index 987cd08492..54bea365ab 100644 --- a/library/cpp/openssl/io/ut/builtin_ut.cpp +++ b/library/cpp/openssl/io/ut/builtin_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/openssl/io/stream.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(Builtin) { Y_UNIT_TEST(Init) { diff --git a/library/cpp/openssl/method/ut/io_ut.cpp b/library/cpp/openssl/method/ut/io_ut.cpp index bff2b23d31..d146e0667b 100644 --- a/library/cpp/openssl/method/ut/io_ut.cpp +++ b/library/cpp/openssl/method/ut/io_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/openssl/method/io.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TTestIO : public NOpenSSL::TAbstractIO { public: diff --git a/library/cpp/packedtypes/longs_ut.cpp b/library/cpp/packedtypes/longs_ut.cpp index 8b06c934d2..0aecf461b7 100644 --- a/library/cpp/packedtypes/longs_ut.cpp +++ b/library/cpp/packedtypes/longs_ut.cpp @@ -1,6 +1,6 @@ #include "longs.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/digest/old_crc/crc.h> #include <util/string/util.h> diff --git a/library/cpp/packedtypes/packed_ut.cpp b/library/cpp/packedtypes/packed_ut.cpp index 70a22cf9c3..ae0815986a 100644 --- a/library/cpp/packedtypes/packed_ut.cpp +++ b/library/cpp/packedtypes/packed_ut.cpp @@ -1,6 +1,6 @@ #include "packed.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/defaults.h> #include <util/generic/ylimits.h> diff --git a/library/cpp/packedtypes/packedfloat_ut.cpp b/library/cpp/packedtypes/packedfloat_ut.cpp index f61e49014c..26f2155c83 100644 --- a/library/cpp/packedtypes/packedfloat_ut.cpp +++ b/library/cpp/packedtypes/packedfloat_ut.cpp @@ -1,6 +1,6 @@ #include "packedfloat.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> diff --git a/library/cpp/packedtypes/zigzag_ut.cpp b/library/cpp/packedtypes/zigzag_ut.cpp index 13b78b7481..e012a8c0d5 100644 --- a/library/cpp/packedtypes/zigzag_ut.cpp +++ b/library/cpp/packedtypes/zigzag_ut.cpp @@ -1,6 +1,6 @@ #include "zigzag.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TZigZagTest) { template <typename T> diff --git a/library/cpp/packers/README.md b/library/cpp/packers/README.md index c635bf8c8a..58f22cd2db 100644 --- a/library/cpp/packers/README.md +++ b/library/cpp/packers/README.md @@ -1,2 +1,2 @@ -A library of packers used to serialize data in the library/cpp/containers/comptrie. +A library of packers used to serialize data in the library/cpp/containers/comptrie. It is specially excluded as separate library since many packers are of standalone interest. diff --git a/library/cpp/packers/ut/packers_ut.cpp b/library/cpp/packers/ut/packers_ut.cpp index 18ce2150d1..6d46c2917c 100644 --- a/library/cpp/packers/ut/packers_ut.cpp +++ b/library/cpp/packers/ut/packers_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> #include <utility> diff --git a/library/cpp/packers/ut/proto_packer_ut.cpp b/library/cpp/packers/ut/proto_packer_ut.cpp index e4151ba68c..9b019a1c0c 100644 --- a/library/cpp/packers/ut/proto_packer_ut.cpp +++ b/library/cpp/packers/ut/proto_packer_ut.cpp @@ -1,7 +1,7 @@ #include "proto_packer.h" #include <library/cpp/packers/ut/test.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/library/cpp/packers/ut/region_packer_ut.cpp b/library/cpp/packers/ut/region_packer_ut.cpp index 0cb08ccf65..903ef6d393 100644 --- a/library/cpp/packers/ut/region_packer_ut.cpp +++ b/library/cpp/packers/ut/region_packer_ut.cpp @@ -1,5 +1,5 @@ #include "region_packer.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> template <typename TValue> void TestPacker() { diff --git a/library/cpp/pop_count/benchmark/main.cpp b/library/cpp/pop_count/benchmark/main.cpp index 41ea3c91cc..2266d29820 100644 --- a/library/cpp/pop_count/benchmark/main.cpp +++ b/library/cpp/pop_count/benchmark/main.cpp @@ -3,7 +3,7 @@ #include <util/system/type_name.h> #include <library/cpp/pop_count/popcount.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> template <class F, class I> inline void DoRun(F&& f, I&& i) { diff --git a/library/cpp/pop_count/popcount_ut.cpp b/library/cpp/pop_count/popcount_ut.cpp index 5cd6605411..6af800c91c 100644 --- a/library/cpp/pop_count/popcount_ut.cpp +++ b/library/cpp/pop_count/popcount_ut.cpp @@ -1,6 +1,6 @@ #include "popcount.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> diff --git a/library/cpp/protobuf/interop/ut/cast_ut.cpp b/library/cpp/protobuf/interop/ut/cast_ut.cpp index 6ef055b651..89a2596d4e 100644 --- a/library/cpp/protobuf/interop/ut/cast_ut.cpp +++ b/library/cpp/protobuf/interop/ut/cast_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/protobuf/interop/cast.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/duration.pb.h> #include <google/protobuf/timestamp.pb.h> diff --git a/library/cpp/protobuf/json/string_transform.cpp b/library/cpp/protobuf/json/string_transform.cpp index 7c42daa677..43ebc25ee8 100644 --- a/library/cpp/protobuf/json/string_transform.cpp +++ b/library/cpp/protobuf/json/string_transform.cpp @@ -2,7 +2,7 @@ #include <google/protobuf/stubs/strutil.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> namespace NProtobufJson { void TCEscapeTransform::Transform(TString& str) const { diff --git a/library/cpp/protobuf/json/string_transform.h b/library/cpp/protobuf/json/string_transform.h index e4b296bc01..74c56e2d1a 100644 --- a/library/cpp/protobuf/json/string_transform.h +++ b/library/cpp/protobuf/json/string_transform.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/generic/ptr.h> #include <util/generic/refcount.h> diff --git a/library/cpp/protobuf/json/ut/filter_ut.cpp b/library/cpp/protobuf/json/ut/filter_ut.cpp index 95c227666f..7b576145da 100644 --- a/library/cpp/protobuf/json/ut/filter_ut.cpp +++ b/library/cpp/protobuf/json/ut/filter_ut.cpp @@ -3,7 +3,7 @@ #include <library/cpp/protobuf/json/filter.h> #include <library/cpp/protobuf/json/field_option.h> #include <library/cpp/protobuf/json/proto2json.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NProtobufJson; diff --git a/library/cpp/protobuf/json/ut/inline_ut.cpp b/library/cpp/protobuf/json/ut/inline_ut.cpp index c29ad32e7d..695bfe2400 100644 --- a/library/cpp/protobuf/json/ut/inline_ut.cpp +++ b/library/cpp/protobuf/json/ut/inline_ut.cpp @@ -3,7 +3,7 @@ #include <library/cpp/protobuf/json/inline.h> #include <library/cpp/protobuf/json/field_option.h> #include <library/cpp/protobuf/json/proto2json.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/library/cpp/protobuf/json/ut/json2proto_ut.cpp b/library/cpp/protobuf/json/ut/json2proto_ut.cpp index 0dfe57bc7a..f46439c051 100644 --- a/library/cpp/protobuf/json/ut/json2proto_ut.cpp +++ b/library/cpp/protobuf/json/ut/json2proto_ut.cpp @@ -10,7 +10,7 @@ #include <library/cpp/protobuf/json/json2proto.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> #include <util/generic/string.h> diff --git a/library/cpp/protobuf/json/ut/proto2json_ut.cpp b/library/cpp/protobuf/json/ut/proto2json_ut.cpp index 07e52d7f2f..3b879b9836 100644 --- a/library/cpp/protobuf/json/ut/proto2json_ut.cpp +++ b/library/cpp/protobuf/json/ut/proto2json_ut.cpp @@ -9,7 +9,7 @@ #include <library/cpp/protobuf/json/proto2json.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> #include <util/generic/string.h> diff --git a/library/cpp/protobuf/json/ut/string_transform_ut.cpp b/library/cpp/protobuf/json/ut/string_transform_ut.cpp index a31dabcb0f..4291e20217 100644 --- a/library/cpp/protobuf/json/ut/string_transform_ut.cpp +++ b/library/cpp/protobuf/json/ut/string_transform_ut.cpp @@ -1,6 +1,6 @@ #include "json.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/protobuf/json/proto2json.h> Y_UNIT_TEST_SUITE(TDoubleEscapeTransform) { diff --git a/library/cpp/protobuf/json/ya.make b/library/cpp/protobuf/json/ya.make index 2f2c75cfdb..3afe3915e3 100644 --- a/library/cpp/protobuf/json/ya.make +++ b/library/cpp/protobuf/json/ya.make @@ -19,7 +19,7 @@ PEERDIR( contrib/libs/protobuf library/cpp/json library/cpp/protobuf/util - library/cpp/string_utils/relaxed_escaper + library/cpp/string_utils/relaxed_escaper ) END() diff --git a/library/cpp/protobuf/util/is_equal_ut.cpp b/library/cpp/protobuf/util/is_equal_ut.cpp index 3ca4c90dd5..26c5d30f55 100644 --- a/library/cpp/protobuf/util/is_equal_ut.cpp +++ b/library/cpp/protobuf/util/is_equal_ut.cpp @@ -1,7 +1,7 @@ #include "is_equal.h" #include <library/cpp/protobuf/util/ut/sample_for_is_equal.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/descriptor.h> diff --git a/library/cpp/protobuf/util/iterators_ut.cpp b/library/cpp/protobuf/util/iterators_ut.cpp index 9ebcff2963..add040e863 100644 --- a/library/cpp/protobuf/util/iterators_ut.cpp +++ b/library/cpp/protobuf/util/iterators_ut.cpp @@ -2,7 +2,7 @@ #include "simple_reflection.h" #include <library/cpp/protobuf/util/ut/common_ut.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> diff --git a/library/cpp/protobuf/util/merge_ut.cpp b/library/cpp/protobuf/util/merge_ut.cpp index 22217db183..17a0f52ecf 100644 --- a/library/cpp/protobuf/util/merge_ut.cpp +++ b/library/cpp/protobuf/util/merge_ut.cpp @@ -1,7 +1,7 @@ #include "merge.h" #include <library/cpp/protobuf/util/ut/common_ut.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NProtoBuf; diff --git a/library/cpp/protobuf/util/pb_io.cpp b/library/cpp/protobuf/util/pb_io.cpp index 6270ee0624..553939ef96 100644 --- a/library/cpp/protobuf/util/pb_io.cpp +++ b/library/cpp/protobuf/util/pb_io.cpp @@ -1,7 +1,7 @@ #include "pb_io.h" #include <library/cpp/binsaver/bin_saver.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <google/protobuf/message.h> #include <google/protobuf/messagext.h> diff --git a/library/cpp/protobuf/util/pb_io_ut.cpp b/library/cpp/protobuf/util/pb_io_ut.cpp index 875d6dc602..b8454b8dda 100644 --- a/library/cpp/protobuf/util/pb_io_ut.cpp +++ b/library/cpp/protobuf/util/pb_io_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/protobuf/util/ut/common_ut.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/path.h> #include <util/folder/tempdir.h> diff --git a/library/cpp/protobuf/util/repeated_field_utils_ut.cpp b/library/cpp/protobuf/util/repeated_field_utils_ut.cpp index 58aaaa9e12..69be94e44f 100644 --- a/library/cpp/protobuf/util/repeated_field_utils_ut.cpp +++ b/library/cpp/protobuf/util/repeated_field_utils_ut.cpp @@ -1,7 +1,7 @@ #include "repeated_field_utils.h" #include <library/cpp/protobuf/util/ut/common_ut.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NProtoBuf; diff --git a/library/cpp/protobuf/util/simple_reflection_ut.cpp b/library/cpp/protobuf/util/simple_reflection_ut.cpp index 169d4703c9..2b38dbf9a9 100644 --- a/library/cpp/protobuf/util/simple_reflection_ut.cpp +++ b/library/cpp/protobuf/util/simple_reflection_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/protobuf/util/ut/sample_for_simple_reflection.pb.h> #include <library/cpp/protobuf/util/ut/extensions.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NProtoBuf; diff --git a/library/cpp/protobuf/util/walk_ut.cpp b/library/cpp/protobuf/util/walk_ut.cpp index 2ea6071b17..324d04dbd7 100644 --- a/library/cpp/protobuf/util/walk_ut.cpp +++ b/library/cpp/protobuf/util/walk_ut.cpp @@ -2,7 +2,7 @@ #include "simple_reflection.h" #include <library/cpp/protobuf/util/ut/common_ut.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NProtoBuf; diff --git a/library/cpp/protobuf/util/ya.make b/library/cpp/protobuf/util/ya.make index b62028af58..4d04d4686e 100644 --- a/library/cpp/protobuf/util/ya.make +++ b/library/cpp/protobuf/util/ya.make @@ -6,7 +6,7 @@ PEERDIR( contrib/libs/protobuf library/cpp/binsaver library/cpp/protobuf/util/proto - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) SRCS( diff --git a/library/cpp/regex/hyperscan/hyperscan.cpp b/library/cpp/regex/hyperscan/hyperscan.cpp index ba321f9c29..57e989e96d 100644 --- a/library/cpp/regex/hyperscan/hyperscan.cpp +++ b/library/cpp/regex/hyperscan/hyperscan.cpp @@ -223,7 +223,7 @@ namespace NHyperscan { hs_scratch_t* rawScratch = scratch.Get(); hs_error_t status = Singleton<NPrivate::TImpl>()->AllocScratch(db.Get(), &rawScratch); if (rawScratch != scratch.Get()) { - Y_UNUSED(scratch.Release()); // freed by hs_alloc_scratch + Y_UNUSED(scratch.Release()); // freed by hs_alloc_scratch scratch.Reset(rawScratch); } if (status != HS_SUCCESS) { diff --git a/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp b/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp index 9caa53f2e7..f34f7a811f 100644 --- a/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp +++ b/library/cpp/regex/hyperscan/ut/hyperscan_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/regex/hyperscan/hyperscan.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/set.h> diff --git a/library/cpp/regex/pcre/regexp_ut.cpp b/library/cpp/regex/pcre/regexp_ut.cpp index 5184e801cc..ea1b50d8a1 100644 --- a/library/cpp/regex/pcre/regexp_ut.cpp +++ b/library/cpp/regex/pcre/regexp_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/strip.h> #include <library/cpp/regex/pcre/regexp.h> diff --git a/library/cpp/regex/pire/ut/regexp_ut.cpp b/library/cpp/regex/pire/ut/regexp_ut.cpp index e7206de9ad..590c15bb12 100644 --- a/library/cpp/regex/pire/ut/regexp_ut.cpp +++ b/library/cpp/regex/pire/ut/regexp_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/regex/pire/regexp.h> #include <library/cpp/regex/pire/pcre2pire.h> diff --git a/library/cpp/resource/registry.cpp b/library/cpp/resource/registry.cpp index 66001c4769..80148601ce 100644 --- a/library/cpp/resource/registry.cpp +++ b/library/cpp/resource/registry.cpp @@ -6,7 +6,7 @@ #include <util/generic/hash.h> #include <util/generic/deque.h> #include <util/generic/singleton.h> -#include <util/system/env.h> +#include <util/system/env.h> using namespace NResource; using namespace NBlockCodecs; @@ -56,7 +56,7 @@ namespace { try { *out = Decompress((*res)->second); } catch (const yexception& e) { - if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { + if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { Cerr << "Can't decompress resource " << key << Endl << e.what() << Endl; } throw e; @@ -78,7 +78,7 @@ namespace { it.first, Decompress(it.second->second)}; cb.OnMatch(res); } catch (const yexception& e) { - if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { + if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { Cerr << "Can't decompress resource " << it.first << Endl << e.what() << Endl; } throw e; diff --git a/library/cpp/resource/resource.cpp b/library/cpp/resource/resource.cpp index cc20f847a5..b4375ecb97 100644 --- a/library/cpp/resource/resource.cpp +++ b/library/cpp/resource/resource.cpp @@ -1,9 +1,9 @@ #include "resource.h" -#include "resource.h" +#include "resource.h" #include "registry.h" #include <util/generic/yexception.h> -#include <util/generic/xrange.h> +#include <util/generic/xrange.h> using namespace NResource; @@ -47,11 +47,11 @@ size_t NResource::Count() noexcept { TStringBuf NResource::KeyByIndex(size_t idx) { return CommonStore()->KeyByIndex(idx); } - + TVector<TStringBuf> NResource::ListAllKeys() { TVector<TStringBuf> res(Reserve(NResource::Count())); - for (auto i : xrange(NResource::Count())) { - res.push_back(NResource::KeyByIndex(i)); - } - return res; -} + for (auto i : xrange(NResource::Count())) { + res.push_back(NResource::KeyByIndex(i)); + } + return res; +} diff --git a/library/cpp/resource/ut/resource_ut.cpp b/library/cpp/resource/ut/resource_ut.cpp index b6fa8e4df3..d5abae7bd2 100644 --- a/library/cpp/resource/ut/resource_ut.cpp +++ b/library/cpp/resource/ut/resource_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/resource/resource.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestResource) { Y_UNIT_TEST(Test1) { diff --git a/library/cpp/retry/retry_ut.cpp b/library/cpp/retry/retry_ut.cpp index 92153e987e..5378a7a8b7 100644 --- a/library/cpp/retry/retry_ut.cpp +++ b/library/cpp/retry/retry_ut.cpp @@ -1,6 +1,6 @@ #include "retry.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace { class TDoOnSecondOrThrow { diff --git a/library/cpp/scheme/scimpl_json_write.cpp b/library/cpp/scheme/scimpl_json_write.cpp index aadd7e6cd5..d785ab3107 100644 --- a/library/cpp/scheme/scimpl_json_write.cpp +++ b/library/cpp/scheme/scimpl_json_write.cpp @@ -2,7 +2,7 @@ #include "scimpl_private.h" #include <library/cpp/json/json_prettifier.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/charset/utf8.h> #include <util/generic/algorithm.h> diff --git a/library/cpp/scheme/scimpl_select.rl6 b/library/cpp/scheme/scimpl_select.rl6 index 11aa549b78..e06827a6d6 100644 --- a/library/cpp/scheme/scimpl_select.rl6 +++ b/library/cpp/scheme/scimpl_select.rl6 @@ -2,7 +2,7 @@ #include <util/string/cast.h> #include <util/string/escape.h> -#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> +#include <library/cpp/string_utils/relaxed_escaper/relaxed_escaper.h> #include <util/generic/is_in.h> #include <util/string/util.h> diff --git a/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp b/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp index ce3786a671..9bf83b9a7a 100644 --- a/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp +++ b/library/cpp/scheme/tests/fuzz_ops/ut/vm_parse_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/scheme/tests/fuzz_ops/lib/vm_parse.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestParseNextAction) { using namespace NSc::NUt; diff --git a/library/cpp/scheme/tests/fuzz_ops/ut/ya.make b/library/cpp/scheme/tests/fuzz_ops/ut/ya.make index 5c933518ea..e617f3f450 100644 --- a/library/cpp/scheme/tests/fuzz_ops/ut/ya.make +++ b/library/cpp/scheme/tests/fuzz_ops/ut/ya.make @@ -3,7 +3,7 @@ UNITTEST() OWNER(velavokr) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest library/cpp/scheme library/cpp/scheme/tests/fuzz_ops/lib ) diff --git a/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp b/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp index a445b0f87c..7f09052c71 100644 --- a/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp +++ b/library/cpp/scheme/tests/ut/fuzz_ops_found_bugs_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/scheme/scheme.h> #include <library/cpp/scheme/tests/fuzz_ops/lib/fuzz_ops.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/hex.h> Y_UNIT_TEST_SUITE(TTestSchemeFuzzOpsFoundBugs) { diff --git a/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp b/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp index 4f907157e9..40862abcfd 100644 --- a/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp +++ b/library/cpp/scheme/tests/ut/scheme_cast_ut.cpp @@ -1,7 +1,7 @@ #include <library/cpp/scheme/scheme.h> #include <library/cpp/scheme/scheme_cast.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #include <util/string/subst.h> diff --git a/library/cpp/scheme/tests/ut/scheme_json_ut.cpp b/library/cpp/scheme/tests/ut/scheme_json_ut.cpp index daeb2654f9..70b4e641ed 100644 --- a/library/cpp/scheme/tests/ut/scheme_json_ut.cpp +++ b/library/cpp/scheme/tests/ut/scheme_json_ut.cpp @@ -1,13 +1,13 @@ #include <library/cpp/scheme/scimpl_private.h> #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #include <util/string/subst.h> #include <util/string/util.h> #include <type_traits> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> using namespace std::string_view_literals; diff --git a/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp b/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp index 2a06cf110d..17ca045a4c 100644 --- a/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp +++ b/library/cpp/scheme/tests/ut/scheme_merge_ut.cpp @@ -1,9 +1,9 @@ #include <library/cpp/scheme/scimpl_private.h> #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> #include <util/string/subst.h> #include <util/string/util.h> diff --git a/library/cpp/scheme/tests/ut/scheme_path_ut.cpp b/library/cpp/scheme/tests/ut/scheme_path_ut.cpp index 0d4d79d483..0a9add0749 100644 --- a/library/cpp/scheme/tests/ut/scheme_path_ut.cpp +++ b/library/cpp/scheme/tests/ut/scheme_path_ut.cpp @@ -1,13 +1,13 @@ #include <library/cpp/scheme/scimpl_private.h> #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #include <util/string/subst.h> #include <util/string/util.h> #include <type_traits> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> Y_UNIT_TEST_SUITE(TSchemePathTest) { void DoTestSelect(TStringBuf path, TStringBuf expected, TStringBuf delexpected) { diff --git a/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp b/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp index e711a0d092..86b3c1b8ef 100644 --- a/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp +++ b/library/cpp/scheme/tests/ut/scheme_proto_ut.cpp @@ -1,7 +1,7 @@ #include <library/cpp/protobuf/util/is_equal.h> #include <library/cpp/scheme/scheme.h> #include <library/cpp/scheme/tests/ut/scheme_ut.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TSchemeProtoTest) { void DoTestProtobuf(bool fromProto, bool mapAsDict); diff --git a/library/cpp/scheme/tests/ut/scheme_ut.cpp b/library/cpp/scheme/tests/ut/scheme_ut.cpp index 1a5d07c31b..8793e34a03 100644 --- a/library/cpp/scheme/tests/ut/scheme_ut.cpp +++ b/library/cpp/scheme/tests/ut/scheme_ut.cpp @@ -1,9 +1,9 @@ #include <library/cpp/scheme/scimpl_private.h> #include <library/cpp/scheme/ut_utils/scheme_ut_utils.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> #include <util/string/subst.h> #include <util/string/util.h> diff --git a/library/cpp/scheme/tests/ut/ya.make b/library/cpp/scheme/tests/ut/ya.make index 9f54791414..58c363c36b 100644 --- a/library/cpp/scheme/tests/ut/ya.make +++ b/library/cpp/scheme/tests/ut/ya.make @@ -6,8 +6,8 @@ PEERDIR( library/cpp/protobuf/util library/cpp/scheme/tests/fuzz_ops/lib library/cpp/scheme/ut_utils - library/cpp/string_utils/quote - library/cpp/testing/unittest + library/cpp/string_utils/quote + library/cpp/testing/unittest ) SRCS( diff --git a/library/cpp/scheme/ut_utils/scheme_ut_utils.h b/library/cpp/scheme/ut_utils/scheme_ut_utils.h index eb3ea15b2a..b72ea35c21 100644 --- a/library/cpp/scheme/ut_utils/scheme_ut_utils.h +++ b/library/cpp/scheme/ut_utils/scheme_ut_utils.h @@ -4,7 +4,7 @@ #include <library/cpp/scheme/scheme.h> #include <library/cpp/json/json_value.h> #include <library/cpp/json/json_writer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> namespace NSc { diff --git a/library/cpp/scheme/ut_utils/ya.make b/library/cpp/scheme/ut_utils/ya.make index 7661262e1b..aaf4354703 100644 --- a/library/cpp/scheme/ut_utils/ya.make +++ b/library/cpp/scheme/ut_utils/ya.make @@ -10,7 +10,7 @@ PEERDIR( library/cpp/colorizer library/cpp/json library/cpp/scheme - library/cpp/testing/unittest + library/cpp/testing/unittest ) END() diff --git a/library/cpp/scheme/util/utils.cpp b/library/cpp/scheme/util/utils.cpp index 40cceceacd..3e4e36fd3d 100644 --- a/library/cpp/scheme/util/utils.cpp +++ b/library/cpp/scheme/util/utils.cpp @@ -1,6 +1,6 @@ #include "utils.h" -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> namespace NScUtils { diff --git a/library/cpp/scheme/util/ya.make b/library/cpp/scheme/util/ya.make index dffd1c8070..b7a95042f7 100644 --- a/library/cpp/scheme/util/ya.make +++ b/library/cpp/scheme/util/ya.make @@ -8,7 +8,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) END() diff --git a/library/cpp/scheme/ya.make b/library/cpp/scheme/ya.make index bac08ba5a4..1f65c15e77 100644 --- a/library/cpp/scheme/ya.make +++ b/library/cpp/scheme/ya.make @@ -17,7 +17,7 @@ SRCS( PEERDIR( contrib/libs/protobuf library/cpp/json - library/cpp/string_utils/relaxed_escaper + library/cpp/string_utils/relaxed_escaper ) GENERATE_ENUM_SERIALIZATION(scheme.h) diff --git a/library/cpp/sliding_window/sliding_window_ut.cpp b/library/cpp/sliding_window/sliding_window_ut.cpp index 1e7343a8d3..e15a113aa6 100644 --- a/library/cpp/sliding_window/sliding_window_ut.cpp +++ b/library/cpp/sliding_window/sliding_window_ut.cpp @@ -1,6 +1,6 @@ #include "sliding_window.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NSlidingWindow; diff --git a/library/cpp/sse/ut/test.cpp b/library/cpp/sse/ut/test.cpp index 33c999d284..e6b273ca85 100644 --- a/library/cpp/sse/ut/test.cpp +++ b/library/cpp/sse/ut/test.cpp @@ -5,7 +5,7 @@ */ /* Author: Vitaliy Manushkin <agri@yandex-team.ru */ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/typetraits.h> #include <util/string/hex.h> @@ -38,13 +38,13 @@ struct T_mm_CallWrapper { }; #if defined(_arm64_) -#include "library/cpp/sse/sse2neon.h" +#include "library/cpp/sse/sse2neon.h" #elif defined(_i386_) || defined(_x86_64_) #include <xmmintrin.h> #include <emmintrin.h> #include <smmintrin.h> #elif defined(_ppc64_) -#include "library/cpp/sse/powerpc.h" +#include "library/cpp/sse/powerpc.h" #else #error "Unsupported platform" #endif diff --git a/library/cpp/sse/ut/ya.make b/library/cpp/sse/ut/ya.make index 45e104971e..ccae8dd882 100644 --- a/library/cpp/sse/ut/ya.make +++ b/library/cpp/sse/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/sse) +UNITTEST_FOR(library/cpp/sse) OWNER(danlark) diff --git a/library/cpp/streams/brotli/brotli_ut.cpp b/library/cpp/streams/brotli/brotli_ut.cpp index aeb2e284dc..a6d95ecf76 100644 --- a/library/cpp/streams/brotli/brotli_ut.cpp +++ b/library/cpp/streams/brotli/brotli_ut.cpp @@ -1,6 +1,6 @@ #include "brotli.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> diff --git a/library/cpp/streams/bzip2/bzip2_ut.cpp b/library/cpp/streams/bzip2/bzip2_ut.cpp index 69a98f296c..4c207ddef7 100644 --- a/library/cpp/streams/bzip2/bzip2_ut.cpp +++ b/library/cpp/streams/bzip2/bzip2_ut.cpp @@ -1,6 +1,6 @@ #include "bzip2.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> #include <util/system/tempfile.h> diff --git a/library/cpp/streams/lz/lz.cpp b/library/cpp/streams/lz/lz.cpp index b65bb3ed96..3f005a50a9 100644 --- a/library/cpp/streams/lz/lz.cpp +++ b/library/cpp/streams/lz/lz.cpp @@ -102,7 +102,7 @@ private: ui8 compressed = false; if (len) { - const size_t out = this->Compress((const char*)ptr, len, (char*)Block(), this->AdditionalDataLength()); + const size_t out = this->Compress((const char*)ptr, len, (char*)Block(), this->AdditionalDataLength()); // catch compressor buffer overrun (e.g. SEARCH-2043) //Y_VERIFY(out <= this->Hint(this->BlockSize())); @@ -402,7 +402,7 @@ protected: class TMiniLzoCompressor: public TMiniLzo, public TFixedArray<LZO1X_MEM_COMPRESS + 1> { public: - inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { + inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { lzo_uint out = 0; lzo1x_1_compress((const lzo_bytep)data, len, (lzo_bytep)ptr, &out, WorkMem_); @@ -438,7 +438,7 @@ public: return Max<size_t>((size_t)(len * 1.06), 100); } - inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { + inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { return fastlz_compress(data, len, ptr); } @@ -470,8 +470,8 @@ public: return Max<size_t>((size_t)(len * 1.06), 100); } - inline size_t Compress(const char* data, size_t len, char* ptr, size_t dstMaxSize) { - return LZ4_compress_default(data, ptr, len, dstMaxSize); + inline size_t Compress(const char* data, size_t len, char* ptr, size_t dstMaxSize) { + return LZ4_compress_default(data, ptr, len, dstMaxSize); } inline size_t Decompress(const char* data, size_t len, char* ptr, size_t max) { @@ -505,7 +505,7 @@ public: return Max<size_t>(snappy::MaxCompressedLength(len), 100); } - inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { + inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { size_t reslen = 0; snappy::RawCompress(data, len, ptr, &reslen); return reslen; @@ -575,7 +575,7 @@ const char TQuickLZBase::signature[] = "YLZQ"; class TQuickLZCompress: public TQuickLZBase { public: - inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { + inline size_t Compress(const char* data, size_t len, char* ptr, size_t /*dstMaxSize*/) { return Table_->Compress(data, ptr, len, (char*)Mem_.Get()); } }; diff --git a/library/cpp/streams/lz/lz_ut.cpp b/library/cpp/streams/lz/lz_ut.cpp index 6876f070fc..ea8a920429 100644 --- a/library/cpp/streams/lz/lz_ut.cpp +++ b/library/cpp/streams/lz/lz_ut.cpp @@ -1,6 +1,6 @@ #include "lz.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/resource/resource.h> #include <util/stream/file.h> diff --git a/library/cpp/streams/lzma/lzma_ut.cpp b/library/cpp/streams/lzma/lzma_ut.cpp index 847e98d1ca..bfa88b6a51 100644 --- a/library/cpp/streams/lzma/lzma_ut.cpp +++ b/library/cpp/streams/lzma/lzma_ut.cpp @@ -1,6 +1,6 @@ #include "lzma.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/mem.h> #include <util/random/fast.h> diff --git a/library/cpp/streams/zstd/zstd_ut.cpp b/library/cpp/streams/zstd/zstd_ut.cpp index ef479fdd97..ce49b5e3af 100644 --- a/library/cpp/streams/zstd/zstd_ut.cpp +++ b/library/cpp/streams/zstd/zstd_ut.cpp @@ -1,6 +1,6 @@ #include "zstd.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> #include <util/stream/null.h> diff --git a/library/cpp/string_utils/base64/base64.cpp b/library/cpp/string_utils/base64/base64.cpp index 05c201f0de..8ff70a5b9b 100644 --- a/library/cpp/string_utils/base64/base64.cpp +++ b/library/cpp/string_utils/base64/base64.cpp @@ -31,14 +31,14 @@ namespace { const bool haveNEON64 = false; #endif -# ifdef _windows_ - // msvc does something wrong in release-build, so we temprorary disable this branch on windows - // https://developercommunity.visualstudio.com/content/problem/334085/release-build-has-made-wrong-optimizaion-in-base64.html - const bool isWin = true; -# else - const bool isWin = false; -# endif - if (!isWin && NX86::HaveAVX() && NX86::HaveAVX2()) { +# ifdef _windows_ + // msvc does something wrong in release-build, so we temprorary disable this branch on windows + // https://developercommunity.visualstudio.com/content/problem/334085/release-build-has-made-wrong-optimizaion-in-base64.html + const bool isWin = true; +# else + const bool isWin = false; +# endif + if (!isWin && NX86::HaveAVX() && NX86::HaveAVX2()) { Encode = avx2_base64_encode; Decode = avx2_base64_decode; } else if (NX86::HaveSSSE3()) { diff --git a/library/cpp/string_utils/base64/base64.h b/library/cpp/string_utils/base64/base64.h index f778a6425a..7c9f0987e7 100644 --- a/library/cpp/string_utils/base64/base64.h +++ b/library/cpp/string_utils/base64/base64.h @@ -32,7 +32,7 @@ inline void Base64Decode(const TStringBuf src, TString& dst) { dst.resize(Base64Decode(src, dst.begin()).size()); } -//WARNING: can process not whole input silently, use Base64StrictDecode instead of this function +//WARNING: can process not whole input silently, use Base64StrictDecode instead of this function inline TString Base64Decode(const TStringBuf s) { TString ret; Base64Decode(s, ret); diff --git a/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp b/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp index c3ed068a37..de2d96c36c 100644 --- a/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp +++ b/library/cpp/string_utils/base64/base64_decode_uneven_ut.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> Y_UNIT_TEST_SUITE(TBase64DecodeUneven) { Y_UNIT_TEST(Base64DecodeUneven) { diff --git a/library/cpp/string_utils/base64/base64_ut.cpp b/library/cpp/string_utils/base64/base64_ut.cpp index bcc1e65879..bc2c7398be 100644 --- a/library/cpp/string_utils/base64/base64_ut.cpp +++ b/library/cpp/string_utils/base64/base64_ut.cpp @@ -7,7 +7,7 @@ #include <contrib/libs/base64/plain64/libbase64.h> #include <contrib/libs/base64/ssse3/libbase64.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/random/fast.h> diff --git a/library/cpp/string_utils/base64/bench/main.cpp b/library/cpp/string_utils/base64/bench/main.cpp index 10e09bc1c7..5d0a4c40d9 100644 --- a/library/cpp/string_utils/base64/bench/main.cpp +++ b/library/cpp/string_utils/base64/bench/main.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/buffer.h> #include <util/generic/singleton.h> diff --git a/library/cpp/string_utils/base64/bench/metrics/main.py b/library/cpp/string_utils/base64/bench/metrics/main.py index c35fd6d8cd..272b6bdcfa 100644 --- a/library/cpp/string_utils/base64/bench/metrics/main.py +++ b/library/cpp/string_utils/base64/bench/metrics/main.py @@ -2,4 +2,4 @@ import yatest.common as yc def test_export_metrics(metrics): - metrics.set_benchmark(yc.execute_benchmark('library/cpp/string_utils/base64/bench/bench')) + metrics.set_benchmark(yc.execute_benchmark('library/cpp/string_utils/base64/bench/bench')) diff --git a/library/cpp/string_utils/base64/bench/metrics/ya.make b/library/cpp/string_utils/base64/bench/metrics/ya.make index b0406516c3..25f925840a 100644 --- a/library/cpp/string_utils/base64/bench/metrics/ya.make +++ b/library/cpp/string_utils/base64/bench/metrics/ya.make @@ -15,6 +15,6 @@ TAG( TEST_SRCS(main.py) -DEPENDS(library/cpp/string_utils/base64/bench) +DEPENDS(library/cpp/string_utils/base64/bench) END() diff --git a/library/cpp/string_utils/base64/bench/ya.make b/library/cpp/string_utils/base64/bench/ya.make index 5ac5f3d6ce..61f0b6eb94 100644 --- a/library/cpp/string_utils/base64/bench/ya.make +++ b/library/cpp/string_utils/base64/bench/ya.make @@ -10,7 +10,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) END() diff --git a/library/cpp/string_utils/base64/fuzz/generic/ya.make b/library/cpp/string_utils/base64/fuzz/generic/ya.make index d155e2b0a0..fe3dba490e 100644 --- a/library/cpp/string_utils/base64/fuzz/generic/ya.make +++ b/library/cpp/string_utils/base64/fuzz/generic/ya.make @@ -6,7 +6,7 @@ OWNER( FUZZ() PEERDIR( - library/cpp/string_utils/base64/fuzz/lib + library/cpp/string_utils/base64/fuzz/lib ) END() diff --git a/library/cpp/string_utils/base64/fuzz/lib/main.cpp b/library/cpp/string_utils/base64/fuzz/lib/main.cpp index 28547ae7a5..e3dea7c437 100644 --- a/library/cpp/string_utils/base64/fuzz/lib/main.cpp +++ b/library/cpp/string_utils/base64/fuzz/lib/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/system/types.h> #include <util/system/yassert.h> diff --git a/library/cpp/string_utils/base64/fuzz/lib/ya.make b/library/cpp/string_utils/base64/fuzz/lib/ya.make index 7b981b86a3..8a716861c8 100644 --- a/library/cpp/string_utils/base64/fuzz/lib/ya.make +++ b/library/cpp/string_utils/base64/fuzz/lib/ya.make @@ -10,7 +10,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) END() diff --git a/library/cpp/string_utils/base64/ut/ya.make b/library/cpp/string_utils/base64/ut/ya.make index 9b61241f0e..6b23486662 100644 --- a/library/cpp/string_utils/base64/ut/ya.make +++ b/library/cpp/string_utils/base64/ut/ya.make @@ -3,7 +3,7 @@ OWNER( yazevnul ) -UNITTEST_FOR(library/cpp/string_utils/base64) +UNITTEST_FOR(library/cpp/string_utils/base64) SRCS( base64_ut.cpp diff --git a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp index cf0f78637f..d81c583b02 100644 --- a/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp +++ b/library/cpp/string_utils/levenshtein_diff/levenshtein_diff_ut.cpp @@ -1,6 +1,6 @@ #include "levenshtein_diff.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/library/cpp/string_utils/parse_size/parse_size_ut.cpp b/library/cpp/string_utils/parse_size/parse_size_ut.cpp index 8fff4f56b2..49f2636785 100644 --- a/library/cpp/string_utils/parse_size/parse_size_ut.cpp +++ b/library/cpp/string_utils/parse_size/parse_size_ut.cpp @@ -1,6 +1,6 @@ #include "parse_size.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NSize; diff --git a/library/cpp/string_utils/parse_size/ut/ya.make b/library/cpp/string_utils/parse_size/ut/ya.make index da19cf025b..cb50b6f2da 100644 --- a/library/cpp/string_utils/parse_size/ut/ya.make +++ b/library/cpp/string_utils/parse_size/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/string_utils/parse_size) +UNITTEST_FOR(library/cpp/string_utils/parse_size) OWNER(g:images-robot) diff --git a/library/cpp/string_utils/quote/quote_ut.cpp b/library/cpp/string_utils/quote/quote_ut.cpp index 6c552b279e..dc9c3c5dd6 100644 --- a/library/cpp/string_utils/quote/quote_ut.cpp +++ b/library/cpp/string_utils/quote/quote_ut.cpp @@ -1,6 +1,6 @@ #include "quote.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TCGIEscapeTest) { Y_UNIT_TEST(ReturnsEndOfTo) { diff --git a/library/cpp/string_utils/quote/ut/ya.make b/library/cpp/string_utils/quote/ut/ya.make index eca955144f..c8f5bc63ec 100644 --- a/library/cpp/string_utils/quote/ut/ya.make +++ b/library/cpp/string_utils/quote/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/string_utils/quote) +UNITTEST_FOR(library/cpp/string_utils/quote) OWNER(vladon) diff --git a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp b/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp index 768555ea3a..ec74798c30 100644 --- a/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp +++ b/library/cpp/string_utils/relaxed_escaper/relaxed_escaper_ut.cpp @@ -1,6 +1,6 @@ #include "relaxed_escaper.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #define RESC_FIXED_STR(s) TStringBuf(s, sizeof(s) - 1) static const TStringBuf CommonTestData[] = { diff --git a/library/cpp/string_utils/relaxed_escaper/ut/ya.make b/library/cpp/string_utils/relaxed_escaper/ut/ya.make index 7ebd393c48..10011e33d1 100644 --- a/library/cpp/string_utils/relaxed_escaper/ut/ya.make +++ b/library/cpp/string_utils/relaxed_escaper/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/string_utils/relaxed_escaper) +UNITTEST_FOR(library/cpp/string_utils/relaxed_escaper) OWNER(velavokr) diff --git a/library/cpp/string_utils/url/url.cpp b/library/cpp/string_utils/url/url.cpp index 85f4ac5d69..376a09a465 100644 --- a/library/cpp/string_utils/url/url.cpp +++ b/library/cpp/string_utils/url/url.cpp @@ -73,31 +73,31 @@ namespace NUrl { } // namespace NUrl -size_t GetHttpPrefixSize(const char* url, bool ignorehttps) noexcept { +size_t GetHttpPrefixSize(const char* url, bool ignorehttps) noexcept { return GetHttpPrefixSizeImpl<char>(url, TUncheckedSize(), ignorehttps); } -size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps) noexcept { +size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps) noexcept { return GetHttpPrefixSizeImpl<wchar16>(url, TUncheckedSize(), ignorehttps); } -size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps) noexcept { +size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps) noexcept { return GetHttpPrefixSizeImpl<char>(url.data(), TKnownSize(url.size()), ignorehttps); } -size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps) noexcept { +size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps) noexcept { return GetHttpPrefixSizeImpl<wchar16>(url.data(), TKnownSize(url.size()), ignorehttps); } -TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps) noexcept { +TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps) noexcept { return CutHttpPrefixImpl(url, ignorehttps); } -TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps) noexcept { +TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps) noexcept { return CutHttpPrefixImpl(url, ignorehttps); } -size_t GetSchemePrefixSize(const TStringBuf url) noexcept { +size_t GetSchemePrefixSize(const TStringBuf url) noexcept { struct TDelim: public str_spn { inline TDelim() : str_spn("!-/:-@[-`{|}", true) @@ -115,11 +115,11 @@ size_t GetSchemePrefixSize(const TStringBuf url) noexcept { return n + 3 - url.begin(); } -TStringBuf GetSchemePrefix(const TStringBuf url) noexcept { +TStringBuf GetSchemePrefix(const TStringBuf url) noexcept { return url.Head(GetSchemePrefixSize(url)); } -TStringBuf CutSchemePrefix(const TStringBuf url) noexcept { +TStringBuf CutSchemePrefix(const TStringBuf url) noexcept { return url.Tail(GetSchemePrefixSize(url)); } @@ -146,15 +146,15 @@ static inline TStringBuf GetHostAndPortImpl(const TStringBuf url) { return urlNoScheme; } -TStringBuf GetHost(const TStringBuf url) noexcept { +TStringBuf GetHost(const TStringBuf url) noexcept { return GetHostAndPortImpl<false>(url); } -TStringBuf GetHostAndPort(const TStringBuf url) noexcept { +TStringBuf GetHostAndPort(const TStringBuf url) noexcept { return GetHostAndPortImpl<true>(url); } -TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp, bool trimDefaultPort) noexcept { +TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp, bool trimDefaultPort) noexcept { const size_t schemeSize = GetSchemePrefixSize(url); const TStringBuf scheme = url.Head(schemeSize); @@ -235,11 +235,11 @@ void GetSchemeHostAndPort(const TStringBuf url, TStringBuf& scheme, TStringBuf& Y_ENSURE(isOk, "cannot parse port number from URL: " << url); } -TStringBuf GetOnlyHost(const TStringBuf url) noexcept { +TStringBuf GetOnlyHost(const TStringBuf url) noexcept { return GetHost(CutSchemePrefix(url)); } -TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment) noexcept { +TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment) noexcept { const size_t off = url.find('/', GetHttpPrefixSize(url)); TStringBuf hostUnused, path; if (!url.TrySplitAt(off, hostUnused, path)) @@ -249,7 +249,7 @@ TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment) noexcept { } // this strange creature returns 2nd level domain, possibly with port -TStringBuf GetDomain(const TStringBuf host) noexcept { +TStringBuf GetDomain(const TStringBuf host) noexcept { const char* c = !host ? host.data() : host.end() - 1; for (bool wasPoint = false; c != host.data(); --c) { if (*c == '.') { @@ -263,7 +263,7 @@ TStringBuf GetDomain(const TStringBuf host) noexcept { return TStringBuf(c, host.end()); } -TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept { +TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept { size_t pos = host.size(); for (size_t i = 0; i < level; ++i) { pos = host.rfind('.', pos); @@ -273,11 +273,11 @@ TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept { return host.SubStr(pos + 1); } -TStringBuf GetZone(const TStringBuf host) noexcept { +TStringBuf GetZone(const TStringBuf host) noexcept { return GetParentDomain(host, 1); } -TStringBuf CutWWWPrefix(const TStringBuf url) noexcept { +TStringBuf CutWWWPrefix(const TStringBuf url) noexcept { if (url.size() >= 4 && url[3] == '.' && !strnicmp(url.data(), "www", 3)) return url.substr(4); return url; @@ -388,7 +388,7 @@ size_t NormalizeHostName(char* dest, const TStringBuf source, size_t dest_size, return len; } -TStringBuf RemoveFinalSlash(TStringBuf str) noexcept { +TStringBuf RemoveFinalSlash(TStringBuf str) noexcept { if (str.EndsWith('/')) { str.Chop(1); } diff --git a/library/cpp/string_utils/url/url.h b/library/cpp/string_utils/url/url.h index 84137ccc57..64e82485a1 100644 --- a/library/cpp/string_utils/url/url.h +++ b/library/cpp/string_utils/url/url.h @@ -23,39 +23,39 @@ namespace NUrl { } // namespace NUrl -Y_PURE_FUNCTION -size_t GetHttpPrefixSize(const char* url, bool ignorehttps = false) noexcept; -Y_PURE_FUNCTION -size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps = false) noexcept; +Y_PURE_FUNCTION +size_t GetHttpPrefixSize(const char* url, bool ignorehttps = false) noexcept; +Y_PURE_FUNCTION +size_t GetHttpPrefixSize(const wchar16* url, bool ignorehttps = false) noexcept; -Y_PURE_FUNCTION -size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps = false) noexcept; - -Y_PURE_FUNCTION -size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps = false) noexcept; +Y_PURE_FUNCTION +size_t GetHttpPrefixSize(const TStringBuf url, bool ignorehttps = false) noexcept; +Y_PURE_FUNCTION +size_t GetHttpPrefixSize(const TWtringBuf url, bool ignorehttps = false) noexcept; + /** BEWARE of TStringBuf! You can not use operator ~ or c_str() like in TString !!!!!!!!!!!! */ -Y_PURE_FUNCTION -size_t GetSchemePrefixSize(const TStringBuf url) noexcept; +Y_PURE_FUNCTION +size_t GetSchemePrefixSize(const TStringBuf url) noexcept; -Y_PURE_FUNCTION -TStringBuf GetSchemePrefix(const TStringBuf url) noexcept; +Y_PURE_FUNCTION +TStringBuf GetSchemePrefix(const TStringBuf url) noexcept; //! removes protocol prefixes 'http://' and 'https://' from given URL //! @note if URL has no prefix or some other prefix the function does nothing //! @param url URL from which the prefix should be removed //! @param ignorehttps if true, leaves https:// //! @return a new URL without protocol prefix -Y_PURE_FUNCTION -TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps = false) noexcept; - -Y_PURE_FUNCTION -TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps = false) noexcept; +Y_PURE_FUNCTION +TStringBuf CutHttpPrefix(const TStringBuf url, bool ignorehttps = false) noexcept; -Y_PURE_FUNCTION -TStringBuf CutSchemePrefix(const TStringBuf url) noexcept; +Y_PURE_FUNCTION +TWtringBuf CutHttpPrefix(const TWtringBuf url, bool ignorehttps = false) noexcept; +Y_PURE_FUNCTION +TStringBuf CutSchemePrefix(const TStringBuf url) noexcept; + //! adds specified scheme prefix if URL has no scheme //! @note if URL has scheme prefix already the function returns unchanged URL TString AddSchemePrefix(const TString& url, const TStringBuf scheme); @@ -63,15 +63,15 @@ TString AddSchemePrefix(const TString& url, const TStringBuf scheme); //! Same as `AddSchemePrefix(url, "http")`. TString AddSchemePrefix(const TString& url); -Y_PURE_FUNCTION -TStringBuf GetHost(const TStringBuf url) noexcept; - -Y_PURE_FUNCTION -TStringBuf GetHostAndPort(const TStringBuf url) noexcept; - -Y_PURE_FUNCTION -TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp = true, bool trimDefaultPort = true) noexcept; +Y_PURE_FUNCTION +TStringBuf GetHost(const TStringBuf url) noexcept; +Y_PURE_FUNCTION +TStringBuf GetHostAndPort(const TStringBuf url) noexcept; + +Y_PURE_FUNCTION +TStringBuf GetSchemeHostAndPort(const TStringBuf url, bool trimHttp = true, bool trimDefaultPort = true) noexcept; + /** * Splits URL to host and path * @@ -123,25 +123,25 @@ bool TryGetSchemeHostAndPort(const TStringBuf url, TStringBuf& scheme, TStringBu */ void GetSchemeHostAndPort(const TStringBuf url, TStringBuf& scheme, TStringBuf& host, ui16& port); -Y_PURE_FUNCTION -TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment = true) noexcept; +Y_PURE_FUNCTION +TStringBuf GetPathAndQuery(const TStringBuf url, bool trimFragment = true) noexcept; /** * Extracts host from url and cuts http(https) protocol prefix and port if any. * @param[in] url any URL * @return host without port and http(https) prefix. */ -Y_PURE_FUNCTION -TStringBuf GetOnlyHost(const TStringBuf url) noexcept; - -Y_PURE_FUNCTION -TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept; // ("www.ya.ru", 2) -> "ya.ru" - -Y_PURE_FUNCTION -TStringBuf GetZone(const TStringBuf host) noexcept; - -Y_PURE_FUNCTION -TStringBuf CutWWWPrefix(const TStringBuf url) noexcept; - +Y_PURE_FUNCTION +TStringBuf GetOnlyHost(const TStringBuf url) noexcept; + +Y_PURE_FUNCTION +TStringBuf GetParentDomain(const TStringBuf host, size_t level) noexcept; // ("www.ya.ru", 2) -> "ya.ru" + +Y_PURE_FUNCTION +TStringBuf GetZone(const TStringBuf host) noexcept; + +Y_PURE_FUNCTION +TStringBuf CutWWWPrefix(const TStringBuf url) noexcept; + Y_PURE_FUNCTION TStringBuf CutWWWNumberedPrefix(const TStringBuf url) noexcept; @@ -153,17 +153,17 @@ TStringBuf CutWWWNumberedPrefix(const TStringBuf url) noexcept; * @param[in] url any URL * @return url without 'm.' or 'M.' prefix. */ -Y_PURE_FUNCTION +Y_PURE_FUNCTION TStringBuf CutMPrefix(const TStringBuf url) noexcept; Y_PURE_FUNCTION -TStringBuf GetDomain(const TStringBuf host) noexcept; // should not be used - +TStringBuf GetDomain(const TStringBuf host) noexcept; // should not be used + size_t NormalizeUrlName(char* dest, const TStringBuf source, size_t dest_size); size_t NormalizeHostName(char* dest, const TStringBuf source, size_t dest_size, ui16 defport = 80); -Y_PURE_FUNCTION -TStringBuf RemoveFinalSlash(TStringBuf str) noexcept; +Y_PURE_FUNCTION +TStringBuf RemoveFinalSlash(TStringBuf str) noexcept; TStringBuf CutUrlPrefixes(TStringBuf url) noexcept; bool DoesUrlPathStartWithToken(TStringBuf url, const TStringBuf& token) noexcept; diff --git a/library/cpp/string_utils/url/url_ut.cpp b/library/cpp/string_utils/url/url_ut.cpp index 1588013893..4fbab25081 100644 --- a/library/cpp/string_utils/url/url_ut.cpp +++ b/library/cpp/string_utils/url/url_ut.cpp @@ -2,7 +2,7 @@ #include <util/string/cast.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TUtilUrlTest) { Y_UNIT_TEST(TestGetHostAndGetHostAndPort) { diff --git a/library/cpp/string_utils/url/ut/ya.make b/library/cpp/string_utils/url/ut/ya.make index 0efa30e4d2..ca75e04baf 100644 --- a/library/cpp/string_utils/url/ut/ya.make +++ b/library/cpp/string_utils/url/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/string_utils/url) +UNITTEST_FOR(library/cpp/string_utils/url) OWNER(g:util) diff --git a/library/cpp/string_utils/ya.make b/library/cpp/string_utils/ya.make index cd731bda95..932fb805d7 100644 --- a/library/cpp/string_utils/ya.make +++ b/library/cpp/string_utils/ya.make @@ -1,37 +1,37 @@ RECURSE( - ascii_encode - ascii_encode/ut - base64 - base64/bench - base64/bench/metrics - base64/ut - base64/fuzz - csv - csv/bench - csv/ut - col_diff - col_diff/ut - indent_text + ascii_encode + ascii_encode/ut + base64 + base64/bench + base64/bench/metrics + base64/ut + base64/fuzz + csv + csv/bench + csv/ut + col_diff + col_diff/ut + indent_text levenshtein_diff levenshtein_diff/ut - old_url_normalize - old_url_normalize/ut - parse_size - parse_size/ut - parse_vector - parse_vector/ut + old_url_normalize + old_url_normalize/ut + parse_size + parse_size/ut + parse_vector + parse_vector/ut secret_string - quote - quote/ut - relaxed_escaper - relaxed_escaper/ut - scan - subst_buf - subst_buf/ut - tskv_format - tskv_format/ut - tskv_format/fuzz - url - url/ut + quote + quote/ut + relaxed_escaper + relaxed_escaper/ut + scan + subst_buf + subst_buf/ut + tskv_format + tskv_format/ut + tskv_format/fuzz + url + url/ut ztstrbuf ) diff --git a/library/cpp/terminate_handler/sample/exception/ya.make b/library/cpp/terminate_handler/sample/exception/ya.make index 958c26f89a..f3471eae67 100644 --- a/library/cpp/terminate_handler/sample/exception/ya.make +++ b/library/cpp/terminate_handler/sample/exception/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + library/cpp/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/sample/pure-virtual/ya.make b/library/cpp/terminate_handler/sample/pure-virtual/ya.make index 4100da630d..d3b439c646 100644 --- a/library/cpp/terminate_handler/sample/pure-virtual/ya.make +++ b/library/cpp/terminate_handler/sample/pure-virtual/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + library/cpp/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/sample/rethrow/ya.make b/library/cpp/terminate_handler/sample/rethrow/ya.make index 4100da630d..d3b439c646 100644 --- a/library/cpp/terminate_handler/sample/rethrow/ya.make +++ b/library/cpp/terminate_handler/sample/rethrow/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + library/cpp/terminate_handler ) END() diff --git a/library/cpp/terminate_handler/sample/segv/ya.make b/library/cpp/terminate_handler/sample/segv/ya.make index 4100da630d..d3b439c646 100644 --- a/library/cpp/terminate_handler/sample/segv/ya.make +++ b/library/cpp/terminate_handler/sample/segv/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/terminate_handler + library/cpp/terminate_handler ) END() diff --git a/library/cpp/testing/README.md b/library/cpp/testing/README.md index e8e0391be4..8980ccfd0a 100644 --- a/library/cpp/testing/README.md +++ b/library/cpp/testing/README.md @@ -12,5 +12,5 @@ * `gtest_protobuf` — утилиты для работы с протобуфом в тестах. * `hook` — хуки для выполнения пользовательских функций в тестах и бенчмарках. * `mock_server` — реализация http-сервера для тестов. -* `unittest` — реализация модуля UNITTEST — основного средства для тестирования тестов на С++ в Аркадии. -* `unittest_main` — реализация `int main(argc, argv)` для модуля UNITTEST (она вынесена в отдельную библиотеку, чтобы оставить возможность для реализации `UNITTEST_WITH_CUSTOM_ENTRY_POINT` и `YT_UNITTEST`. +* `unittest` — реализация модуля UNITTEST — основного средства для тестирования тестов на С++ в Аркадии. +* `unittest_main` — реализация `int main(argc, argv)` для модуля UNITTEST (она вынесена в отдельную библиотеку, чтобы оставить возможность для реализации `UNITTEST_WITH_CUSTOM_ENTRY_POINT` и `YT_UNITTEST`. diff --git a/library/cpp/testing/benchmark/bench.cpp b/library/cpp/testing/benchmark/bench.cpp index 08d8708005..f8cb2c01f9 100644 --- a/library/cpp/testing/benchmark/bench.cpp +++ b/library/cpp/testing/benchmark/bench.cpp @@ -3,10 +3,10 @@ #include <contrib/libs/re2/re2/re2.h> #include <library/cpp/colorizer/output.h> -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> #include <library/cpp/json/json_value.h> #include <library/cpp/linear_regression/linear_regression.h> -#include <library/cpp/threading/poor_man_openmp/thread_helper.h> +#include <library/cpp/threading/poor_man_openmp/thread_helper.h> #include <util/system/hp_timer.h> #include <util/system/info.h> @@ -22,7 +22,7 @@ #include <util/generic/maybe.h> #include <util/generic/strbuf.h> #include <util/generic/intrlist.h> -#include <util/stream/format.h> +#include <util/stream/format.h> #include <util/system/yield.h> using re2::RE2; @@ -128,11 +128,11 @@ namespace { } TString hr; - if (t > 10 * 1000) { - hr = " (" + ToString(HumanReadableSize(t, ESizeFormat::SF_QUANTITY)) + ")"; - } - - return ToString(t) + hr + " cycles"; + if (t > 10 * 1000) { + hr = " (" + ToString(HumanReadableSize(t, ESizeFormat::SF_QUANTITY)) + ")"; + } + + return ToString(t) + hr + " cycles"; } const ui64 N = GetCycleCount(); @@ -312,7 +312,7 @@ namespace { class TCSVReporter: public IReporter { public: TCSVReporter() { - Cout << "Name\tSamples\tIterations\tRun_time\tPer_iteration_sec\tPer_iteration_cycles" << Endl; + Cout << "Name\tSamples\tIterations\tRun_time\tPer_iteration_sec\tPer_iteration_cycles" << Endl; } ~TCSVReporter() override { @@ -469,7 +469,7 @@ void Out<TResult>(IOutputStream& out, const TResult& r) { out << "----------- " << LightRed() << r.TestName << Old() << " ---------------" << Endl << " samples: " << White() << r.Samples << Old() << Endl << " iterations: " << White() << r.Iterations << Old() << Endl - << " iterations hr: " << White() << HumanReadableSize(r.Iterations, SF_QUANTITY) << Old() << Endl + << " iterations hr: " << White() << HumanReadableSize(r.Iterations, SF_QUANTITY) << Old() << Endl << " run time: " << White() << r.RunTime << Old() << Endl; if (r.CyclesPerIteration) { diff --git a/library/cpp/testing/benchmark/examples/main.cpp b/library/cpp/testing/benchmark/examples/main.cpp index ddd8b05ffc..03cb856b85 100644 --- a/library/cpp/testing/benchmark/examples/main.cpp +++ b/library/cpp/testing/benchmark/examples/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/xrange.h> #include <util/generic/algorithm.h> diff --git a/library/cpp/testing/benchmark/examples/metrics/main.py b/library/cpp/testing/benchmark/examples/metrics/main.py index 8f9d9d06ae..11ab1c2cd1 100644 --- a/library/cpp/testing/benchmark/examples/metrics/main.py +++ b/library/cpp/testing/benchmark/examples/metrics/main.py @@ -3,5 +3,5 @@ import yatest.common as yc def test_export_metrics(metrics): metrics.set_benchmark(yc.execute_benchmark( - 'library/cpp/testing/benchmark/examples/examples', + 'library/cpp/testing/benchmark/examples/examples', threads=8)) diff --git a/library/cpp/testing/benchmark/examples/metrics/ya.make b/library/cpp/testing/benchmark/examples/metrics/ya.make index a9dbdca9fa..d6767e9c33 100644 --- a/library/cpp/testing/benchmark/examples/metrics/ya.make +++ b/library/cpp/testing/benchmark/examples/metrics/ya.make @@ -15,6 +15,6 @@ TAG( TEST_SRCS(main.py) -DEPENDS(library/cpp/testing/benchmark/examples) +DEPENDS(library/cpp/testing/benchmark/examples) END() diff --git a/library/cpp/testing/benchmark/main/main.cpp b/library/cpp/testing/benchmark/main/main.cpp index aabcb89c43..264a1de8e5 100644 --- a/library/cpp/testing/benchmark/main/main.cpp +++ b/library/cpp/testing/benchmark/main/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/yexception.h> #include <util/stream/output.h> diff --git a/library/cpp/testing/benchmark/main/ya.make b/library/cpp/testing/benchmark/main/ya.make index d00cdcf9fc..8ae7e336bd 100644 --- a/library/cpp/testing/benchmark/main/ya.make +++ b/library/cpp/testing/benchmark/main/ya.make @@ -10,7 +10,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/benchmark + library/cpp/testing/benchmark ) END() diff --git a/library/cpp/testing/benchmark/ya.make b/library/cpp/testing/benchmark/ya.make index f42be80698..1a2d32c4cd 100644 --- a/library/cpp/testing/benchmark/ya.make +++ b/library/cpp/testing/benchmark/ya.make @@ -13,10 +13,10 @@ SRCS( PEERDIR( contrib/libs/re2 library/cpp/colorizer - library/cpp/getopt/small + library/cpp/getopt/small library/cpp/json library/cpp/linear_regression - library/cpp/threading/poor_man_openmp + library/cpp/threading/poor_man_openmp ) END() diff --git a/library/cpp/testing/gmock_in_unittest/events.cpp b/library/cpp/testing/gmock_in_unittest/events.cpp index dbd65b727d..058d4c9087 100644 --- a/library/cpp/testing/gmock_in_unittest/events.cpp +++ b/library/cpp/testing/gmock_in_unittest/events.cpp @@ -1,6 +1,6 @@ #include "events.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/strbuf.h> #include <util/generic/string.h> diff --git a/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp b/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp index 97f19050e4..9cdebaf928 100644 --- a/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp +++ b/library/cpp/testing/gmock_in_unittest/example_ut/example_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/testing/gmock_in_unittest/gmock.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/library/cpp/testing/gmock_in_unittest/registration.cpp b/library/cpp/testing/gmock_in_unittest/registration.cpp index c2872a4c27..b2c9ee7812 100644 --- a/library/cpp/testing/gmock_in_unittest/registration.cpp +++ b/library/cpp/testing/gmock_in_unittest/registration.cpp @@ -2,7 +2,7 @@ #include <gmock/gmock.h> -#include <library/cpp/testing/unittest/plugin.h> +#include <library/cpp/testing/unittest/plugin.h> namespace { class TGMockUnittestPlugin: public NUnitTest::NPlugin::IPlugin { diff --git a/library/cpp/testing/gmock_in_unittest/ya.make b/library/cpp/testing/gmock_in_unittest/ya.make index 5de68ad98d..e7fb9fc7df 100644 --- a/library/cpp/testing/gmock_in_unittest/ya.make +++ b/library/cpp/testing/gmock_in_unittest/ya.make @@ -6,7 +6,7 @@ PEERDIR( contrib/restricted/googletest/googlemock contrib/restricted/googletest/googletest library/cpp/testing/gtest_extensions - library/cpp/testing/unittest + library/cpp/testing/unittest ) SRCS( diff --git a/library/cpp/testing/unittest/example_ut.cpp b/library/cpp/testing/unittest/example_ut.cpp index bcc1ce33f0..7dd238e1a0 100644 --- a/library/cpp/testing/unittest/example_ut.cpp +++ b/library/cpp/testing/unittest/example_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> /* * just copy-paste it for good start point diff --git a/library/cpp/testing/unittest/fat/test_port_manager.cpp b/library/cpp/testing/unittest/fat/test_port_manager.cpp index f77d2e3a25..b8fa5ab39d 100644 --- a/library/cpp/testing/unittest/fat/test_port_manager.cpp +++ b/library/cpp/testing/unittest/fat/test_port_manager.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> bool IsFreePort(ui16 port) { TInet6StreamSocket sock; diff --git a/library/cpp/testing/unittest/registar.cpp b/library/cpp/testing/unittest/registar.cpp index 3679b768ed..3bd65ef2e1 100644 --- a/library/cpp/testing/unittest/registar.cpp +++ b/library/cpp/testing/unittest/registar.cpp @@ -1,6 +1,6 @@ #include "registar.h" -#include <library/cpp/diff/diff.h> +#include <library/cpp/diff/diff.h> #include <library/cpp/colorizer/colors.h> #include <util/generic/bt_exception.h> diff --git a/library/cpp/testing/unittest/registar.h b/library/cpp/testing/unittest/registar.h index 44517a0092..6bcaf3c909 100644 --- a/library/cpp/testing/unittest/registar.h +++ b/library/cpp/testing/unittest/registar.h @@ -46,7 +46,7 @@ namespace NUnitTest { TString GetResetTag(); // Raise error handler - // Used for testing library/cpp/testing/unittest macroses + // Used for testing library/cpp/testing/unittest macroses // and unittest helpers. // For all other unittests standard handler is used using TRaiseErrorHandler = std::function<void(const char*, const TString&, bool)>; diff --git a/library/cpp/testing/unittest/registar_ut.cpp b/library/cpp/testing/unittest/registar_ut.cpp index 1f36d53abb..7d42768383 100644 --- a/library/cpp/testing/unittest/registar_ut.cpp +++ b/library/cpp/testing/unittest/registar_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TUnitTestMacroTest) { Y_UNIT_TEST(Assert) { diff --git a/library/cpp/testing/unittest/ut/main.cpp b/library/cpp/testing/unittest/ut/main.cpp index e303e21e30..02d979560d 100644 --- a/library/cpp/testing/unittest/ut/main.cpp +++ b/library/cpp/testing/unittest/ut/main.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/testing/unittest/gtest.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/gtest.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/generic/set.h> #include <util/network/sock.h> diff --git a/library/cpp/testing/unittest/ut/ya.make b/library/cpp/testing/unittest/ut/ya.make index 6d4c0959cc..318d3e5980 100644 --- a/library/cpp/testing/unittest/ut/ya.make +++ b/library/cpp/testing/unittest/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/testing/unittest) +UNITTEST_FOR(library/cpp/testing/unittest) OWNER(snowball) diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp index 305bc6b40f..fcc2bd2632 100644 --- a/library/cpp/testing/unittest/utmain.cpp +++ b/library/cpp/testing/unittest/utmain.cpp @@ -612,7 +612,7 @@ static int DoUsage(const char* progname) { << "Options:\n" << " -h, --help print this help message\n" << " -l, --list print a list of available tests\n" - << " -A --list-verbose print a list of available subtests\n" + << " -A --list-verbose print a list of available subtests\n" << " --print-before-test print each test name before running it\n" << " --print-before-suite print each test suite name before running it\n" << " --show-fails print a list of all failed tests at the end\n" @@ -683,7 +683,7 @@ int NUnitTest::RunMain(int argc, char** argv) { return DoUsage(argv[0]); } else if (strcmp(name, "--list") == 0 || strcmp(name, "-l") == 0) { listTests = LIST; - } else if (strcmp(name, "--list-verbose") == 0 || strcmp(name, "-A") == 0) { + } else if (strcmp(name, "--list-verbose") == 0 || strcmp(name, "-A") == 0) { listTests = LIST_VERBOSE; } else if (strcmp(name, "--print-before-suite=false") == 0) { processor.SetPrintBeforeSuite(false); diff --git a/library/cpp/testing/unittest/ya.make b/library/cpp/testing/unittest/ya.make index aaa4f2ba85..d247605826 100644 --- a/library/cpp/testing/unittest/ya.make +++ b/library/cpp/testing/unittest/ya.make @@ -10,7 +10,7 @@ OWNER( PEERDIR( library/cpp/colorizer library/cpp/dbg_output - library/cpp/diff + library/cpp/diff library/cpp/json/writer library/cpp/testing/common library/cpp/testing/hook diff --git a/library/cpp/testing/unittest_main/main.cpp b/library/cpp/testing/unittest_main/main.cpp index fc5d2d9418..984203e304 100644 --- a/library/cpp/testing/unittest_main/main.cpp +++ b/library/cpp/testing/unittest_main/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/utmain.h> +#include <library/cpp/testing/unittest/utmain.h> int main(int argc, char** argv) { return NUnitTest::RunMain(argc, argv); diff --git a/library/cpp/testing/unittest_main/ya.make b/library/cpp/testing/unittest_main/ya.make index 80a6cc699b..eb6df9dbaa 100644 --- a/library/cpp/testing/unittest_main/ya.make +++ b/library/cpp/testing/unittest_main/ya.make @@ -3,8 +3,8 @@ LIBRARY() OWNER(pg) PEERDIR( - library/cpp/testing/unittest - library/cpp/terminate_handler + library/cpp/testing/unittest + library/cpp/terminate_handler ) SRCS( diff --git a/library/cpp/testing/ya.make b/library/cpp/testing/ya.make index 6a57ac2ee6..96426b026a 100644 --- a/library/cpp/testing/ya.make +++ b/library/cpp/testing/ya.make @@ -1,9 +1,9 @@ RECURSE( common - benchmark - benchmark/examples - benchmark/examples/metrics - benchmark/main + benchmark + benchmark/examples + benchmark/examples/metrics + benchmark/main boost_test boost_test_main dump_clang_coverage @@ -18,7 +18,7 @@ RECURSE( gtest_protobuf hook mock_server - unittest - unittest_main + unittest + unittest_main urlnorm ) diff --git a/library/cpp/threading/atomic/bool_ut.cpp b/library/cpp/threading/atomic/bool_ut.cpp index 9481f41d8d..08286d20a4 100644 --- a/library/cpp/threading/atomic/bool_ut.cpp +++ b/library/cpp/threading/atomic/bool_ut.cpp @@ -1,6 +1,6 @@ #include "bool.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(AtomicBool) { Y_UNIT_TEST(ReadWrite) { diff --git a/library/cpp/threading/atomic/ut/ya.make b/library/cpp/threading/atomic/ut/ya.make index 3c555685df..65a9a3fb8c 100644 --- a/library/cpp/threading/atomic/ut/ya.make +++ b/library/cpp/threading/atomic/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/atomic) +UNITTEST_FOR(library/cpp/threading/atomic) OWNER(vmordovin) diff --git a/library/cpp/threading/chunk_queue/queue.h b/library/cpp/threading/chunk_queue/queue.h index 55859601a1..3e0a401b5f 100644 --- a/library/cpp/threading/chunk_queue/queue.h +++ b/library/cpp/threading/chunk_queue/queue.h @@ -534,7 +534,7 @@ namespace NThreading { void Enqueue(TAutoPtr<T> value) { Impl.Enqueue(value.Get()); - Y_UNUSED(value.Release()); + Y_UNUSED(value.Release()); } bool Dequeue(TAutoPtr<T>& value) { diff --git a/library/cpp/threading/chunk_queue/queue_ut.cpp b/library/cpp/threading/chunk_queue/queue_ut.cpp index 8cb36d8dd1..a0ed159b89 100644 --- a/library/cpp/threading/chunk_queue/queue_ut.cpp +++ b/library/cpp/threading/chunk_queue/queue_ut.cpp @@ -1,6 +1,6 @@ #include "queue.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/set.h> diff --git a/library/cpp/threading/chunk_queue/ut/ya.make b/library/cpp/threading/chunk_queue/ut/ya.make index a35ed6bc4b..7c6ffa5ef9 100644 --- a/library/cpp/threading/chunk_queue/ut/ya.make +++ b/library/cpp/threading/chunk_queue/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/chunk_queue) +UNITTEST_FOR(library/cpp/threading/chunk_queue) OWNER(g:rtmr) diff --git a/library/cpp/threading/equeue/equeue.cpp b/library/cpp/threading/equeue/equeue.cpp index 54a848e912..7bdc1d0dda 100644 --- a/library/cpp/threading/equeue/equeue.cpp +++ b/library/cpp/threading/equeue/equeue.cpp @@ -59,7 +59,7 @@ bool TElasticQueue::Add(IObjectInQueue* obj) { } if (SlaveQueue_->Add(wrapper.Get())) { - Y_UNUSED(wrapper.Release()); + Y_UNUSED(wrapper.Release()); return true; } else { return false; diff --git a/library/cpp/threading/equeue/equeue_ut.cpp b/library/cpp/threading/equeue/equeue_ut.cpp index 9cf2aced44..abedda6497 100644 --- a/library/cpp/threading/equeue/equeue_ut.cpp +++ b/library/cpp/threading/equeue/equeue_ut.cpp @@ -1,6 +1,6 @@ #include "equeue.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/event.h> #include <util/datetime/base.h> diff --git a/library/cpp/threading/equeue/ut/ya.make b/library/cpp/threading/equeue/ut/ya.make index 2f6293d47d..d0cfaeae92 100644 --- a/library/cpp/threading/equeue/ut/ya.make +++ b/library/cpp/threading/equeue/ut/ya.make @@ -6,10 +6,10 @@ OWNER( ) PEERDIR( - ADDINCL library/cpp/threading/equeue + ADDINCL library/cpp/threading/equeue ) -SRCDIR(library/cpp/threading/equeue) +SRCDIR(library/cpp/threading/equeue) SRCS( equeue_ut.cpp diff --git a/library/cpp/threading/future/async_ut.cpp b/library/cpp/threading/future/async_ut.cpp index a3699744e4..855fab8d0f 100644 --- a/library/cpp/threading/future/async_ut.cpp +++ b/library/cpp/threading/future/async_ut.cpp @@ -1,6 +1,6 @@ #include "async.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> #include <util/generic/vector.h> diff --git a/library/cpp/threading/future/core/future-inl.h b/library/cpp/threading/future/core/future-inl.h index 5fd4296a93..6703645ca9 100644 --- a/library/cpp/threading/future/core/future-inl.h +++ b/library/cpp/threading/future/core/future-inl.h @@ -691,7 +691,7 @@ namespace NThreading { EnsureInitialized(); return State->Wait(); } - + inline bool TFuture<void>::Wait(TDuration timeout) const { EnsureInitialized(); return State->Wait(timeout); diff --git a/library/cpp/threading/future/core/future.h b/library/cpp/threading/future/core/future.h index 2e82bb953e..18f55aba69 100644 --- a/library/cpp/threading/future/core/future.h +++ b/library/cpp/threading/future/core/future.h @@ -74,8 +74,8 @@ namespace NThreading { TIntrusivePtr<TFutureState> State; public: - using value_type = T; - + using value_type = T; + TFuture() noexcept = default; TFuture(const TFuture<T>& other) noexcept = default; TFuture(TFuture<T>&& other) noexcept = default; @@ -131,8 +131,8 @@ namespace NThreading { TIntrusivePtr<TFutureState> State = nullptr; public: - using value_type = void; - + using value_type = void; + TFuture() noexcept = default; TFuture(const TFuture<void>& other) noexcept = default; TFuture(TFuture<void>&& other) noexcept = default; @@ -169,9 +169,9 @@ namespace NThreading { template <typename R> TFuture<R> Return(const R& value) const; - TFuture<void> IgnoreResult() const { - return *this; - } + TFuture<void> IgnoreResult() const { + return *this; + } //! If the future is initialized returns the future state identifier. Otherwise returns an empty optional /** The state identifier is guaranteed to be unique during the future state lifetime and could be reused after its death diff --git a/library/cpp/threading/future/future_ut.cpp b/library/cpp/threading/future/future_ut.cpp index 05950a568d..2068337f4e 100644 --- a/library/cpp/threading/future/future_ut.cpp +++ b/library/cpp/threading/future/future_ut.cpp @@ -1,6 +1,6 @@ #include "future.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <list> #include <type_traits> @@ -293,23 +293,23 @@ namespace { } Y_UNIT_TEST(ShouldWaitExceptionOrAllVectorWithValueType) { - TPromise<int> promise1 = NewPromise<int>(); - TPromise<int> promise2 = NewPromise<int>(); - - TVector<TFuture<int>> promises; - promises.push_back(promise1); - promises.push_back(promise2); - + TPromise<int> promise1 = NewPromise<int>(); + TPromise<int> promise2 = NewPromise<int>(); + + TVector<TFuture<int>> promises; + promises.push_back(promise1); + promises.push_back(promise2); + TFuture<void> future = WaitExceptionOrAll(promises); - UNIT_ASSERT(!future.HasValue()); - - promise1.SetValue(0); - UNIT_ASSERT(!future.HasValue()); - - promise2.SetValue(0); - UNIT_ASSERT(future.HasValue()); - } - + UNIT_ASSERT(!future.HasValue()); + + promise1.SetValue(0); + UNIT_ASSERT(!future.HasValue()); + + promise2.SetValue(0); + UNIT_ASSERT(future.HasValue()); + } + Y_UNIT_TEST(ShouldWaitExceptionOrAllList) { TPromise<void> promise1 = NewPromise(); TPromise<void> promise2 = NewPromise(); @@ -353,25 +353,25 @@ namespace { UNIT_ASSERT(future.HasValue()); } - - Y_UNIT_TEST(ShouldWaitAnyVectorWithValueType) { - TPromise<int> promise1 = NewPromise<int>(); - TPromise<int> promise2 = NewPromise<int>(); - - TVector<TFuture<int>> promises; - promises.push_back(promise1); - promises.push_back(promise2); - - TFuture<void> future = WaitAny(promises); - UNIT_ASSERT(!future.HasValue()); - - promise1.SetValue(0); - UNIT_ASSERT(future.HasValue()); - - promise2.SetValue(0); - UNIT_ASSERT(future.HasValue()); - } - + + Y_UNIT_TEST(ShouldWaitAnyVectorWithValueType) { + TPromise<int> promise1 = NewPromise<int>(); + TPromise<int> promise2 = NewPromise<int>(); + + TVector<TFuture<int>> promises; + promises.push_back(promise1); + promises.push_back(promise2); + + TFuture<void> future = WaitAny(promises); + UNIT_ASSERT(!future.HasValue()); + + promise1.SetValue(0); + UNIT_ASSERT(future.HasValue()); + + promise2.SetValue(0); + UNIT_ASSERT(future.HasValue()); + } + Y_UNIT_TEST(ShouldWaitAnyList) { TPromise<void> promise1 = NewPromise(); TPromise<void> promise2 = NewPromise(); diff --git a/library/cpp/threading/future/legacy_future_ut.cpp b/library/cpp/threading/future/legacy_future_ut.cpp index ff63db1725..3bf8257387 100644 --- a/library/cpp/threading/future/legacy_future_ut.cpp +++ b/library/cpp/threading/future/legacy_future_ut.cpp @@ -1,6 +1,6 @@ #include "legacy_future.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NThreading { Y_UNIT_TEST_SUITE(TLegacyFutureTest) { diff --git a/library/cpp/threading/future/perf/main.cpp b/library/cpp/threading/future/perf/main.cpp index 5a0690af47..3d362cd322 100644 --- a/library/cpp/threading/future/perf/main.cpp +++ b/library/cpp/threading/future/perf/main.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/benchmark/bench.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/string.h> #include <util/generic/xrange.h> diff --git a/library/cpp/threading/future/perf/ya.make b/library/cpp/threading/future/perf/ya.make index 943d585d4b..286a8a97bb 100644 --- a/library/cpp/threading/future/perf/ya.make +++ b/library/cpp/threading/future/perf/ya.make @@ -10,7 +10,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/future + library/cpp/threading/future ) END() diff --git a/library/cpp/threading/future/subscription/subscription_ut.cpp b/library/cpp/threading/future/subscription/subscription_ut.cpp index d018ea15cc..a33f54adf2 100644 --- a/library/cpp/threading/future/subscription/subscription_ut.cpp +++ b/library/cpp/threading/future/subscription/subscription_ut.cpp @@ -1,6 +1,6 @@ #include "subscription.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NThreading; diff --git a/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp b/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp index 34ae9edb4e..5d4794cd3c 100644 --- a/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp +++ b/library/cpp/threading/future/subscription/wait_all_or_exception_ut.cpp @@ -1,7 +1,7 @@ #include "wait_all_or_exception.h" #include "wait_ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/strbuf.h> #include <atomic> diff --git a/library/cpp/threading/future/subscription/wait_all_ut.cpp b/library/cpp/threading/future/subscription/wait_all_ut.cpp index 3bc9762671..aee11c315e 100644 --- a/library/cpp/threading/future/subscription/wait_all_ut.cpp +++ b/library/cpp/threading/future/subscription/wait_all_ut.cpp @@ -1,7 +1,7 @@ #include "wait_all.h" #include "wait_ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/strbuf.h> #include <atomic> diff --git a/library/cpp/threading/future/subscription/wait_any_ut.cpp b/library/cpp/threading/future/subscription/wait_any_ut.cpp index 262080e8d1..42902832ed 100644 --- a/library/cpp/threading/future/subscription/wait_any_ut.cpp +++ b/library/cpp/threading/future/subscription/wait_any_ut.cpp @@ -1,7 +1,7 @@ #include "wait_any.h" #include "wait_ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/strbuf.h> #include <exception> diff --git a/library/cpp/threading/future/subscription/wait_ut_common.h b/library/cpp/threading/future/subscription/wait_ut_common.h index 99530dd1f6..693a153924 100644 --- a/library/cpp/threading/future/subscription/wait_ut_common.h +++ b/library/cpp/threading/future/subscription/wait_ut_common.h @@ -1,7 +1,7 @@ #pragma once #include <library/cpp/threading/future/future.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> diff --git a/library/cpp/threading/future/ut/ya.make b/library/cpp/threading/future/ut/ya.make index 566b622370..704c0c5eb1 100644 --- a/library/cpp/threading/future/ut/ya.make +++ b/library/cpp/threading/future/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/future) +UNITTEST_FOR(library/cpp/threading/future) OWNER( g:rtmr diff --git a/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp b/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp index c3027ea544..bec9b65d82 100644 --- a/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp +++ b/library/cpp/threading/light_rw_lock/bench/lightrwlock_test.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/threading/light_rw_lock/lightrwlock.h> +#include <library/cpp/threading/light_rw_lock/lightrwlock.h> #include <util/random/random.h> #ifdef _linux_ diff --git a/library/cpp/threading/light_rw_lock/bench/ya.make b/library/cpp/threading/light_rw_lock/bench/ya.make index 7969b52a50..708d20e998 100644 --- a/library/cpp/threading/light_rw_lock/bench/ya.make +++ b/library/cpp/threading/light_rw_lock/bench/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/light_rw_lock + library/cpp/threading/light_rw_lock ) END() diff --git a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp b/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp index e82063d959..87916f77e2 100644 --- a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp +++ b/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/threading/light_rw_lock/lightrwlock.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/threading/light_rw_lock/lightrwlock.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/system/atomic.h> #include <util/thread/pool.h> diff --git a/library/cpp/threading/light_rw_lock/ut/ya.make b/library/cpp/threading/light_rw_lock/ut/ya.make index 92928b837c..ce783f6616 100644 --- a/library/cpp/threading/light_rw_lock/ut/ya.make +++ b/library/cpp/threading/light_rw_lock/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/light_rw_lock) +UNITTEST_FOR(library/cpp/threading/light_rw_lock) OWNER(agri) diff --git a/library/cpp/threading/local_executor/local_executor.cpp b/library/cpp/threading/local_executor/local_executor.cpp index 1d3fbb4bf4..cda9aaaa4f 100644 --- a/library/cpp/threading/local_executor/local_executor.cpp +++ b/library/cpp/threading/local_executor/local_executor.cpp @@ -1,6 +1,6 @@ #include "local_executor.h" -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/utility.h> #include <util/system/atomic.h> diff --git a/library/cpp/threading/local_executor/local_executor.h b/library/cpp/threading/local_executor/local_executor.h index c1c824f67c..d0c622f4ef 100644 --- a/library/cpp/threading/local_executor/local_executor.h +++ b/library/cpp/threading/local_executor/local_executor.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/cast.h> #include <util/generic/fwd.h> diff --git a/library/cpp/threading/local_executor/ut/local_executor_ut.cpp b/library/cpp/threading/local_executor/ut/local_executor_ut.cpp index ac5737717c..81f37d80ba 100644 --- a/library/cpp/threading/local_executor/ut/local_executor_ut.cpp +++ b/library/cpp/threading/local_executor/ut/local_executor_ut.cpp @@ -1,7 +1,7 @@ -#include <library/cpp/threading/local_executor/local_executor.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/local_executor/local_executor.h> +#include <library/cpp/threading/future/future.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/mutex.h> #include <util/system/rwlock.h> #include <util/generic/algorithm.h> diff --git a/library/cpp/threading/local_executor/ut/ya.make b/library/cpp/threading/local_executor/ut/ya.make index be579a5ca0..8490246645 100644 --- a/library/cpp/threading/local_executor/ut/ya.make +++ b/library/cpp/threading/local_executor/ut/ya.make @@ -3,7 +3,7 @@ OWNER( gulin ) -UNITTEST_FOR(library/cpp/threading/local_executor) +UNITTEST_FOR(library/cpp/threading/local_executor) SRCS( local_executor_ut.cpp diff --git a/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp b/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp index 7417636864..8346c26894 100644 --- a/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp +++ b/library/cpp/threading/poor_man_openmp/thread_helper_ut.cpp @@ -1,6 +1,6 @@ #include "thread_helper.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/generic/yexception.h> diff --git a/library/cpp/threading/poor_man_openmp/ut/ya.make b/library/cpp/threading/poor_man_openmp/ut/ya.make index 6d7aa123ed..ef333ab91e 100644 --- a/library/cpp/threading/poor_man_openmp/ut/ya.make +++ b/library/cpp/threading/poor_man_openmp/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/poor_man_openmp) +UNITTEST_FOR(library/cpp/threading/poor_man_openmp) OWNER( pg diff --git a/library/cpp/threading/queue/basic_ut.cpp b/library/cpp/threading/queue/basic_ut.cpp index 5f56f8583e..e2a240920b 100644 --- a/library/cpp/threading/queue/basic_ut.cpp +++ b/library/cpp/threading/queue/basic_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/system/thread.h> diff --git a/library/cpp/threading/queue/queue_ut.cpp b/library/cpp/threading/queue/queue_ut.cpp index 80eca147da..1a48e1ca00 100644 --- a/library/cpp/threading/queue/queue_ut.cpp +++ b/library/cpp/threading/queue/queue_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/thread.h> #include "ut_helpers.h" diff --git a/library/cpp/threading/queue/tune_ut.cpp b/library/cpp/threading/queue/tune_ut.cpp index 7e980d3e27..84e81006aa 100644 --- a/library/cpp/threading/queue/tune_ut.cpp +++ b/library/cpp/threading/queue/tune_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "tune.h" struct TDefaultStructA { diff --git a/library/cpp/threading/queue/unordered_ut.cpp b/library/cpp/threading/queue/unordered_ut.cpp index a43b7f520e..fd5108a01a 100644 --- a/library/cpp/threading/queue/unordered_ut.cpp +++ b/library/cpp/threading/queue/unordered_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/thread.h> #include <algorithm> #include <util/generic/vector.h> diff --git a/library/cpp/threading/queue/ut/ya.make b/library/cpp/threading/queue/ut/ya.make index 8883d9bf69..647ebc0551 100644 --- a/library/cpp/threading/queue/ut/ya.make +++ b/library/cpp/threading/queue/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/queue) +UNITTEST_FOR(library/cpp/threading/queue) OWNER(agri) diff --git a/library/cpp/threading/skip_list/perf/main.cpp b/library/cpp/threading/skip_list/perf/main.cpp index 4ad52049e7..a74ffe2a04 100644 --- a/library/cpp/threading/skip_list/perf/main.cpp +++ b/library/cpp/threading/skip_list/perf/main.cpp @@ -1,6 +1,6 @@ -#include <library/cpp/threading/skip_list/skiplist.h> +#include <library/cpp/threading/skip_list/skiplist.h> -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> #include <library/cpp/charset/ci_string.h> #include <util/datetime/base.h> diff --git a/library/cpp/threading/skip_list/perf/ya.make b/library/cpp/threading/skip_list/perf/ya.make index 01bfafa404..b0df32d076 100644 --- a/library/cpp/threading/skip_list/perf/ya.make +++ b/library/cpp/threading/skip_list/perf/ya.make @@ -4,8 +4,8 @@ OWNER(g:rtmr) PEERDIR( library/cpp/charset - library/cpp/getopt/small - library/cpp/threading/skip_list + library/cpp/getopt/small + library/cpp/threading/skip_list ) SRCS( diff --git a/library/cpp/threading/skip_list/skiplist_ut.cpp b/library/cpp/threading/skip_list/skiplist_ut.cpp index 52fcffda66..eff3d92663 100644 --- a/library/cpp/threading/skip_list/skiplist_ut.cpp +++ b/library/cpp/threading/skip_list/skiplist_ut.cpp @@ -1,6 +1,6 @@ #include "skiplist.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NThreading { namespace { diff --git a/library/cpp/threading/skip_list/ut/ya.make b/library/cpp/threading/skip_list/ut/ya.make index 704a31e9a2..afe88a54ca 100644 --- a/library/cpp/threading/skip_list/ut/ya.make +++ b/library/cpp/threading/skip_list/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/skip_list) +UNITTEST_FOR(library/cpp/threading/skip_list) OWNER(g:rtmr) diff --git a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp index 3b5203194a..6a5d72aa8c 100644 --- a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp +++ b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp @@ -1,5 +1,5 @@ #include <algorithm> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> #include <util/system/atomic.h> diff --git a/library/cpp/threading/task_scheduler/ut/ya.make b/library/cpp/threading/task_scheduler/ut/ya.make index 07ee8b0877..35e32d25cd 100644 --- a/library/cpp/threading/task_scheduler/ut/ya.make +++ b/library/cpp/threading/task_scheduler/ut/ya.make @@ -1,4 +1,4 @@ -UNITTEST_FOR(library/cpp/threading/task_scheduler) +UNITTEST_FOR(library/cpp/threading/task_scheduler) OWNER(g:middle) diff --git a/library/cpp/threading/ya.make b/library/cpp/threading/ya.make index f4d850ee17..77ac7e4273 100644 --- a/library/cpp/threading/ya.make +++ b/library/cpp/threading/ya.make @@ -1,64 +1,64 @@ RECURSE( - algorithm - async_task_batch - async_task_batch/ut - atomic - atomic/ut - atomic_shared_ptr - atomic_shared_ptr/ut - blocking_counter - blocking_counter/ut - blocking_queue + algorithm + async_task_batch + async_task_batch/ut + atomic + atomic/ut + atomic_shared_ptr + atomic_shared_ptr/ut + blocking_counter + blocking_counter/ut + blocking_queue cancellation - chunk_queue - chunk_queue/ut - cron - cron/example - equeue - equeue/ut - fair_lock - fair_lock/ut - future - future/perf + chunk_queue + chunk_queue/ut + cron + cron/example + equeue + equeue/ut + fair_lock + fair_lock/ut + future + future/perf future/subscription - future/ut - hot_swap - hot_swap/ut - light_rw_lock - light_rw_lock/bench - light_rw_lock/ut - local_executor - local_executor/ut - mtp_tasks - mtp_tasks/ut - mux_event - mux_event/ut - named_lock - named_lock/ut - name_guard - name_guard/ut - periodically_updated - poor_man_openmp - poor_man_openmp/ut - queue - queue/ut - rcu - rcu/ut - serial_postprocess_queue - skip_list - skip_list/perf - skip_list/ut - synchronized - synchronized/ut - task_scheduler - task_scheduler/ut - thread_local - thread_local/benchmark - thread_local/ut - thread_namer - thread_namer/ut - ticket_lock - ticket_lock/ut - work_stealing - work_stealing/ut + future/ut + hot_swap + hot_swap/ut + light_rw_lock + light_rw_lock/bench + light_rw_lock/ut + local_executor + local_executor/ut + mtp_tasks + mtp_tasks/ut + mux_event + mux_event/ut + named_lock + named_lock/ut + name_guard + name_guard/ut + periodically_updated + poor_man_openmp + poor_man_openmp/ut + queue + queue/ut + rcu + rcu/ut + serial_postprocess_queue + skip_list + skip_list/perf + skip_list/ut + synchronized + synchronized/ut + task_scheduler + task_scheduler/ut + thread_local + thread_local/benchmark + thread_local/ut + thread_namer + thread_namer/ut + ticket_lock + ticket_lock/ut + work_stealing + work_stealing/ut ) diff --git a/library/cpp/timezone_conversion/ut/civil_ut.cpp b/library/cpp/timezone_conversion/ut/civil_ut.cpp index a21bd4bd7d..7232606fef 100644 --- a/library/cpp/timezone_conversion/ut/civil_ut.cpp +++ b/library/cpp/timezone_conversion/ut/civil_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/timezone_conversion/civil.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/str.h> diff --git a/library/cpp/timezone_conversion/ut/convert_ut.cpp b/library/cpp/timezone_conversion/ut/convert_ut.cpp index bbf9e9b826..5b0adad4bb 100644 --- a/library/cpp/timezone_conversion/ut/convert_ut.cpp +++ b/library/cpp/timezone_conversion/ut/convert_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/timezone_conversion/convert.h> -#include <library/cpp/testing/unittest/gtest.h> +#include <library/cpp/testing/unittest/gtest.h> using namespace NDatetime; diff --git a/library/cpp/timezone_conversion/ut/ya.make b/library/cpp/timezone_conversion/ut/ya.make index 781a57da9f..782288043d 100644 --- a/library/cpp/timezone_conversion/ut/ya.make +++ b/library/cpp/timezone_conversion/ut/ya.make @@ -3,7 +3,7 @@ UNITTEST() OWNER(dfyz) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest library/cpp/timezone_conversion ) diff --git a/library/cpp/tld/tld.h b/library/cpp/tld/tld.h index 9e241de090..3478c15673 100644 --- a/library/cpp/tld/tld.h +++ b/library/cpp/tld/tld.h @@ -6,7 +6,7 @@ namespace NTld { const char* const* GetTlds(); // Note that FindTld() returns empty string when @host is single domain label (without '.'). - // If you need whole @host for such case, you can use GetZone() from library/cpp/string_utils/url/url.h + // If you need whole @host for such case, you can use GetZone() from library/cpp/string_utils/url/url.h inline TStringBuf FindTld(const TStringBuf& host) { size_t p = host.rfind('.'); return p != TStringBuf::npos ? host.SubStr(p + 1) : TStringBuf(); diff --git a/library/cpp/tld/tld_ut.cpp b/library/cpp/tld/tld_ut.cpp index 733200f2b5..7c571e516b 100644 --- a/library/cpp/tld/tld_ut.cpp +++ b/library/cpp/tld/tld_ut.cpp @@ -1,6 +1,6 @@ #include "tld.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/charset/doccodes.h> diff --git a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp index 075bf0bded..4abaf0495a 100644 --- a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp +++ b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/service.cpp @@ -2,7 +2,7 @@ #include <library/cpp/tvmauth/client/facade.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> #include <library/cpp/http/server/response.h> #include <library/cpp/http/simple/http_client.h> #include <library/cpp/json/json_reader.h> diff --git a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make index dde9e7a00d..c492175667 100644 --- a/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make +++ b/library/cpp/tvmauth/client/examples/service_using_tvmtool_client/ya.make @@ -3,7 +3,7 @@ LIBRARY() OWNER(g:passport_infra) PEERDIR( - library/cpp/cgiparam + library/cpp/cgiparam library/cpp/http/simple library/cpp/tvmauth/client ) diff --git a/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h b/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h index 58ed953b63..0af3133a71 100644 --- a/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h +++ b/library/cpp/tvmauth/client/misc/api/dynamic_dst/tvm_client.h @@ -2,7 +2,7 @@ #include <library/cpp/tvmauth/client/misc/api/threaded_updater.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/map.h> #include <util/thread/lfqueue.h> diff --git a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp index 89403c15e4..83e65ebf15 100644 --- a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp +++ b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ut/tvm_client_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/tvmauth/unittest.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> #include <util/system/fs.h> diff --git a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make index f3858e602f..77426cb364 100644 --- a/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make +++ b/library/cpp/tvmauth/client/misc/api/dynamic_dst/ya.make @@ -3,7 +3,7 @@ LIBRARY() OWNER(g:passport_infra) PEERDIR( - library/cpp/threading/future + library/cpp/threading/future library/cpp/tvmauth/client ) diff --git a/library/cpp/tvmauth/client/ut/checker_ut.cpp b/library/cpp/tvmauth/client/ut/checker_ut.cpp index 54a25974c1..b9e0833b03 100644 --- a/library/cpp/tvmauth/client/ut/checker_ut.cpp +++ b/library/cpp/tvmauth/client/ut/checker_ut.cpp @@ -7,7 +7,7 @@ #include <library/cpp/tvmauth/type.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/client/ut/common.h b/library/cpp/tvmauth/client/ut/common.h index 5dddc182b5..173b433156 100644 --- a/library/cpp/tvmauth/client/ut/common.h +++ b/library/cpp/tvmauth/client/ut/common.h @@ -6,10 +6,10 @@ #include <library/cpp/tvmauth/unittest.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> #include <library/cpp/testing/mock_server/server.h> -#include <library/cpp/testing/unittest/env.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/env.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/str.h> #include <util/system/fs.h> diff --git a/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp b/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp index 7dd851c9b3..7380233c60 100644 --- a/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp +++ b/library/cpp/tvmauth/client/ut/disk_cache_ut.cpp @@ -5,8 +5,8 @@ #include <library/cpp/tvmauth/src/utils.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/file.h> #include <util/system/fs.h> diff --git a/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp b/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp index 3dcbe6ad49..322e6d96dd 100644 --- a/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp +++ b/library/cpp/tvmauth/client/ut/exponential_backoff_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/tvmauth/client/misc/exponential_backoff.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <thread> diff --git a/library/cpp/tvmauth/client/ut/facade_ut.cpp b/library/cpp/tvmauth/client/ut/facade_ut.cpp index 62e8e6c731..4fe134a945 100644 --- a/library/cpp/tvmauth/client/ut/facade_ut.cpp +++ b/library/cpp/tvmauth/client/ut/facade_ut.cpp @@ -3,7 +3,7 @@ #include <library/cpp/tvmauth/client/facade.h> #include <library/cpp/tvmauth/client/mocked_updater.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> diff --git a/library/cpp/tvmauth/client/ut/logger_ut.cpp b/library/cpp/tvmauth/client/ut/logger_ut.cpp index 76236e8913..e9e2a330dc 100644 --- a/library/cpp/tvmauth/client/ut/logger_ut.cpp +++ b/library/cpp/tvmauth/client/ut/logger_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/tvmauth/client/logger.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/client/ut/settings_ut.cpp b/library/cpp/tvmauth/client/ut/settings_ut.cpp index 76c9542442..e17a43368d 100644 --- a/library/cpp/tvmauth/client/ut/settings_ut.cpp +++ b/library/cpp/tvmauth/client/ut/settings_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/tvmauth/client/misc/api/settings.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp b/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp index 4cf449711b..43925dee94 100644 --- a/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp +++ b/library/cpp/tvmauth/client/ut/tvmapi_updater_ut.cpp @@ -4,8 +4,8 @@ #include <library/cpp/tvmauth/client/misc/disk_cache.h> #include <library/cpp/tvmauth/client/misc/api/threaded_updater.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/file.h> #include <util/string/subst.h> diff --git a/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp b/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp index 1295ed750e..8dfa6d08cf 100644 --- a/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp +++ b/library/cpp/tvmauth/client/ut/tvmtool_updater_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/tvmauth/client/misc/tool/threaded_updater.h> #include <library/cpp/http/simple/http_client.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/env.h> diff --git a/library/cpp/tvmauth/client/ut/utils_ut.cpp b/library/cpp/tvmauth/client/ut/utils_ut.cpp index e780fb2779..dbe1982d1e 100644 --- a/library/cpp/tvmauth/client/ut/utils_ut.cpp +++ b/library/cpp/tvmauth/client/ut/utils_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/tvmauth/client/misc/utils.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(UtilsTest) { using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/client/ut/ya.make b/library/cpp/tvmauth/client/ut/ya.make index e2686cd8d7..427f815238 100644 --- a/library/cpp/tvmauth/client/ut/ya.make +++ b/library/cpp/tvmauth/client/ut/ya.make @@ -5,7 +5,7 @@ OWNER(g:passport_infra) DATA(arcadia/library/cpp/tvmauth/client/ut/files) PEERDIR( - library/cpp/cgiparam + library/cpp/cgiparam library/cpp/testing/mock_server ) diff --git a/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp b/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp index 73f1b1d769..341a9eee9b 100644 --- a/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp +++ b/library/cpp/tvmauth/src/rw/ut/rw_ut.cpp @@ -1,8 +1,8 @@ #include <library/cpp/tvmauth/src/rw/keys.h> #include <library/cpp/tvmauth/src/rw/rw.h> -#include <library/cpp/string_utils/base64/base64.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/testing/unittest/registar.h> #include <contrib/libs/openssl/include/openssl/bn.h> #include <contrib/libs/openssl/include/openssl/evp.h> diff --git a/library/cpp/tvmauth/src/rw/ut/ya.make b/library/cpp/tvmauth/src/rw/ut/ya.make index 81dda79641..7c62c6a620 100644 --- a/library/cpp/tvmauth/src/rw/ut/ya.make +++ b/library/cpp/tvmauth/src/rw/ut/ya.make @@ -11,7 +11,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ) END() diff --git a/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp b/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp index 31a599c996..c93d5dde76 100644 --- a/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp +++ b/library/cpp/tvmauth/src/rw/ut_large/gen/main.cpp @@ -1,6 +1,6 @@ #include <library/cpp/tvmauth/src/rw/keys.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/generic/yexception.h> diff --git a/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make b/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make index 7b62d5c726..a4919b1e69 100644 --- a/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make +++ b/library/cpp/tvmauth/src/rw/ut_large/gen/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 library/cpp/tvmauth/src/rw ) diff --git a/library/cpp/tvmauth/src/ut/parser_ut.cpp b/library/cpp/tvmauth/src/ut/parser_ut.cpp index 530f45331a..ebb4f6d770 100644 --- a/library/cpp/tvmauth/src/ut/parser_ut.cpp +++ b/library/cpp/tvmauth/src/ut/parser_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/tvmauth/exception.h> #include <library/cpp/tvmauth/ticket_status.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ParserTestSuite) { using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/src/ut/public_ut.cpp b/library/cpp/tvmauth/src/ut/public_ut.cpp index 74a483d57b..d79b645a36 100644 --- a/library/cpp/tvmauth/src/ut/public_ut.cpp +++ b/library/cpp/tvmauth/src/ut/public_ut.cpp @@ -6,7 +6,7 @@ #include <library/cpp/tvmauth/ticket_status.h> #include <library/cpp/tvmauth/unittest.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/src/ut/service_ut.cpp b/library/cpp/tvmauth/src/ut/service_ut.cpp index 5b6b5143bd..c4db23e895 100644 --- a/library/cpp/tvmauth/src/ut/service_ut.cpp +++ b/library/cpp/tvmauth/src/ut/service_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/tvmauth/exception.h> #include <library/cpp/tvmauth/unittest.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> diff --git a/library/cpp/tvmauth/src/ut/user_ut.cpp b/library/cpp/tvmauth/src/ut/user_ut.cpp index c040e94974..7d67970dfd 100644 --- a/library/cpp/tvmauth/src/ut/user_ut.cpp +++ b/library/cpp/tvmauth/src/ut/user_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/tvmauth/exception.h> #include <library/cpp/tvmauth/unittest.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NTvmAuth; diff --git a/library/cpp/tvmauth/src/ut/utils_ut.cpp b/library/cpp/tvmauth/src/ut/utils_ut.cpp index c9cb81c36f..baf97685d1 100644 --- a/library/cpp/tvmauth/src/ut/utils_ut.cpp +++ b/library/cpp/tvmauth/src/ut/utils_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/tvmauth/src/utils.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/maybe.h> diff --git a/library/cpp/tvmauth/type.h b/library/cpp/tvmauth/type.h index 7f4ce2b700..77a2ac96ec 100644 --- a/library/cpp/tvmauth/type.h +++ b/library/cpp/tvmauth/type.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NTvmAuth { using TScopes = TSmallVec<TStringBuf>; diff --git a/library/cpp/unicode/normalization/ut/normalization_ut.cpp b/library/cpp/unicode/normalization/ut/normalization_ut.cpp index 54d4940a26..32e0963218 100644 --- a/library/cpp/unicode/normalization/ut/normalization_ut.cpp +++ b/library/cpp/unicode/normalization/ut/normalization_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/wide.h> diff --git a/library/cpp/unicode/punycode/punycode_ut.cpp b/library/cpp/unicode/punycode/punycode_ut.cpp index 97271cf0d8..69ea8638b4 100644 --- a/library/cpp/unicode/punycode/punycode_ut.cpp +++ b/library/cpp/unicode/punycode/punycode_ut.cpp @@ -1,6 +1,6 @@ #include "punycode.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/wide.h> namespace { diff --git a/library/cpp/uri/location_ut.cpp b/library/cpp/uri/location_ut.cpp index 26a0f64471..a0c3e0e4f7 100644 --- a/library/cpp/uri/location_ut.cpp +++ b/library/cpp/uri/location_ut.cpp @@ -1,6 +1,6 @@ #include "location.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TResolveRedirectTests) { Y_UNIT_TEST(Absolute) { diff --git a/library/cpp/uri/uri_ut.h b/library/cpp/uri/uri_ut.h index f8ac6e4092..2bcfe6531d 100644 --- a/library/cpp/uri/uri_ut.h +++ b/library/cpp/uri/uri_ut.h @@ -2,7 +2,7 @@ #include "uri.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NUri { struct TTest { diff --git a/library/cpp/xml/document/xml-document.cpp b/library/cpp/xml/document/xml-document.cpp index 18a554d732..c159c04d58 100644 --- a/library/cpp/xml/document/xml-document.cpp +++ b/library/cpp/xml/document/xml-document.cpp @@ -35,7 +35,7 @@ namespace NXml { if (!node) THROW(XmlException, "Can't create root node."); xmlDocSetRootElement(doc.Get(), node.Get()); - Y_UNUSED(node.Release()); + Y_UNUSED(node.Release()); Doc = std::move(doc); } break; default: @@ -56,7 +56,7 @@ namespace NXml { } void TDocument::ParseFile(const TString& file) { - if (!NFs::Exists(file)) + if (!NFs::Exists(file)) THROW(XmlException, "File " << file << " doesn't exist"); TParserCtxtPtr pctx(xmlNewParserCtxt()); diff --git a/library/cpp/xml/document/xml-document_ut.cpp b/library/cpp/xml/document/xml-document_ut.cpp index 9f537b75c4..5af699e719 100644 --- a/library/cpp/xml/document/xml-document_ut.cpp +++ b/library/cpp/xml/document/xml-document_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/map.h> #include "xml-document.h" diff --git a/library/cpp/xml/document/xml-options_ut.cpp b/library/cpp/xml/document/xml-options_ut.cpp index 9be16baf3d..3458917bad 100644 --- a/library/cpp/xml/document/xml-options_ut.cpp +++ b/library/cpp/xml/document/xml-options_ut.cpp @@ -1,6 +1,6 @@ #include "xml-options.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestXmlOptions) { Y_UNIT_TEST(SetHuge) { diff --git a/library/cpp/xml/document/xml-textreader_ut.cpp b/library/cpp/xml/document/xml-textreader_ut.cpp index 6232dfe47e..960cd807db 100644 --- a/library/cpp/xml/document/xml-textreader_ut.cpp +++ b/library/cpp/xml/document/xml-textreader_ut.cpp @@ -1,6 +1,6 @@ #include "xml-textreader.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash.h> #include <util/generic/vector.h> diff --git a/library/cpp/ya.make b/library/cpp/ya.make index 8c1193b007..977a8945ae 100644 --- a/library/cpp/ya.make +++ b/library/cpp/ya.make @@ -28,11 +28,11 @@ RECURSE( bloom_filter/ut bucket_quoter build_info - cache + cache case_insensitive_string - cgiparam - cgiparam/fuzz - cgiparam/ut + cgiparam + cgiparam/fuzz + cgiparam/ut charset charset/ut chromium_trace @@ -72,8 +72,8 @@ RECURSE( dbg_output dbg_output/ut deprecated - diff - diff/ut + diff + diff/ut digest disjoint_sets disjoint_sets/ut @@ -83,9 +83,9 @@ RECURSE( dolbilo/ut domtree domtree/tool - dot_product - dot_product/bench - dot_product/ut + dot_product + dot_product/bench + dot_product/ut dwarf_backtrace dwarf_backtrace/registry edit_distance @@ -122,8 +122,8 @@ RECURSE( file_checker/ut flatbuffers64_introspection flatbuffers64_introspection/example - float16 - float16/ut + float16 + float16/ut framing framing/ut fuid @@ -138,10 +138,10 @@ RECURSE( geohash/ut geolocation geotarget - getopt - getopt/last_getopt_demo - getopt/small - getopt/ut + getopt + getopt/last_getopt_demo + getopt/small + getopt/ut getoptpb gettimeofday gradient_optimize @@ -262,7 +262,7 @@ RECURSE( object_factory object_factory/ut offroad - on_disk + on_disk online_hnsw online_hnsw/ut openssl @@ -340,7 +340,7 @@ RECURSE( sorter/ut sqlite3 sqlite3/ut - sse + sse ssh ssh/ut ssh_sign @@ -358,8 +358,8 @@ RECURSE( svnversion telfinder telfinder/ut - terminate_handler - terminate_handler/sample + terminate_handler + terminate_handler/sample testing text_processing threading @@ -438,7 +438,7 @@ IF (OS_WINDOWS) ELSE() RECURSE( fuse - sse/ut + sse/ut tf xdelta3 zookeeper diff --git a/library/cpp/yaml/as/ut/tstring_test.cpp b/library/cpp/yaml/as/ut/tstring_test.cpp index 2ad4f6c572..4ea77b5a7a 100644 --- a/library/cpp/yaml/as/ut/tstring_test.cpp +++ b/library/cpp/yaml/as/ut/tstring_test.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/yaml/as/tstring.h> #include <contrib/libs/yaml-cpp/include/yaml-cpp/yaml.h> diff --git a/library/cpp/yson/json/json_writer.cpp b/library/cpp/yson/json/json_writer.cpp index 87481256ec..f062683ede 100644 --- a/library/cpp/yson/json/json_writer.cpp +++ b/library/cpp/yson/json/json_writer.cpp @@ -17,21 +17,21 @@ namespace NYT { EJsonFormat format, EJsonAttributesMode attributesMode, ESerializedBoolFormat booleanFormat) - : TJsonWriter( - output, - NJson::TJsonWriterConfig{}.SetFormatOutput(format == JF_PRETTY), - type, - attributesMode, - booleanFormat - ) - {} - - TJsonWriter::TJsonWriter( - IOutputStream* output, - NJson::TJsonWriterConfig config, + : TJsonWriter( + output, + NJson::TJsonWriterConfig{}.SetFormatOutput(format == JF_PRETTY), + type, + attributesMode, + booleanFormat + ) + {} + + TJsonWriter::TJsonWriter( + IOutputStream* output, + NJson::TJsonWriterConfig config, ::NYson::EYsonType type, - EJsonAttributesMode attributesMode, - ESerializedBoolFormat booleanFormat) + EJsonAttributesMode attributesMode, + ESerializedBoolFormat booleanFormat) : Output(output) , Type(type) , AttributesMode(attributesMode) @@ -44,7 +44,7 @@ namespace NYT { UnderlyingJsonWriter.Reset(new NJson::TJsonWriter( output, - config)); + config)); JsonWriter = UnderlyingJsonWriter.Get(); HasAttributes = false; InAttributesBalance = 0; diff --git a/library/cpp/yson/json/json_writer.h b/library/cpp/yson/json/json_writer.h index d84ac0de53..8cbb02c51c 100644 --- a/library/cpp/yson/json/json_writer.h +++ b/library/cpp/yson/json/json_writer.h @@ -36,13 +36,13 @@ namespace NYT { EJsonAttributesMode attributesMode = JAM_ON_DEMAND, ESerializedBoolFormat booleanFormat = SBF_STRING); - TJsonWriter( - IOutputStream* output, - NJson::TJsonWriterConfig config, + TJsonWriter( + IOutputStream* output, + NJson::TJsonWriterConfig config, ::NYson::EYsonType type = ::NYson::EYsonType::Node, - EJsonAttributesMode attributesMode = JAM_ON_DEMAND, - ESerializedBoolFormat booleanFormat = SBF_STRING); - + EJsonAttributesMode attributesMode = JAM_ON_DEMAND, + ESerializedBoolFormat booleanFormat = SBF_STRING); + void Flush(); void OnStringScalar(TStringBuf value) override; diff --git a/library/cpp/yson/node/node.cpp b/library/cpp/yson/node/node.cpp index b39e070718..5f0a956096 100644 --- a/library/cpp/yson/node/node.cpp +++ b/library/cpp/yson/node/node.cpp @@ -123,7 +123,7 @@ TNode::TNode(int i) TNode::TNode(unsigned int ui) : Value_(static_cast<ui64>(ui)) { } - + TNode::TNode(long i) : Value_(static_cast<i64>(i)) { } @@ -849,7 +849,7 @@ void TNode::CreateAttributes() Attributes_ = MakeHolder<TNode>(); Attributes_->Value_ = TMapType(); } - + void TNode::Save(IOutputStream* out) const { NodeToYsonStream(*this, out, NYson::EYsonFormat::Binary); diff --git a/library/cpp/yson/node/node.h b/library/cpp/yson/node/node.h index 5f90f95df0..c06d8e6070 100644 --- a/library/cpp/yson/node/node.h +++ b/library/cpp/yson/node/node.h @@ -79,21 +79,21 @@ public: TNode(TString s); TNode(int i); - //this case made speccially for prevent mess cast of EType into TNode through TNode(int) constructor + //this case made speccially for prevent mess cast of EType into TNode through TNode(int) constructor //usual case of error SomeNode == TNode::Undefined <-- SomeNode indeed will be compared with TNode(0) without this method //correct way is SomeNode.GetType() == TNode::Undefined - template<class T = EType> - Y_FORCE_INLINE TNode(EType) - { - static_assert(!std::is_same<T, EType>::value, "looks like a mistake, may be you forget .GetType()"); - } - - //this case made speccially for prevent mess cast of T* into TNode through implicit bool ctr - template<class T = int> - Y_FORCE_INLINE TNode(const T*) : TNode() { - static_assert(!std::is_same<T,T>::value, "looks like a mistake, and pointer have converted to bool"); - } - + template<class T = EType> + Y_FORCE_INLINE TNode(EType) + { + static_assert(!std::is_same<T, EType>::value, "looks like a mistake, may be you forget .GetType()"); + } + + //this case made speccially for prevent mess cast of T* into TNode through implicit bool ctr + template<class T = int> + Y_FORCE_INLINE TNode(const T*) : TNode() { + static_assert(!std::is_same<T,T>::value, "looks like a mistake, and pointer have converted to bool"); + } + TNode(unsigned int ui); TNode(long i); TNode(unsigned long ui); diff --git a/library/cpp/yson/node/node_io.cpp b/library/cpp/yson/node/node_io.cpp index 294a7f7217..443ba2cf1d 100644 --- a/library/cpp/yson/node/node_io.cpp +++ b/library/cpp/yson/node/node_io.cpp @@ -134,9 +134,9 @@ TNode NodeFromJsonString(const TStringBuf input) TNodeBuilder builder(&result); TYson2JsonCallbacksAdapter callbacks(&builder, /*throwException*/ true); - NJson::TJsonReaderConfig config; - config.DontValidateUtf8 = true; - NJson::ReadJson(&stream, &config, &callbacks); + NJson::TJsonReaderConfig config; + config.DontValidateUtf8 = true; + NJson::ReadJson(&stream, &config, &callbacks); return result; } diff --git a/library/cpp/yson/node/node_ut.cpp b/library/cpp/yson/node/node_ut.cpp index 448e99f575..de9cf702ea 100644 --- a/library/cpp/yson/node/node_ut.cpp +++ b/library/cpp/yson/node/node_ut.cpp @@ -1,7 +1,7 @@ #include "node.h" #include "node_io.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/ysaveload.h> diff --git a/library/cpp/yson_pull/ut/cescape_ut.cpp b/library/cpp/yson_pull/ut/cescape_ut.cpp index 6628ba1d15..02ce795f90 100644 --- a/library/cpp/yson_pull/ut/cescape_ut.cpp +++ b/library/cpp/yson_pull/ut/cescape_ut.cpp @@ -1,6 +1,6 @@ #include <library/cpp/yson_pull/detail/cescape.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYsonPull::NDetail; diff --git a/library/cpp/yson_pull/ut/loop_ut.cpp b/library/cpp/yson_pull/ut/loop_ut.cpp index 8c7b11dd1c..930d320acf 100644 --- a/library/cpp/yson_pull/ut/loop_ut.cpp +++ b/library/cpp/yson_pull/ut/loop_ut.cpp @@ -3,7 +3,7 @@ #include <library/cpp/yson_pull/reader.h> #include <library/cpp/yson_pull/writer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <cerrno> #include <cmath> diff --git a/library/cpp/yson_pull/ut/reader_ut.cpp b/library/cpp/yson_pull/ut/reader_ut.cpp index 1184265ddb..e7ce4d66e7 100644 --- a/library/cpp/yson_pull/ut/reader_ut.cpp +++ b/library/cpp/yson_pull/ut/reader_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/yson_pull/detail/cescape.h> #include <library/cpp/yson_pull/detail/macros.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace { NYsonPull::TReader memory_reader(TStringBuf data, NYsonPull::EStreamType mode) { diff --git a/library/cpp/yson_pull/ut/writer_ut.cpp b/library/cpp/yson_pull/ut/writer_ut.cpp index 5c304bad0f..5f2b7cefc7 100644 --- a/library/cpp/yson_pull/ut/writer_ut.cpp +++ b/library/cpp/yson_pull/ut/writer_ut.cpp @@ -1,7 +1,7 @@ #include <library/cpp/yson_pull/scalar.h> #include <library/cpp/yson_pull/detail/writer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/tools/archiver/alignment_test/alignment_ut.cpp b/tools/archiver/alignment_test/alignment_ut.cpp index 88b07e19b0..f08c9e9c1e 100644 --- a/tools/archiver/alignment_test/alignment_ut.cpp +++ b/tools/archiver/alignment_test/alignment_ut.cpp @@ -1,41 +1,41 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/archive/yarchive.h> -#include <util/memory/blob.h> - -extern "C" { - extern const ui8 ArchiveAsm[]; - extern const ui32 ArchiveAsmSize; -} - -static const unsigned char SimpleArchive[] = { - #include <tools/archiver/alignment_test/simple_archive.inc> -}; - - -Y_UNIT_TEST_SUITE(AlignmentTest) { - Y_UNIT_TEST(SimpleArchiveCheck) { - UNIT_ASSERT_VALUES_EQUAL(size_t(SimpleArchive) % ArchiveWriterDefaultDataAlignment, 0); - TArchiveReader dataArchive( - TBlob::NoCopy(SimpleArchive, sizeof(SimpleArchive)) - ); - auto dataFile1 = dataArchive.BlobByKey("/data_file.txt"); - auto dataFile2 = dataArchive.BlobByKey("/data_file2.txt"); +#include <util/memory/blob.h> + +extern "C" { + extern const ui8 ArchiveAsm[]; + extern const ui32 ArchiveAsmSize; +} + +static const unsigned char SimpleArchive[] = { + #include <tools/archiver/alignment_test/simple_archive.inc> +}; + + +Y_UNIT_TEST_SUITE(AlignmentTest) { + Y_UNIT_TEST(SimpleArchiveCheck) { + UNIT_ASSERT_VALUES_EQUAL(size_t(SimpleArchive) % ArchiveWriterDefaultDataAlignment, 0); + TArchiveReader dataArchive( + TBlob::NoCopy(SimpleArchive, sizeof(SimpleArchive)) + ); + auto dataFile1 = dataArchive.BlobByKey("/data_file.txt"); + auto dataFile2 = dataArchive.BlobByKey("/data_file2.txt"); UNIT_ASSERT_NO_DIFF(TStringBuf(dataFile1.AsCharPtr(), dataFile1.Size()), "some text\n"); UNIT_ASSERT_NO_DIFF(TStringBuf(dataFile2.AsCharPtr(), dataFile2.Size()), "second file content\n"); UNIT_ASSERT_VALUES_EQUAL(size_t(dataFile1.AsCharPtr()) % ArchiveWriterDefaultDataAlignment, 0); UNIT_ASSERT_VALUES_EQUAL(size_t(dataFile2.AsCharPtr()) % ArchiveWriterDefaultDataAlignment, 0); - } - - Y_UNIT_TEST(ArchiveAsmCheck) { - UNIT_ASSERT_VALUES_EQUAL(size_t(ArchiveAsm) % ArchiveWriterDefaultDataAlignment, 0); - TArchiveReader dataArchive( - TBlob::NoCopy(ArchiveAsm, ArchiveAsmSize) - ); - auto dataFile1 = dataArchive.BlobByKey("/data_file.txt"); - auto dataFile2 = dataArchive.BlobByKey("/data_file2.txt"); + } + + Y_UNIT_TEST(ArchiveAsmCheck) { + UNIT_ASSERT_VALUES_EQUAL(size_t(ArchiveAsm) % ArchiveWriterDefaultDataAlignment, 0); + TArchiveReader dataArchive( + TBlob::NoCopy(ArchiveAsm, ArchiveAsmSize) + ); + auto dataFile1 = dataArchive.BlobByKey("/data_file.txt"); + auto dataFile2 = dataArchive.BlobByKey("/data_file2.txt"); UNIT_ASSERT_NO_DIFF(TStringBuf(dataFile1.AsCharPtr(), dataFile1.Size()), "some text\n"); UNIT_ASSERT_NO_DIFF(TStringBuf(dataFile2.AsCharPtr(), dataFile2.Size()), "second file content\n"); UNIT_ASSERT_VALUES_EQUAL(size_t(dataFile1.AsCharPtr()) % ArchiveWriterDefaultDataAlignment, 0); UNIT_ASSERT_VALUES_EQUAL(size_t(dataFile2.AsCharPtr()) % ArchiveWriterDefaultDataAlignment, 0); - } -} + } +} diff --git a/tools/archiver/alignment_test/data_file.txt b/tools/archiver/alignment_test/data_file.txt index 7b57bd29ea..c3ad8fa951 100644 --- a/tools/archiver/alignment_test/data_file.txt +++ b/tools/archiver/alignment_test/data_file.txt @@ -1 +1 @@ -some text +some text diff --git a/tools/archiver/alignment_test/data_file2.txt b/tools/archiver/alignment_test/data_file2.txt index 514211a0c1..63b9f2f9ed 100644 --- a/tools/archiver/alignment_test/data_file2.txt +++ b/tools/archiver/alignment_test/data_file2.txt @@ -1 +1 @@ -second file content +second file content diff --git a/tools/archiver/alignment_test/ya.make b/tools/archiver/alignment_test/ya.make index 459ba58881..7407a7ab11 100644 --- a/tools/archiver/alignment_test/ya.make +++ b/tools/archiver/alignment_test/ya.make @@ -1,30 +1,30 @@ -UNITTEST() - -OWNER( - ilnurkh - g:ymake -) - -SRCS( - alignment_ut.cpp -) - -ARCHIVE_ASM( - NAME ArchiveAsm DONTCOMPRESS - data_file.txt - data_file2.txt -) - -ARCHIVE( - NAME simple_archive.inc DONTCOMPRESS - data_file.txt - data_file2.txt -) - - -PEERDIR( +UNITTEST() + +OWNER( + ilnurkh + g:ymake +) + +SRCS( + alignment_ut.cpp +) + +ARCHIVE_ASM( + NAME ArchiveAsm DONTCOMPRESS + data_file.txt + data_file2.txt +) + +ARCHIVE( + NAME simple_archive.inc DONTCOMPRESS + data_file.txt + data_file2.txt +) + + +PEERDIR( library/cpp/archive -) - - -END() +) + + +END() diff --git a/tools/archiver/main.cpp b/tools/archiver/main.cpp index 6cda54c1ea..022c0884fd 100644 --- a/tools/archiver/main.cpp +++ b/tools/archiver/main.cpp @@ -1,7 +1,7 @@ #include <library/cpp/archive/yarchive.h> #include <library/cpp/deprecated/mapped_file/mapped_file.h> #include <library/cpp/digest/md5/md5.h> -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> #include <util/folder/dirut.h> #include <util/folder/filelist.h> @@ -414,7 +414,7 @@ namespace { }; } -static TString CutFirstSlash(const TString& fileName) { +static TString CutFirstSlash(const TString& fileName) { if (fileName[0] == '/') { return fileName.substr(1); } else { @@ -441,7 +441,7 @@ static void UnpackArchive(const TString& archive, const TFsPath& dir = TFsPath() const size_t count = reader.Count(); for (size_t i = 0; i < count; ++i) { const TString key = reader.KeyByIndex(i); - const TString fileName = CutFirstSlash(key); + const TString fileName = CutFirstSlash(key); if (!Quiet) { Cerr << archive << " --> " << fileName << Endl; } @@ -454,30 +454,30 @@ static void UnpackArchive(const TString& archive, const TFsPath& dir = TFsPath() } } -static void ListArchive(const TString& archive, bool cutSlash) { +static void ListArchive(const TString& archive, bool cutSlash) { TMappingReader mappingReader(archive); const TArchiveReader& reader = mappingReader.Reader; const size_t count = reader.Count(); for (size_t i = 0; i < count; ++i) { const TString key = reader.KeyByIndex(i); - TString fileName = key; - if (cutSlash) { - fileName = CutFirstSlash(key); - } + TString fileName = key; + if (cutSlash) { + fileName = CutFirstSlash(key); + } Cout << fileName << Endl; } } -static void ListArchiveMd5(const TString& archive, bool cutSlash) { +static void ListArchiveMd5(const TString& archive, bool cutSlash) { TMappingReader mappingReader(archive); const TArchiveReader& reader = mappingReader.Reader; const size_t count = reader.Count(); for (size_t i = 0; i < count; ++i) { const TString key = reader.KeyByIndex(i); - TString fileName = key; - if (cutSlash) { - fileName = CutFirstSlash(key); - } + TString fileName = key; + if (cutSlash) { + fileName = CutFirstSlash(key); + } char md5buf[33]; Cout << fileName << '\t' << MD5::Stream(reader.ObjectByKey(key).Get(), md5buf) << Endl; } @@ -534,12 +534,12 @@ int main(int argc, char** argv) { .Optional() .StoreValue(&list, true); - bool cutSlash = true; - opts.AddLongOption("as-is", "somewhy slash is cutted by default in list; with this option key will be shown as-is") - .NoArgument() - .Optional() - .StoreValue(&cutSlash, false); - + bool cutSlash = true; + opts.AddLongOption("as-is", "somewhy slash is cutted by default in list; with this option key will be shown as-is") + .NoArgument() + .Optional() + .StoreValue(&cutSlash, false); + bool listMd5 = false; opts.AddLongOption('m', "md5", "List files in archive with MD5 sums") .NoArgument() @@ -635,11 +635,11 @@ int main(int argc, char** argv) { try { if (listMd5) { for (const auto& rec: recs) { - ListArchiveMd5(rec.Path, cutSlash); + ListArchiveMd5(rec.Path, cutSlash); } } else if (list) { for (const auto& rec: recs) { - ListArchive(rec.Path, cutSlash); + ListArchive(rec.Path, cutSlash); } } else if (unpack) { const TFsPath dir(unpackDir); diff --git a/tools/archiver/tests/test.py b/tools/archiver/tests/test.py index b92d58f6a9..be076bc3fd 100644 --- a/tools/archiver/tests/test.py +++ b/tools/archiver/tests/test.py @@ -64,5 +64,5 @@ class TestArchiver(object): with open('result_dedup', 'rb') as f_dedup, open('result_no_dedup', 'rb') as f_no_dedup: archive_dedup = f_dedup.read() archive_no_dedup = f_no_dedup.read() - assert len(archive_dedup) == 58 - assert len(archive_no_dedup) == 75 + assert len(archive_dedup) == 58 + assert len(archive_no_dedup) == 75 diff --git a/tools/archiver/ya.make b/tools/archiver/ya.make index 757378c1b3..9193a14838 100644 --- a/tools/archiver/ya.make +++ b/tools/archiver/ya.make @@ -8,7 +8,7 @@ OWNER( PEERDIR( library/cpp/archive library/cpp/digest/md5 - library/cpp/getopt/small + library/cpp/getopt/small ) SRCS( diff --git a/tools/enum_parser/enum_parser/main.cpp b/tools/enum_parser/enum_parser/main.cpp index 0943c69c1d..10dc2915a6 100644 --- a/tools/enum_parser/enum_parser/main.cpp +++ b/tools/enum_parser/enum_parser/main.cpp @@ -1,6 +1,6 @@ #include <library/cpp/json/writer/json_value.h> #include <library/cpp/json/writer/json.h> -#include <library/cpp/getopt/small/last_getopt.h> +#include <library/cpp/getopt/small/last_getopt.h> #include <tools/enum_parser/parse_enum/parse_enum.h> diff --git a/tools/fix_elf/patch.cpp b/tools/fix_elf/patch.cpp index d49ebab307..c71bd09b42 100644 --- a/tools/fix_elf/patch.cpp +++ b/tools/fix_elf/patch.cpp @@ -1,6 +1,6 @@ #include "patch.h" -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <util/generic/algorithm.h> #include <util/generic/hash.h> diff --git a/tools/ya.make b/tools/ya.make index 51a6b8b426..a458163fac 100644 --- a/tools/ya.make +++ b/tools/ya.make @@ -2,7 +2,7 @@ RECURSE( acceleo arcdocidstrip archiver - archiver/alignment_test + archiver/alignment_test archiver/tests base64 bigram_compiler diff --git a/util/charset/benchmark/to_lower/main.cpp b/util/charset/benchmark/to_lower/main.cpp index e95fdc2371..56599b1770 100644 --- a/util/charset/benchmark/to_lower/main.cpp +++ b/util/charset/benchmark/to_lower/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/charset/wide.h> #include <util/generic/singleton.h> diff --git a/util/charset/benchmark/utf8_to_wide/main.cpp b/util/charset/benchmark/utf8_to_wide/main.cpp index 09fa567fe5..3a56c34361 100644 --- a/util/charset/benchmark/utf8_to_wide/main.cpp +++ b/util/charset/benchmark/utf8_to_wide/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/random/fast.h> #include <util/random/random.h> @@ -103,59 +103,59 @@ inline size_t UTF8ToWideImplSSE(const char* text, size_t len, TCharType* dest, s return UTF8ToWideImpl(text, len, dest, written); } -static wchar16 WBUF_UTF16[10000000]; -static wchar32 WBUF_UTF32[10000000]; +static wchar16 WBUF_UTF16[10000000]; +static wchar32 WBUF_UTF32[10000000]; -#define UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(impl, length, to) \ - Y_CPU_BENCHMARK(UTF8ToWideASCII##impl##length##to, iface) { \ - const auto& data = *Singleton<RAS##length>(); \ - for (size_t x = 0; x < iface.Iterations(); ++x) { \ - size_t written = 0; \ - Y_DO_NOT_OPTIMIZE_AWAY(UTF8ToWideImpl##impl<false>(data.begin(), data.size(), WBUF_##to, written)); \ - } \ +#define UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(impl, length, to) \ + Y_CPU_BENCHMARK(UTF8ToWideASCII##impl##length##to, iface) { \ + const auto& data = *Singleton<RAS##length>(); \ + for (size_t x = 0; x < iface.Iterations(); ++x) { \ + size_t written = 0; \ + Y_DO_NOT_OPTIMIZE_AWAY(UTF8ToWideImpl##impl<false>(data.begin(), data.size(), WBUF_##to, written)); \ + } \ } -#define UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(impl, length, to) \ - Y_CPU_BENCHMARK(UTF8ToWideRU##impl##length##to, iface) { \ - const auto& data = *Singleton<RRS##length>(); \ - for (size_t x = 0; x < iface.Iterations(); ++x) { \ - size_t written = 0; \ - Y_DO_NOT_OPTIMIZE_AWAY(UTF8ToWideImpl##impl<false>(data.begin(), data.size(), WBUF_##to, written)); \ - } \ +#define UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(impl, length, to) \ + Y_CPU_BENCHMARK(UTF8ToWideRU##impl##length##to, iface) { \ + const auto& data = *Singleton<RRS##length>(); \ + for (size_t x = 0; x < iface.Iterations(); ++x) { \ + size_t written = 0; \ + Y_DO_NOT_OPTIMIZE_AWAY(UTF8ToWideImpl##impl<false>(data.begin(), data.size(), WBUF_##to, written)); \ + } \ } -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 10, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 10, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000000, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000000, UTF16); - -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 10, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 10, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000000, UTF16); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000000, UTF16); - -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 10, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 10, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000000, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000000, UTF32); - -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 10, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 10, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000000, UTF32); -UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 10, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 10, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000000, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000000, UTF16); + +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 10, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 10, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000000, UTF16); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000000, UTF16); + +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 10, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 10, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(Scalar, 1000000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_ASCII(SSE, 1000000, UTF32); + +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 10, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 10, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(Scalar, 1000000, UTF32); +UTF8_TO_WIDE_SCALAR_BENCHMARK_RU(SSE, 1000000, UTF32); diff --git a/util/charset/utf8.h b/util/charset/utf8.h index 5039b46ae9..08499ff77f 100644 --- a/util/charset/utf8.h +++ b/util/charset/utf8.h @@ -194,7 +194,7 @@ inline RECODE_RESULT SafeReadUTF8Char(wchar32& rune, size_t& rune_len, const uns //! @param c value of the current character //! @param p pointer to the current character, it will be changed in case of valid UTF8 byte sequence //! @param e the end of the character sequence -Y_FORCE_INLINE RECODE_RESULT ReadUTF8CharAndAdvance(wchar32& rune, const unsigned char*& p, const unsigned char* e) noexcept { +Y_FORCE_INLINE RECODE_RESULT ReadUTF8CharAndAdvance(wchar32& rune, const unsigned char*& p, const unsigned char* e) noexcept { Y_ASSERT(p < e); // since p < e then we will check RECODE_EOINPUT only for n > 1 (see calls of this functions) switch (UTF8RuneLen(*p)) { case 0: diff --git a/util/charset/utf8_ut.cpp b/util/charset/utf8_ut.cpp index 9e68881cca..7f50134624 100644 --- a/util/charset/utf8_ut.cpp +++ b/util/charset/utf8_ut.cpp @@ -4,8 +4,8 @@ #include <util/stream/file.h> #include <util/ysaveload.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/env.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/env.h> Y_UNIT_TEST_SUITE(TUtfUtilTest) { Y_UNIT_TEST(TestUTF8Len) { diff --git a/util/charset/wide.cpp b/util/charset/wide.cpp index a287438ddd..7e96349631 100644 --- a/util/charset/wide.cpp +++ b/util/charset/wide.cpp @@ -146,8 +146,8 @@ bool IsTitleWord(const TWtringBuf text) noexcept { return IsLowerWord({p, pe}); } -template <bool stopOnFirstModification, typename TCharType, typename F> -static bool ModifySequence(TCharType*& p, const TCharType* const pe, F&& f) { +template <bool stopOnFirstModification, typename TCharType, typename F> +static bool ModifySequence(TCharType*& p, const TCharType* const pe, F&& f) { while (p != pe) { const auto symbol = ReadSymbol(p, pe); const auto modified = f(symbol); @@ -165,8 +165,8 @@ static bool ModifySequence(TCharType*& p, const TCharType* const pe, F&& f) { return false; } -template <bool stopOnFirstModification, typename TCharType, typename F> -static bool ModifySequence(const TCharType*& p, const TCharType* const pe, TCharType*& out, F&& f) { +template <bool stopOnFirstModification, typename TCharType, typename F> +static bool ModifySequence(const TCharType*& p, const TCharType* const pe, TCharType*& out, F&& f) { while (p != pe) { const auto symbol = stopOnFirstModification ? ReadSymbol(p, pe) : ReadSymbolAndAdvance(p, pe); const auto modified = f(symbol); @@ -193,8 +193,8 @@ static void DetachAndFixPointers(TStringType& text, typename TStringType::value_ pe = p + count; } -template <class TStringType, typename F> -static bool ModifyStringSymbolwise(TStringType& text, size_t pos, size_t count, F&& f) { +template <class TStringType, typename F> +static bool ModifyStringSymbolwise(TStringType& text, size_t pos, size_t count, F&& f) { // TODO(yazevnul): this is done for consistency with `TUtf16String::to_lower` and friends // at r2914050, maybe worth replacing them with asserts. Also see the same code in `ToTitle`. pos = pos < text.size() ? pos : text.size(); @@ -225,16 +225,16 @@ bool ToUpper(TUtf16String& text, size_t pos, size_t count) { return ModifyStringSymbolwise(text, pos, count, f); } -bool ToLower(TUtf32String& text, size_t pos, size_t count) { +bool ToLower(TUtf32String& text, size_t pos, size_t count) { const auto f = [](const wchar32 s) { return ToLower(s); }; - return ModifyStringSymbolwise(text, pos, count, f); -} - -bool ToUpper(TUtf32String& text, size_t pos, size_t count) { + return ModifyStringSymbolwise(text, pos, count, f); +} + +bool ToUpper(TUtf32String& text, size_t pos, size_t count) { const auto f = [](const wchar32 s) { return ToUpper(s); }; - return ModifyStringSymbolwise(text, pos, count, f); -} - + return ModifyStringSymbolwise(text, pos, count, f); +} + bool ToTitle(TUtf16String& text, size_t pos, size_t count) { if (!text) { return false; @@ -266,37 +266,37 @@ bool ToTitle(TUtf16String& text, size_t pos, size_t count) { return false; } -bool ToTitle(TUtf32String& text, size_t pos, size_t count) { - if (!text) { - return false; - } - - pos = pos < text.size() ? pos : text.size(); - count = count < text.size() - pos ? count : text.size() - pos; - +bool ToTitle(TUtf32String& text, size_t pos, size_t count) { + if (!text) { + return false; + } + + pos = pos < text.size() ? pos : text.size(); + count = count < text.size() - pos ? count : text.size() - pos; + const auto toLower = [](const wchar32 s) { return ToLower(s); }; - - auto* p = const_cast<wchar32*>(text.data() + pos); - const auto* pe = text.data() + pos + count; - - const auto firstSymbol = *p; - if (firstSymbol == ToTitle(firstSymbol)) { - p += 1; - if (ModifySequence<true>(p, pe, toLower)) { - DetachAndFixPointers(text, p, pe); - ModifySequence<false>(p, pe, toLower); - return true; - } - } else { - DetachAndFixPointers(text, p, pe); - WriteSymbol(ToTitle(ReadSymbol(p, pe)), p); // also moves `p` forward - ModifySequence<false>(p, pe, toLower); - return true; - } - - return false; -} - + + auto* p = const_cast<wchar32*>(text.data() + pos); + const auto* pe = text.data() + pos + count; + + const auto firstSymbol = *p; + if (firstSymbol == ToTitle(firstSymbol)) { + p += 1; + if (ModifySequence<true>(p, pe, toLower)) { + DetachAndFixPointers(text, p, pe); + ModifySequence<false>(p, pe, toLower); + return true; + } + } else { + DetachAndFixPointers(text, p, pe); + WriteSymbol(ToTitle(ReadSymbol(p, pe)), p); // also moves `p` forward + ModifySequence<false>(p, pe, toLower); + return true; + } + + return false; +} + TUtf16String ToLowerRet(TUtf16String text, size_t pos, size_t count) { ToLower(text, pos, count); return text; @@ -312,21 +312,21 @@ TUtf16String ToTitleRet(TUtf16String text, size_t pos, size_t count) { return text; } -TUtf32String ToLowerRet(TUtf32String text, size_t pos, size_t count) { - ToLower(text, pos, count); - return text; -} - -TUtf32String ToUpperRet(TUtf32String text, size_t pos, size_t count) { - ToUpper(text, pos, count); - return text; -} - -TUtf32String ToTitleRet(TUtf32String text, size_t pos, size_t count) { - ToTitle(text, pos, count); - return text; -} - +TUtf32String ToLowerRet(TUtf32String text, size_t pos, size_t count) { + ToLower(text, pos, count); + return text; +} + +TUtf32String ToUpperRet(TUtf32String text, size_t pos, size_t count) { + ToUpper(text, pos, count); + return text; +} + +TUtf32String ToTitleRet(TUtf32String text, size_t pos, size_t count) { + ToTitle(text, pos, count); + return text; +} + bool ToLower(const wchar16* text, size_t length, wchar16* out) noexcept { // TODO(yazevnul): get rid of `text == out` case (it is probably used only in lemmer) and then // we can declare text and out as `__restrict__` @@ -408,87 +408,87 @@ bool ToTitle(wchar16* text, size_t length) noexcept { return ToLower(text, textEnd - text) || firstSymbol != firstSymbolTitle; } -bool ToLower(const wchar32* text, size_t length, wchar32* out) noexcept { - // TODO(yazevnul): get rid of `text == out` case (it is probably used only in lemmer) and then - // we can declare text and out as `__restrict__` - Y_ASSERT(text == out || !(out >= text && out < text + length)); +bool ToLower(const wchar32* text, size_t length, wchar32* out) noexcept { + // TODO(yazevnul): get rid of `text == out` case (it is probably used only in lemmer) and then + // we can declare text and out as `__restrict__` + Y_ASSERT(text == out || !(out >= text && out < text + length)); const auto f = [](const wchar32 s) { return ToLower(s); }; - const auto* p = text; - const auto* const pe = text + length; - if (ModifySequence<true>(p, pe, out, f)) { - ModifySequence<false>(p, pe, out, f); - return true; - } - return false; -} - -bool ToUpper(const wchar32* text, size_t length, wchar32* out) noexcept { - Y_ASSERT(text == out || !(out >= text && out < text + length)); + const auto* p = text; + const auto* const pe = text + length; + if (ModifySequence<true>(p, pe, out, f)) { + ModifySequence<false>(p, pe, out, f); + return true; + } + return false; +} + +bool ToUpper(const wchar32* text, size_t length, wchar32* out) noexcept { + Y_ASSERT(text == out || !(out >= text && out < text + length)); const auto f = [](const wchar32 s) { return ToUpper(s); }; - const auto* p = text; - const auto* const pe = text + length; - if (ModifySequence<true>(p, pe, out, f)) { - ModifySequence<false>(p, pe, out, f); - return true; - } - return false; -} - -bool ToTitle(const wchar32* text, size_t length, wchar32* out) noexcept { - if (!length) { - return false; - } - - Y_ASSERT(text == out || !(out >= text && out < text + length)); - - const auto* const textEnd = text + length; - const auto firstSymbol = ReadSymbolAndAdvance(text, textEnd); - const auto firstSymbolTitle = ToTitle(firstSymbol); - - WriteSymbol(firstSymbolTitle, out); - - return ToLower(text, textEnd - text, out) || firstSymbol != firstSymbolTitle; -} - -bool ToLower(wchar32* text, size_t length) noexcept { + const auto* p = text; + const auto* const pe = text + length; + if (ModifySequence<true>(p, pe, out, f)) { + ModifySequence<false>(p, pe, out, f); + return true; + } + return false; +} + +bool ToTitle(const wchar32* text, size_t length, wchar32* out) noexcept { + if (!length) { + return false; + } + + Y_ASSERT(text == out || !(out >= text && out < text + length)); + + const auto* const textEnd = text + length; + const auto firstSymbol = ReadSymbolAndAdvance(text, textEnd); + const auto firstSymbolTitle = ToTitle(firstSymbol); + + WriteSymbol(firstSymbolTitle, out); + + return ToLower(text, textEnd - text, out) || firstSymbol != firstSymbolTitle; +} + +bool ToLower(wchar32* text, size_t length) noexcept { const auto f = [](const wchar32 s) { return ToLower(s); }; - const auto* const textEnd = text + length; - if (ModifySequence<true>(text, textEnd, f)) { - ModifySequence<false>(text, textEnd, f); - return true; - } - return false; -} - -bool ToUpper(wchar32* text, size_t length) noexcept { + const auto* const textEnd = text + length; + if (ModifySequence<true>(text, textEnd, f)) { + ModifySequence<false>(text, textEnd, f); + return true; + } + return false; +} + +bool ToUpper(wchar32* text, size_t length) noexcept { const auto f = [](const wchar32 s) { return ToUpper(s); }; - const auto* const textEnd = text + length; - if (ModifySequence<true>(text, textEnd, f)) { - ModifySequence<false>(text, textEnd, f); - return true; - } - return false; -} - -bool ToTitle(wchar32* text, size_t length) noexcept { - if (!length) { - return false; - } - - const auto* textEnd = text + length; - const auto firstSymbol = ReadSymbol(text, textEnd); - const auto firstSymbolTitle = ToTitle(firstSymbol); - - // avoid unnacessary writes to the memory - if (firstSymbol != firstSymbolTitle) { - WriteSymbol(firstSymbolTitle, text); - } else { - text = SkipSymbol(text, textEnd); - } - - return ToLower(text, textEnd - text) || firstSymbol != firstSymbolTitle; -} - + const auto* const textEnd = text + length; + if (ModifySequence<true>(text, textEnd, f)) { + ModifySequence<false>(text, textEnd, f); + return true; + } + return false; +} + +bool ToTitle(wchar32* text, size_t length) noexcept { + if (!length) { + return false; + } + + const auto* textEnd = text + length; + const auto firstSymbol = ReadSymbol(text, textEnd); + const auto firstSymbolTitle = ToTitle(firstSymbol); + + // avoid unnacessary writes to the memory + if (firstSymbol != firstSymbolTitle) { + WriteSymbol(firstSymbolTitle, text); + } else { + text = SkipSymbol(text, textEnd); + } + + return ToLower(text, textEnd - text) || firstSymbol != firstSymbolTitle; +} + template <typename F> static TUtf16String ToSmthRet(const TWtringBuf text, size_t pos, size_t count, F&& f) { pos = pos < text.size() ? pos : text.size(); @@ -510,27 +510,27 @@ static TUtf16String ToSmthRet(const TWtringBuf text, size_t pos, size_t count, F return res; } -template <typename F> -static TUtf32String ToSmthRet(const TUtf32StringBuf text, size_t pos, size_t count, F&& f) { - pos = pos < text.size() ? pos : text.size(); - count = count < text.size() - pos ? count : text.size() - pos; - - auto res = TUtf32String::Uninitialized(text.size()); - auto* const resBegin = res.Detach(); - - if (pos) { - MemCopy(resBegin, text.data(), pos); - } - - f(text.data() + pos, count, resBegin + pos); - - if (count - pos != text.size()) { - MemCopy(resBegin + pos + count, text.data() + pos + count, text.size() - pos - count); - } - - return res; -} - +template <typename F> +static TUtf32String ToSmthRet(const TUtf32StringBuf text, size_t pos, size_t count, F&& f) { + pos = pos < text.size() ? pos : text.size(); + count = count < text.size() - pos ? count : text.size() - pos; + + auto res = TUtf32String::Uninitialized(text.size()); + auto* const resBegin = res.Detach(); + + if (pos) { + MemCopy(resBegin, text.data(), pos); + } + + f(text.data() + pos, count, resBegin + pos); + + if (count - pos != text.size()) { + MemCopy(resBegin + pos + count, text.data() + pos + count, text.size() - pos - count); + } + + return res; +} + TUtf16String ToLowerRet(const TWtringBuf text, size_t pos, size_t count) { return ToSmthRet(text, pos, count, [](const wchar16* theText, size_t length, wchar16* out) { ToLower(theText, length, out); @@ -549,24 +549,24 @@ TUtf16String ToTitleRet(const TWtringBuf text, size_t pos, size_t count) { }); } -TUtf32String ToLowerRet(const TUtf32StringBuf text, size_t pos, size_t count) { +TUtf32String ToLowerRet(const TUtf32StringBuf text, size_t pos, size_t count) { return ToSmthRet(text, pos, count, [](const wchar32* theText, size_t length, wchar32* out) { - ToLower(theText, length, out); - }); -} - -TUtf32String ToUpperRet(const TUtf32StringBuf text, size_t pos, size_t count) { + ToLower(theText, length, out); + }); +} + +TUtf32String ToUpperRet(const TUtf32StringBuf text, size_t pos, size_t count) { return ToSmthRet(text, pos, count, [](const wchar32* theText, size_t length, wchar32* out) { - ToUpper(theText, length, out); - }); -} - -TUtf32String ToTitleRet(const TUtf32StringBuf text, size_t pos, size_t count) { + ToUpper(theText, length, out); + }); +} + +TUtf32String ToTitleRet(const TUtf32StringBuf text, size_t pos, size_t count) { return ToSmthRet(text, pos, count, [](const wchar32* theText, size_t length, wchar32* out) { - ToTitle(theText, length, out); - }); -} - + ToTitle(theText, length, out); + }); +} + template <bool insertBr> void EscapeHtmlChars(TUtf16String& str) { static const TUtf16String lt(LT, Y_ARRAY_SIZE(LT)); diff --git a/util/charset/wide.h b/util/charset/wide.h index 04e6928aab..5a566983fa 100644 --- a/util/charset/wide.h +++ b/util/charset/wide.h @@ -34,20 +34,20 @@ namespace NDetail { template <> struct TSelector<false> { template <class T> - static inline void WriteSymbol(wchar16 s, T& dest) noexcept { + static inline void WriteSymbol(wchar16 s, T& dest) noexcept { dest.push_back(s); } }; - + template <> struct TSelector<true> { template <class T> - static inline void WriteSymbol(wchar16 s, T& dest) noexcept { + static inline void WriteSymbol(wchar16 s, T& dest) noexcept { *(dest++) = s; } }; - inline wchar32 ReadSurrogatePair(const wchar16* chars) noexcept { + inline wchar32 ReadSurrogatePair(const wchar16* chars) noexcept { const wchar32 SURROGATE_OFFSET = static_cast<wchar32>(0x10000 - (0xD800 << 10) - 0xDC00); wchar16 lead = chars[0]; wchar16 tail = chars[1]; @@ -59,26 +59,26 @@ namespace NDetail { } template <class T> - inline void WriteSurrogatePair(wchar32 s, T& dest) noexcept; + inline void WriteSurrogatePair(wchar32 s, T& dest) noexcept; } -inline wchar16* SkipSymbol(wchar16* begin, const wchar16* end) noexcept { +inline wchar16* SkipSymbol(wchar16* begin, const wchar16* end) noexcept { return begin + W16SymbolSize(begin, end); } -inline const wchar16* SkipSymbol(const wchar16* begin, const wchar16* end) noexcept { +inline const wchar16* SkipSymbol(const wchar16* begin, const wchar16* end) noexcept { return begin + W16SymbolSize(begin, end); } -inline wchar32* SkipSymbol(wchar32* begin, const wchar32* end) noexcept { - Y_ASSERT(begin < end); - return begin + 1; -} -inline const wchar32* SkipSymbol(const wchar32* begin, const wchar32* end) noexcept { - Y_ASSERT(begin < end); - return begin + 1; -} +inline wchar32* SkipSymbol(wchar32* begin, const wchar32* end) noexcept { + Y_ASSERT(begin < end); + return begin + 1; +} +inline const wchar32* SkipSymbol(const wchar32* begin, const wchar32* end) noexcept { + Y_ASSERT(begin < end); + return begin + 1; +} -inline wchar32 ReadSymbol(const wchar16* begin, const wchar16* end) noexcept { +inline wchar32 ReadSymbol(const wchar16* begin, const wchar16* end) noexcept { Y_ASSERT(begin < end); if (IsW16SurrogateLead(*begin)) { if (begin + 1 < end && IsW16SurrogateTail(*(begin + 1))) @@ -92,13 +92,13 @@ inline wchar32 ReadSymbol(const wchar16* begin, const wchar16* end) noexcept { return *begin; } -inline wchar32 ReadSymbol(const wchar32* begin, const wchar32* end) noexcept { - Y_ASSERT(begin < end); - return *begin; -} - +inline wchar32 ReadSymbol(const wchar32* begin, const wchar32* end) noexcept { + Y_ASSERT(begin < end); + return *begin; +} + //! presuming input data is either big enought of null terminated -inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin) noexcept { +inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin) noexcept { Y_ASSERT(*begin); if (IsW16SurrogateLead(begin[0])) { if (IsW16SurrogateTail(begin[1])) { @@ -116,13 +116,13 @@ inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin) noexcept { return *(begin++); } -//! presuming input data is either big enought of null terminated -inline wchar32 ReadSymbolAndAdvance(const wchar32*& begin) noexcept { - Y_ASSERT(*begin); - return *(begin++); -} - -inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin, const wchar16* end) noexcept { +//! presuming input data is either big enought of null terminated +inline wchar32 ReadSymbolAndAdvance(const wchar32*& begin) noexcept { + Y_ASSERT(*begin); + return *(begin++); +} + +inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin, const wchar16* end) noexcept { Y_ASSERT(begin < end); if (IsW16SurrogateLead(begin[0])) { if (begin + 1 != end && IsW16SurrogateTail(begin[1])) { @@ -139,19 +139,19 @@ inline wchar32 ReadSymbolAndAdvance(const wchar16*& begin, const wchar16* end) n return *(begin++); } -inline wchar32 ReadSymbolAndAdvance(const wchar32*& begin, const wchar32* end) noexcept { +inline wchar32 ReadSymbolAndAdvance(const wchar32*& begin, const wchar32* end) noexcept { Y_ASSERT(begin < end); return *(begin++); } template <class T> -inline size_t WriteSymbol(wchar16 s, T& dest) noexcept { +inline size_t WriteSymbol(wchar16 s, T& dest) noexcept { ::NDetail::TSelector<std::is_pointer<T>::value>::WriteSymbol(s, dest); return 1; } template <class T> -inline size_t WriteSymbol(wchar32 s, T& dest) noexcept { +inline size_t WriteSymbol(wchar32 s, T& dest) noexcept { if (s > 0xFFFF) { if (s >= ::NUnicode::UnicodeInstancesLimit()) { return WriteSymbol(static_cast<wchar16>(BROKEN_RUNE), dest); @@ -164,7 +164,7 @@ inline size_t WriteSymbol(wchar32 s, T& dest) noexcept { return WriteSymbol(static_cast<wchar16>(s), dest); } -inline bool WriteSymbol(wchar32 s, wchar16*& dest, const wchar16* destEnd) noexcept { +inline bool WriteSymbol(wchar32 s, wchar16*& dest, const wchar16* destEnd) noexcept { Y_ASSERT(dest < destEnd); if (s > 0xFFFF) { @@ -184,12 +184,12 @@ inline bool WriteSymbol(wchar32 s, wchar16*& dest, const wchar16* destEnd) noexc return true; } -inline size_t WriteSymbol(wchar32 s, wchar32*& dest) noexcept { +inline size_t WriteSymbol(wchar32 s, wchar32*& dest) noexcept { *(dest++) = s; return 1; } -inline bool WriteSymbol(wchar32 s, wchar32*& dest, const wchar32* destEnd) noexcept { +inline bool WriteSymbol(wchar32 s, wchar32*& dest, const wchar32* destEnd) noexcept { Y_ASSERT(dest < destEnd); *(dest++) = s; @@ -260,7 +260,7 @@ public: namespace NDetail { template <bool robust, typename TCharType> - inline void UTF8ToWideImplScalar(const unsigned char*& cur, const unsigned char* last, TCharType*& dest) noexcept { + inline void UTF8ToWideImplScalar(const unsigned char*& cur, const unsigned char* last, TCharType*& dest) noexcept { wchar32 rune = BROKEN_RUNE; while (cur != last) { @@ -278,29 +278,29 @@ namespace NDetail { } } - template <typename TCharType> - inline void UTF16ToUTF32ImplScalar(const wchar16* cur, const wchar16* last, TCharType*& dest) noexcept { - wchar32 rune = BROKEN_RUNE; - - while (cur != last) { - rune = ReadSymbolAndAdvance(cur, last); - Y_ASSERT(cur <= last); - WriteSymbol(rune, dest); - } - } - + template <typename TCharType> + inline void UTF16ToUTF32ImplScalar(const wchar16* cur, const wchar16* last, TCharType*& dest) noexcept { + wchar32 rune = BROKEN_RUNE; + + while (cur != last) { + rune = ReadSymbolAndAdvance(cur, last); + Y_ASSERT(cur <= last); + WriteSymbol(rune, dest); + } + } + template <class TCharType> inline void UTF8ToWideImplSSE41(const unsigned char*& /*cur*/, const unsigned char* /*last*/, TCharType*& /*dest*/) noexcept { } void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar16*& dest) noexcept; - - void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar32*& dest) noexcept; + + void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar32*& dest) noexcept; } //! @return len if robust and position where encoding stopped if not template <bool robust, typename TCharType> -inline size_t UTF8ToWideImpl(const char* text, size_t len, TCharType* dest, size_t& written) noexcept { +inline size_t UTF8ToWideImpl(const char* text, size_t len, TCharType* dest, size_t& written) noexcept { const unsigned char* cur = reinterpret_cast<const unsigned char*>(text); const unsigned char* last = cur + len; TCharType* p = dest; @@ -333,7 +333,7 @@ inline TUtf16String UTF8ToWide(const char* text, size_t len) { } template <bool robust, typename TCharType> -inline bool UTF8ToWide(const char* text, size_t len, TCharType* dest, size_t& written) noexcept { +inline bool UTF8ToWide(const char* text, size_t len, TCharType* dest, size_t& written) noexcept { return UTF8ToWideImpl<robust>(text, len, dest, written) == len; } @@ -342,7 +342,7 @@ inline bool UTF8ToWide(const char* text, size_t len, TCharType* dest, size_t& wr //! conversion stops if a broken symbol is met //! @return @c true if all the text converted successfully, @c false - a broken symbol was found template <typename TCharType> -inline bool UTF8ToWide(const char* text, size_t len, TCharType* dest, size_t& written) noexcept { +inline bool UTF8ToWide(const char* text, size_t len, TCharType* dest, size_t& written) noexcept { return UTF8ToWide<false>(text, len, dest, written); } @@ -350,21 +350,21 @@ template <bool robust> inline TWtringBuf UTF8ToWide(const TStringBuf src, TUtf16String& dst) { dst.ReserveAndResize(src.size()); size_t written = 0; - UTF8ToWideImpl<robust>(src.data(), src.size(), dst.begin(), written); - dst.resize(written); - return dst; -} - -//! if not robust will stop at first error position -template <bool robust> -inline TUtf32StringBuf UTF8ToUTF32(const TStringBuf src, TUtf32String& dst) { - dst.ReserveAndResize(src.size()); - size_t written = 0; - UTF8ToWideImpl<robust>(src.data(), src.size(), dst.begin(), written); + UTF8ToWideImpl<robust>(src.data(), src.size(), dst.begin(), written); dst.resize(written); return dst; } +//! if not robust will stop at first error position +template <bool robust> +inline TUtf32StringBuf UTF8ToUTF32(const TStringBuf src, TUtf32String& dst) { + dst.ReserveAndResize(src.size()); + size_t written = 0; + UTF8ToWideImpl<robust>(src.data(), src.size(), dst.begin(), written); + dst.resize(written); + return dst; +} + inline TWtringBuf UTF8ToWide(const TStringBuf src, TUtf16String& dst) { return UTF8ToWide<false>(src, dst); } @@ -378,13 +378,13 @@ inline TUtf16String UTF8ToWide(const TStringBuf s) { return UTF8ToWide<robust>(s.data(), s.size()); } -template <bool robust> -inline TUtf32String UTF8ToUTF32(const TStringBuf s) { - TUtf32String r; - UTF8ToUTF32<robust>(s, r); - return r; -} - +template <bool robust> +inline TUtf32String UTF8ToUTF32(const TStringBuf s) { + TUtf32String r; + UTF8ToUTF32<robust>(s, r); + return r; +} + inline TUtf16String UTF8ToWide(const TStringBuf s) { return UTF8ToWide<false>(s.data(), s.size()); } @@ -428,23 +428,23 @@ inline TString WideToUTF8(const wchar16* text, size_t len) { return s; } -inline TString WideToUTF8(const wchar32* text, size_t len) { - TString s = TString::Uninitialized(WideToUTF8BufferSize(len)); - size_t written = 0; - WideToUTF8(text, len, s.begin(), written); - Y_ASSERT(s.size() >= written); - s.remove(written); - return s; -} - +inline TString WideToUTF8(const wchar32* text, size_t len) { + TString s = TString::Uninitialized(WideToUTF8BufferSize(len)); + size_t written = 0; + WideToUTF8(text, len, s.begin(), written); + Y_ASSERT(s.size() >= written); + s.remove(written); + return s; +} + inline TString WideToUTF8(const TWtringBuf w) { return WideToUTF8(w.data(), w.size()); } -inline TString WideToUTF8(const TUtf32StringBuf w) { - return WideToUTF8(w.data(), w.size()); -} - +inline TString WideToUTF8(const TUtf32StringBuf w) { + return WideToUTF8(w.data(), w.size()); +} + inline TUtf16String UTF32ToWide(const wchar32* begin, size_t len) { TUtf16String res; res.reserve(len); @@ -653,11 +653,11 @@ inline TUtf16String ASCIIToWide(const TStringBuf s) { return CopyTo<TUtf16String>(s.begin(), s.end()); } -inline TUtf32String ASCIIToUTF32(const TStringBuf s) { - Y_ASSERT(IsStringASCII(s.begin(), s.end())); - return CopyTo<TUtf32String>(s.begin(), s.end()); -} - +inline TUtf32String ASCIIToUTF32(const TStringBuf s) { + Y_ASSERT(IsStringASCII(s.begin(), s.end())); + return CopyTo<TUtf32String>(s.begin(), s.end()); +} + //! returns @c true if string contains whitespace characters only inline bool IsSpace(const wchar16* s, size_t n) { if (n == 0) @@ -739,30 +739,30 @@ bool IsUpper(const TWtringBuf text) noexcept; bool ToLower(TUtf16String& text, size_t pos = 0, size_t count = TUtf16String::npos); bool ToUpper(TUtf16String& text, size_t pos = 0, size_t count = TUtf16String::npos); -/* Lowercase/uppercase given string inplace. Any alphabetic symbol will be converted to a proper -* case, the rest of the symbols will be kept the same. It is expected that `text` is a correct -* UTF-32 string. -* -* For example `ToLower("heLLo")` will return `"hello"`. -* -* @param text String to modify -* @param pos Position of the first character to modify -* @param count Length of the substring -* @returns `true` if `text` was changed -* -* NOTE: `pos` and `count` are measured in `wchar16`, not in codepoints. -*/ -bool ToLower(TUtf32String& /*text*/, size_t /*pos*/ = 0, size_t /*count*/ = TUtf16String::npos); -bool ToUpper(TUtf32String& /*text*/, size_t /*pos*/ = 0, size_t /*count*/ = TUtf16String::npos); - +/* Lowercase/uppercase given string inplace. Any alphabetic symbol will be converted to a proper +* case, the rest of the symbols will be kept the same. It is expected that `text` is a correct +* UTF-32 string. +* +* For example `ToLower("heLLo")` will return `"hello"`. +* +* @param text String to modify +* @param pos Position of the first character to modify +* @param count Length of the substring +* @returns `true` if `text` was changed +* +* NOTE: `pos` and `count` are measured in `wchar16`, not in codepoints. +*/ +bool ToLower(TUtf32String& /*text*/, size_t /*pos*/ = 0, size_t /*count*/ = TUtf16String::npos); +bool ToUpper(TUtf32String& /*text*/, size_t /*pos*/ = 0, size_t /*count*/ = TUtf16String::npos); + /* Titlecase first symbol and lowercase the rest, see `ToLower` for more details. */ bool ToTitle(TUtf16String& text, size_t pos = 0, size_t count = TUtf16String::npos); -/* Titlecase first symbol and lowercase the rest, see `ToLower` for more details. -*/ -bool ToTitle(TUtf32String& /*text*/, size_t /*pos*/ = 0, size_t /*count*/ = TUtf16String::npos); - +/* Titlecase first symbol and lowercase the rest, see `ToLower` for more details. +*/ +bool ToTitle(TUtf32String& /*text*/, size_t /*pos*/ = 0, size_t /*count*/ = TUtf16String::npos); + /* @param text Pointer to the string to modify * @param length Length of the string to modify * @param out Pointer to the character array to write to @@ -776,10 +776,10 @@ bool ToLower(const wchar16* text, size_t length, wchar16* out) noexcept; bool ToUpper(const wchar16* text, size_t length, wchar16* out) noexcept; bool ToTitle(const wchar16* text, size_t length, wchar16* out) noexcept; -bool ToLower(const wchar32* text, size_t length, wchar32* out) noexcept; -bool ToUpper(const wchar32* text, size_t length, wchar32* out) noexcept; -bool ToTitle(const wchar32* text, size_t length, wchar32* out) noexcept; - +bool ToLower(const wchar32* text, size_t length, wchar32* out) noexcept; +bool ToUpper(const wchar32* text, size_t length, wchar32* out) noexcept; +bool ToTitle(const wchar32* text, size_t length, wchar32* out) noexcept; + /* @param text Pointer to the string to modify * @param length Length of the string to modify * @@ -789,10 +789,10 @@ bool ToLower(wchar16* text, size_t length) noexcept; bool ToUpper(wchar16* text, size_t length) noexcept; bool ToTitle(wchar16* text, size_t length) noexcept; -bool ToLower(wchar32* text, size_t length) noexcept; -bool ToUpper(wchar32* text, size_t length) noexcept; -bool ToTitle(wchar32* text, size_t length) noexcept; - +bool ToLower(wchar32* text, size_t length) noexcept; +bool ToUpper(wchar32* text, size_t length) noexcept; +bool ToTitle(wchar32* text, size_t length) noexcept; + /* Convenience wrappers for `ToLower`, `ToUpper` and `ToTitle`. */ TUtf16String ToLowerRet(TUtf16String text, size_t pos = 0, size_t count = TUtf16String::npos) Y_WARN_UNUSED_RESULT; @@ -803,10 +803,10 @@ TUtf16String ToLowerRet(const TWtringBuf text, size_t pos = 0, size_t count = TW TUtf16String ToUpperRet(const TWtringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; TUtf16String ToTitleRet(const TWtringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; -TUtf32String ToLowerRet(const TUtf32StringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; -TUtf32String ToUpperRet(const TUtf32StringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; -TUtf32String ToTitleRet(const TUtf32StringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; - +TUtf32String ToLowerRet(const TUtf32StringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; +TUtf32String ToUpperRet(const TUtf32StringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; +TUtf32String ToTitleRet(const TUtf32StringBuf text, size_t pos = 0, size_t count = TWtringBuf::npos) Y_WARN_UNUSED_RESULT; + //! replaces the '<', '>' and '&' characters in string with '<', '>' and '&' respectively // insertBr=true - replace '\r' and '\n' with "<BR>" template <bool insertBr> diff --git a/util/charset/wide_sse41.cpp b/util/charset/wide_sse41.cpp index d1f2a74851..a4c0982f56 100644 --- a/util/charset/wide_sse41.cpp +++ b/util/charset/wide_sse41.cpp @@ -21,226 +21,226 @@ namespace NDetail { //processes to the first error, or until less then 16 bytes left //most code taken from https://woboq.com/blog/utf-8-processing-using-simd.html -//return dstAdvance 0 in case of problems -static Y_FORCE_INLINE ui32 Unpack16BytesIntoUtf16IfNoSurrogats(const unsigned char*& cur, __m128i& utf16Low, __m128i& utf16High) { - unsigned char curAligned[16]; - - memcpy(curAligned, cur, sizeof(__m128i)); - __m128i chunk = _mm_load_si128(reinterpret_cast<const __m128i*>(curAligned)); - - //only ascii characters - simple copy - if (!_mm_movemask_epi8(chunk)) { - utf16Low = _mm_unpacklo_epi8(chunk, _mm_setzero_si128()); - utf16High = _mm_unpackhi_epi8(chunk, _mm_setzero_si128()); - cur += 16; - return 16; - } +//return dstAdvance 0 in case of problems +static Y_FORCE_INLINE ui32 Unpack16BytesIntoUtf16IfNoSurrogats(const unsigned char*& cur, __m128i& utf16Low, __m128i& utf16High) { + unsigned char curAligned[16]; + + memcpy(curAligned, cur, sizeof(__m128i)); + __m128i chunk = _mm_load_si128(reinterpret_cast<const __m128i*>(curAligned)); + + //only ascii characters - simple copy + if (!_mm_movemask_epi8(chunk)) { + utf16Low = _mm_unpacklo_epi8(chunk, _mm_setzero_si128()); + utf16High = _mm_unpackhi_epi8(chunk, _mm_setzero_si128()); + cur += 16; + return 16; + } - __m128i chunkSigned = _mm_add_epi8(chunk, _mm_set1_epi8(0x80)); - __m128i isAsciiMask = _mm_cmpgt_epi8(chunk, _mm_set1_epi8(0)); + __m128i chunkSigned = _mm_add_epi8(chunk, _mm_set1_epi8(0x80)); + __m128i isAsciiMask = _mm_cmpgt_epi8(chunk, _mm_set1_epi8(0)); - __m128i cond2 = _mm_cmplt_epi8(_mm_set1_epi8(0xc2 - 1 - 0x80), chunkSigned); + __m128i cond2 = _mm_cmplt_epi8(_mm_set1_epi8(0xc2 - 1 - 0x80), chunkSigned); __m128i state = _mm_set1_epi8(0x0 | (char)0x80); - __m128i cond3 = _mm_cmplt_epi8(_mm_set1_epi8(0xe0 - 1 - 0x80), chunkSigned); + __m128i cond3 = _mm_cmplt_epi8(_mm_set1_epi8(0xe0 - 1 - 0x80), chunkSigned); state = _mm_blendv_epi8(state, _mm_set1_epi8(0x2 | (char)0xc0), cond2); - int sourceAdvance; - __m128i shifts; - __m128i chunkLow, chunkHigh; + int sourceAdvance; + __m128i shifts; + __m128i chunkLow, chunkHigh; - if (Y_LIKELY(!_mm_movemask_epi8(cond3))) { - //main case: no bloks of size 3 or 4 + if (Y_LIKELY(!_mm_movemask_epi8(cond3))) { + //main case: no bloks of size 3 or 4 - //rune len for start of multi-byte sequences (0 for b0... and b10..., 2 for b110..., etc.) - __m128i count = _mm_and_si128(state, _mm_set1_epi8(0x7)); + //rune len for start of multi-byte sequences (0 for b0... and b10..., 2 for b110..., etc.) + __m128i count = _mm_and_si128(state, _mm_set1_epi8(0x7)); - __m128i countSub1 = _mm_subs_epu8(count, _mm_set1_epi8(0x1)); + __m128i countSub1 = _mm_subs_epu8(count, _mm_set1_epi8(0x1)); - shifts = countSub1; - __m128i continuation1 = _mm_slli_si128(countSub1, 1); + shifts = countSub1; + __m128i continuation1 = _mm_slli_si128(countSub1, 1); - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 1)); - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 2)); + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 1)); + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 2)); - __m128i counts = _mm_or_si128(count, continuation1); + __m128i counts = _mm_or_si128(count, continuation1); - __m128i isBeginMultibyteMask = _mm_cmpgt_epi8(count, _mm_set1_epi8(0)); - __m128i needNoContinuationMask = _mm_cmpeq_epi8(continuation1, _mm_set1_epi8(0)); - __m128i isBeginMask = _mm_add_epi8(isBeginMultibyteMask, isAsciiMask); - //each symbol should be exactly one of ascii, continuation or begin - __m128i okMask = _mm_cmpeq_epi8(isBeginMask, needNoContinuationMask); + __m128i isBeginMultibyteMask = _mm_cmpgt_epi8(count, _mm_set1_epi8(0)); + __m128i needNoContinuationMask = _mm_cmpeq_epi8(continuation1, _mm_set1_epi8(0)); + __m128i isBeginMask = _mm_add_epi8(isBeginMultibyteMask, isAsciiMask); + //each symbol should be exactly one of ascii, continuation or begin + __m128i okMask = _mm_cmpeq_epi8(isBeginMask, needNoContinuationMask); - if (_mm_movemask_epi8(okMask) != 0xFFFF) { - return 0; - } + if (_mm_movemask_epi8(okMask) != 0xFFFF) { + return 0; + } - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 4)); + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 4)); - __m128i mask = _mm_and_si128(state, _mm_set1_epi8(0xf8)); - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 8)); + __m128i mask = _mm_and_si128(state, _mm_set1_epi8(0xf8)); + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 8)); - chunk = _mm_andnot_si128(mask, chunk); // from now on, we only have usefull bits - shifts = _mm_and_si128(shifts, _mm_cmplt_epi8(counts, _mm_set1_epi8(2))); // <=1 + chunk = _mm_andnot_si128(mask, chunk); // from now on, we only have usefull bits + shifts = _mm_and_si128(shifts, _mm_cmplt_epi8(counts, _mm_set1_epi8(2))); // <=1 - __m128i chunk_right = _mm_slli_si128(chunk, 1); - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 1), + __m128i chunk_right = _mm_slli_si128(chunk, 1); + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 1), _mm_srli_si128(_mm_slli_epi16(shifts, 7), 1)); - chunkLow = _mm_blendv_epi8(chunk, + chunkLow = _mm_blendv_epi8(chunk, _mm_or_si128(chunk, _mm_and_si128(_mm_slli_epi16(chunk_right, 6), _mm_set1_epi8(0xc0))), _mm_cmpeq_epi8(counts, _mm_set1_epi8(1))); - chunkHigh = _mm_and_si128(chunk, _mm_cmpeq_epi8(counts, _mm_set1_epi8(2))); + chunkHigh = _mm_and_si128(chunk, _mm_cmpeq_epi8(counts, _mm_set1_epi8(2))); - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 2), + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 2), _mm_srli_si128(_mm_slli_epi16(shifts, 6), 2)); - chunkHigh = _mm_srli_epi32(chunkHigh, 2); + chunkHigh = _mm_srli_epi32(chunkHigh, 2); - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 4), + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 4), _mm_srli_si128(_mm_slli_epi16(shifts, 5), 4)); - - int c = _mm_extract_epi16(counts, 7); - sourceAdvance = !(c & 0x0200) ? 16 : 15; - - } else { - __m128i mask3 = _mm_slli_si128(cond3, 1); - - __m128i cond4 = _mm_cmplt_epi8(_mm_set1_epi8(0xf0 - 1 - 0x80), chunkSigned); + + int c = _mm_extract_epi16(counts, 7); + sourceAdvance = !(c & 0x0200) ? 16 : 15; + + } else { + __m128i mask3 = _mm_slli_si128(cond3, 1); + + __m128i cond4 = _mm_cmplt_epi8(_mm_set1_epi8(0xf0 - 1 - 0x80), chunkSigned); state = _mm_blendv_epi8(state, _mm_set1_epi8(0x3 | (char)0xe0), cond3); - - // 4 bytes sequences are not vectorize. Fall back to the scalar processing - if (Y_UNLIKELY(_mm_movemask_epi8(cond4))) { - return 0; - } - - //rune len for start of multi-byte sequences (0 for b0... and b10..., 2 for b110..., etc.) - __m128i count = _mm_and_si128(state, _mm_set1_epi8(0x7)); - - __m128i countSub1 = _mm_subs_epu8(count, _mm_set1_epi8(0x1)); - __m128i continuation2 = _mm_slli_si128(_mm_subs_epu8(count, _mm_set1_epi8(0x2)), 2); - - shifts = countSub1; - __m128i continuation1 = _mm_slli_si128(countSub1, 1); - - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 1)); - __m128i continuationsRunelen = _mm_or_si128(continuation1, continuation2); - - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 2)); - __m128i counts = _mm_or_si128(count, continuationsRunelen); - - __m128i isBeginMultibyteMask = _mm_cmpgt_epi8(count, _mm_set1_epi8(0)); - __m128i needNoContinuationMask = _mm_cmpeq_epi8(continuationsRunelen, _mm_set1_epi8(0)); - __m128i isBeginMask = _mm_add_epi8(isBeginMultibyteMask, isAsciiMask); - //each symbol should be exactly one of ascii, continuation or begin - __m128i okMask = _mm_cmpeq_epi8(isBeginMask, needNoContinuationMask); - - if (_mm_movemask_epi8(okMask) != 0xFFFF) { - return 0; - } - - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 4)); - - __m128i mask = _mm_and_si128(state, _mm_set1_epi8(0xf8)); - shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 8)); - - chunk = _mm_andnot_si128(mask, chunk); // from now on, we only have usefull bits - shifts = _mm_and_si128(shifts, _mm_cmplt_epi8(counts, _mm_set1_epi8(2))); // <=1 - - __m128i chunk_right = _mm_slli_si128(chunk, 1); - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 1), + + // 4 bytes sequences are not vectorize. Fall back to the scalar processing + if (Y_UNLIKELY(_mm_movemask_epi8(cond4))) { + return 0; + } + + //rune len for start of multi-byte sequences (0 for b0... and b10..., 2 for b110..., etc.) + __m128i count = _mm_and_si128(state, _mm_set1_epi8(0x7)); + + __m128i countSub1 = _mm_subs_epu8(count, _mm_set1_epi8(0x1)); + __m128i continuation2 = _mm_slli_si128(_mm_subs_epu8(count, _mm_set1_epi8(0x2)), 2); + + shifts = countSub1; + __m128i continuation1 = _mm_slli_si128(countSub1, 1); + + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 1)); + __m128i continuationsRunelen = _mm_or_si128(continuation1, continuation2); + + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 2)); + __m128i counts = _mm_or_si128(count, continuationsRunelen); + + __m128i isBeginMultibyteMask = _mm_cmpgt_epi8(count, _mm_set1_epi8(0)); + __m128i needNoContinuationMask = _mm_cmpeq_epi8(continuationsRunelen, _mm_set1_epi8(0)); + __m128i isBeginMask = _mm_add_epi8(isBeginMultibyteMask, isAsciiMask); + //each symbol should be exactly one of ascii, continuation or begin + __m128i okMask = _mm_cmpeq_epi8(isBeginMask, needNoContinuationMask); + + if (_mm_movemask_epi8(okMask) != 0xFFFF) { + return 0; + } + + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 4)); + + __m128i mask = _mm_and_si128(state, _mm_set1_epi8(0xf8)); + shifts = _mm_add_epi8(shifts, _mm_slli_si128(shifts, 8)); + + chunk = _mm_andnot_si128(mask, chunk); // from now on, we only have usefull bits + shifts = _mm_and_si128(shifts, _mm_cmplt_epi8(counts, _mm_set1_epi8(2))); // <=1 + + __m128i chunk_right = _mm_slli_si128(chunk, 1); + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 1), _mm_srli_si128(_mm_slli_epi16(shifts, 7), 1)); - - chunkLow = _mm_blendv_epi8(chunk, + + chunkLow = _mm_blendv_epi8(chunk, _mm_or_si128(chunk, _mm_and_si128(_mm_slli_epi16(chunk_right, 6), _mm_set1_epi8(0xc0))), _mm_cmpeq_epi8(counts, _mm_set1_epi8(1))); - - chunkHigh = _mm_and_si128(chunk, _mm_cmpeq_epi8(counts, _mm_set1_epi8(2))); - - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 2), + + chunkHigh = _mm_and_si128(chunk, _mm_cmpeq_epi8(counts, _mm_set1_epi8(2))); + + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 2), _mm_srli_si128(_mm_slli_epi16(shifts, 6), 2)); - chunkHigh = _mm_srli_epi32(chunkHigh, 2); - - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 4), + chunkHigh = _mm_srli_epi32(chunkHigh, 2); + + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 4), _mm_srli_si128(_mm_slli_epi16(shifts, 5), 4)); - chunkHigh = _mm_or_si128(chunkHigh, + chunkHigh = _mm_or_si128(chunkHigh, _mm_and_si128(_mm_and_si128(_mm_slli_epi32(chunk_right, 4), _mm_set1_epi8(0xf0)), mask3)); - int c = _mm_extract_epi16(counts, 7); + int c = _mm_extract_epi16(counts, 7); sourceAdvance = !(c & 0x0200) ? 16 : !(c & 0x02) ? 15 : 14; - } + } - shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 8), + shifts = _mm_blendv_epi8(shifts, _mm_srli_si128(shifts, 8), _mm_srli_si128(_mm_slli_epi16(shifts, 4), 8)); - chunkHigh = _mm_slli_si128(chunkHigh, 1); - - __m128i shuf = _mm_add_epi8(shifts, _mm_set_epi8(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)); - - chunkLow = _mm_shuffle_epi8(chunkLow, shuf); - chunkHigh = _mm_shuffle_epi8(chunkHigh, shuf); - - utf16Low = _mm_unpacklo_epi8(chunkLow, chunkHigh); - utf16High = _mm_unpackhi_epi8(chunkLow, chunkHigh); - - ui32 s = _mm_extract_epi32(shifts, 3); - ui32 destAdvance = sourceAdvance - (0xff & (s >> (8 * (3 - 16 + sourceAdvance)))); - cur += sourceAdvance; - return destAdvance; -} - -namespace NDetail { - void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar16*& dest) noexcept { - alignas(16) wchar16 destAligned[16]; - - while (cur + 16 <= last) { - __m128i utf16Low; - __m128i utf16High; - ui32 dstAdvance = Unpack16BytesIntoUtf16IfNoSurrogats(cur, utf16Low, utf16High); - - if (dstAdvance == 0) { - break; - } - - _mm_store_si128(reinterpret_cast<__m128i*>(destAligned), utf16Low); - _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 1, utf16High); + chunkHigh = _mm_slli_si128(chunkHigh, 1); + + __m128i shuf = _mm_add_epi8(shifts, _mm_set_epi8(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)); + + chunkLow = _mm_shuffle_epi8(chunkLow, shuf); + chunkHigh = _mm_shuffle_epi8(chunkHigh, shuf); + + utf16Low = _mm_unpacklo_epi8(chunkLow, chunkHigh); + utf16High = _mm_unpackhi_epi8(chunkLow, chunkHigh); + + ui32 s = _mm_extract_epi32(shifts, 3); + ui32 destAdvance = sourceAdvance - (0xff & (s >> (8 * (3 - 16 + sourceAdvance)))); + cur += sourceAdvance; + return destAdvance; +} + +namespace NDetail { + void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar16*& dest) noexcept { + alignas(16) wchar16 destAligned[16]; + + while (cur + 16 <= last) { + __m128i utf16Low; + __m128i utf16High; + ui32 dstAdvance = Unpack16BytesIntoUtf16IfNoSurrogats(cur, utf16Low, utf16High); + + if (dstAdvance == 0) { + break; + } + + _mm_store_si128(reinterpret_cast<__m128i*>(destAligned), utf16Low); + _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 1, utf16High); memcpy(dest, destAligned, sizeof(__m128i) * 2); - dest += dstAdvance; - } - //The rest will be handled sequencially. - // Possible improvement: go back to the vectorized processing after the error or the 4 byte sequence - } - - void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar32*& dest) noexcept { - alignas(16) wchar32 destAligned[16]; - - while (cur + 16 <= last) { - __m128i utf16Low; - __m128i utf16High; - ui32 dstAdvance = Unpack16BytesIntoUtf16IfNoSurrogats(cur, utf16Low, utf16High); - - if (dstAdvance == 0) { - break; - } - - //NOTE: we only work in case without surrogat pairs, so we can make simple copying with zeroes in 2 high bytes - __m128i utf32_lowlow = _mm_unpacklo_epi16(utf16Low, _mm_set1_epi8(0)); - __m128i utf32_lowhigh = _mm_unpackhi_epi16(utf16Low, _mm_set1_epi8(0)); - __m128i utf32_highlow = _mm_unpacklo_epi16(utf16High, _mm_set1_epi8(0)); - __m128i utf32_highhigh = _mm_unpackhi_epi16(utf16High, _mm_set1_epi8(0)); - - _mm_store_si128(reinterpret_cast<__m128i*>(destAligned), utf32_lowlow); - _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 1, utf32_lowhigh); - _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 2, utf32_highlow); - _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 3, utf32_highhigh); - - memcpy(dest, destAligned, sizeof(__m128i) * 4); - dest += dstAdvance; + dest += dstAdvance; + } + //The rest will be handled sequencially. + // Possible improvement: go back to the vectorized processing after the error or the 4 byte sequence + } + + void UTF8ToWideImplSSE41(const unsigned char*& cur, const unsigned char* last, wchar32*& dest) noexcept { + alignas(16) wchar32 destAligned[16]; + + while (cur + 16 <= last) { + __m128i utf16Low; + __m128i utf16High; + ui32 dstAdvance = Unpack16BytesIntoUtf16IfNoSurrogats(cur, utf16Low, utf16High); + + if (dstAdvance == 0) { + break; + } + + //NOTE: we only work in case without surrogat pairs, so we can make simple copying with zeroes in 2 high bytes + __m128i utf32_lowlow = _mm_unpacklo_epi16(utf16Low, _mm_set1_epi8(0)); + __m128i utf32_lowhigh = _mm_unpackhi_epi16(utf16Low, _mm_set1_epi8(0)); + __m128i utf32_highlow = _mm_unpacklo_epi16(utf16High, _mm_set1_epi8(0)); + __m128i utf32_highhigh = _mm_unpackhi_epi16(utf16High, _mm_set1_epi8(0)); + + _mm_store_si128(reinterpret_cast<__m128i*>(destAligned), utf32_lowlow); + _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 1, utf32_lowhigh); + _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 2, utf32_highlow); + _mm_store_si128(reinterpret_cast<__m128i*>(destAligned) + 3, utf32_highhigh); + + memcpy(dest, destAligned, sizeof(__m128i) * 4); + dest += dstAdvance; } //The rest will be handled sequencially. - // Possible improvement: go back to the vectorized processing after the error or the 4 byte sequence + // Possible improvement: go back to the vectorized processing after the error or the 4 byte sequence } } diff --git a/util/charset/wide_ut.cpp b/util/charset/wide_ut.cpp index d8f3233e73..aa1a28f84f 100644 --- a/util/charset/wide_ut.cpp +++ b/util/charset/wide_ut.cpp @@ -1,7 +1,7 @@ #include "utf8.h" #include "wide.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/reverse.h> diff --git a/util/datetime/base_ut.cpp b/util/datetime/base_ut.cpp index afc3f802eb..ae839a5849 100644 --- a/util/datetime/base_ut.cpp +++ b/util/datetime/base_ut.cpp @@ -1,6 +1,6 @@ #include "base.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/utility.h> #include <util/generic/ylimits.h> diff --git a/util/datetime/parser_deprecated_ut.cpp b/util/datetime/parser_deprecated_ut.cpp index 6ad9f885b1..e7ab932ca4 100644 --- a/util/datetime/parser_deprecated_ut.cpp +++ b/util/datetime/parser_deprecated_ut.cpp @@ -1,6 +1,6 @@ #include "parser.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static const time_t SECONDS_PER_HOUR = 3600; static const time_t SECONDS_PER_MINUTE = 60; diff --git a/util/datetime/parser_ut.cpp b/util/datetime/parser_ut.cpp index 61364af997..94fb8b60b7 100644 --- a/util/datetime/parser_ut.cpp +++ b/util/datetime/parser_ut.cpp @@ -1,6 +1,6 @@ #include "parser.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static const time_t SECONDS_PER_HOUR = 3600; static const time_t SECONDS_PER_MINUTE = 60; diff --git a/util/datetime/uptime_ut.cpp b/util/datetime/uptime_ut.cpp index 7f5ecc482c..bd84efc357 100644 --- a/util/datetime/uptime_ut.cpp +++ b/util/datetime/uptime_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "uptime.h" diff --git a/util/digest/fnv_ut.cpp b/util/digest/fnv_ut.cpp index ce56642b3e..bee033d919 100644 --- a/util/digest/fnv_ut.cpp +++ b/util/digest/fnv_ut.cpp @@ -1,6 +1,6 @@ #include "fnv.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TFnvTest) { Y_UNIT_TEST(TestFnv32) { diff --git a/util/digest/multi_ut.cpp b/util/digest/multi_ut.cpp index dff64ff0cc..f9305fc7c2 100644 --- a/util/digest/multi_ut.cpp +++ b/util/digest/multi_ut.cpp @@ -1,6 +1,6 @@ #include "multi.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/util/digest/murmur.h b/util/digest/murmur.h index 6b519b430a..8d44d3e0df 100644 --- a/util/digest/murmur.h +++ b/util/digest/murmur.h @@ -11,7 +11,7 @@ namespace NMurmurPrivate { Y_PURE_FUNCTION ui32 MurmurHash32(const void* key, size_t len, ui32 seed) noexcept; Y_PURE_FUNCTION ui64 MurmurHash64(const void* key, size_t len, ui64 seed) noexcept; - + template <unsigned N> struct TMurHelper; diff --git a/util/digest/murmur_ut.cpp b/util/digest/murmur_ut.cpp index 29287668bc..358083c7e2 100644 --- a/util/digest/murmur_ut.cpp +++ b/util/digest/murmur_ut.cpp @@ -1,7 +1,7 @@ #include "murmur.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TMurmurHashTest: public TTestBase { UNIT_TEST_SUITE(TMurmurHashTest); diff --git a/util/digest/sequence_ut.cpp b/util/digest/sequence_ut.cpp index 87d6102ee5..a4413ea3fe 100644 --- a/util/digest/sequence_ut.cpp +++ b/util/digest/sequence_ut.cpp @@ -1,6 +1,6 @@ #include "sequence.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/map.h> #include <util/generic/vector.h> diff --git a/util/draft/date_ut.cpp b/util/draft/date_ut.cpp index 8c33a6c1cf..bef600d361 100644 --- a/util/draft/date_ut.cpp +++ b/util/draft/date_ut.cpp @@ -1,6 +1,6 @@ #include "date.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TDateTest) { Y_UNIT_TEST(ComponentsTest) { diff --git a/util/draft/datetime_ut.cpp b/util/draft/datetime_ut.cpp index a5e065ef6e..4434c8f948 100644 --- a/util/draft/datetime_ut.cpp +++ b/util/draft/datetime_ut.cpp @@ -1,6 +1,6 @@ #include "datetime.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/builder.h> diff --git a/util/draft/holder_vector_ut.cpp b/util/draft/holder_vector_ut.cpp index f64393860a..c7b95de7b3 100644 --- a/util/draft/holder_vector_ut.cpp +++ b/util/draft/holder_vector_ut.cpp @@ -1,6 +1,6 @@ #include "holder_vector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(THolderVectorTest) { Y_UNIT_TEST(TestCreateEmpty) { diff --git a/util/draft/memory_ut.cpp b/util/draft/memory_ut.cpp index 76bee30549..12befeeb83 100644 --- a/util/draft/memory_ut.cpp +++ b/util/draft/memory_ut.cpp @@ -1,6 +1,6 @@ #include "memory.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #pragma pack(1) struct Y_PACKED TSampleStruct1 { diff --git a/util/folder/dirent_win.c b/util/folder/dirent_win.c index 7e6db74ce5..6b8d5c9462 100644 --- a/util/folder/dirent_win.c +++ b/util/folder/dirent_win.c @@ -23,32 +23,32 @@ struct DIR* opendir(const char* dirname) { struct DIR* dir = (struct DIR*)malloc(sizeof(struct DIR)); if (!dir) { return NULL; - } + } dir->sh = INVALID_HANDLE_VALUE; dir->fff_templ = NULL; dir->file_no = 0; dir->readdir_buf = NULL; - + int len = strlen(dirname); //Remove trailing slashes while (len && (dirname[len - 1] == '\\' || dirname[len - 1] == '/')) { --len; } - int len_converted = MultiByteToWideChar(CP_UTF8, 0, dirname, len, 0, 0); - if (len_converted == 0) { + int len_converted = MultiByteToWideChar(CP_UTF8, 0, dirname, len, 0, 0); + if (len_converted == 0) { closedir(dir); return NULL; - } + } dir->fff_templ = (WCHAR*)malloc((len_converted + 5) * sizeof(WCHAR)); if (!dir->fff_templ) { closedir(dir); return NULL; - } - MultiByteToWideChar(CP_UTF8, 0, dirname, len, dir->fff_templ, len_converted); - - WCHAR append[] = {'\\', '*', '.', '*', 0}; - memcpy(dir->fff_templ + len_converted, append, sizeof(append)); - dir->sh = FindFirstFileW(dir->fff_templ, &dir->wfd); + } + MultiByteToWideChar(CP_UTF8, 0, dirname, len, dir->fff_templ, len_converted); + + WCHAR append[] = {'\\', '*', '.', '*', 0}; + memcpy(dir->fff_templ + len_converted, append, sizeof(append)); + dir->sh = FindFirstFileW(dir->fff_templ, &dir->wfd); if (dir->sh == INVALID_HANDLE_VALUE) { SetErrno(); closedir(dir); @@ -68,7 +68,7 @@ int closedir(struct DIR* dir) { } int readdir_r(struct DIR* dir, struct dirent* entry, struct dirent** result) { - if (!FindNextFileW(dir->sh, &dir->wfd)) { + if (!FindNextFileW(dir->sh, &dir->wfd)) { int err = GetLastError(); *result = 0; if (err == ERROR_NO_MORE_FILES) { @@ -89,36 +89,36 @@ int readdir_r(struct DIR* dir, struct dirent* entry, struct dirent** result) { } else { entry->d_type = DT_REG; } - int len = lstrlenW(dir->wfd.cFileName); - int conv_len = WideCharToMultiByte(CP_UTF8, 0, dir->wfd.cFileName, len, 0, 0, 0, 0); - if (conv_len == 0) { - return -1; - } - if (conv_len > sizeof(entry->d_name) - 1) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return ERROR_INSUFFICIENT_BUFFER; - } - entry->d_namlen = conv_len; - WideCharToMultiByte(CP_UTF8, 0, dir->wfd.cFileName, len, entry->d_name, conv_len, 0, 0); - entry->d_name[conv_len] = 0; + int len = lstrlenW(dir->wfd.cFileName); + int conv_len = WideCharToMultiByte(CP_UTF8, 0, dir->wfd.cFileName, len, 0, 0, 0, 0); + if (conv_len == 0) { + return -1; + } + if (conv_len > sizeof(entry->d_name) - 1) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return ERROR_INSUFFICIENT_BUFFER; + } + entry->d_namlen = conv_len; + WideCharToMultiByte(CP_UTF8, 0, dir->wfd.cFileName, len, entry->d_name, conv_len, 0, 0); + entry->d_name[conv_len] = 0; *result = entry; return 0; } struct dirent* readdir(struct DIR* dir) { struct dirent* res; - if (!dir->readdir_buf) { + if (!dir->readdir_buf) { dir->readdir_buf = (struct dirent*)malloc(sizeof(struct dirent)); - if (dir->readdir_buf == 0) - return 0; - } + if (dir->readdir_buf == 0) + return 0; + } readdir_r(dir, dir->readdir_buf, &res); return res; } void rewinddir(struct DIR* dir) { FindClose(dir->sh); - dir->sh = FindFirstFileW(dir->fff_templ, &dir->wfd); + dir->sh = FindFirstFileW(dir->fff_templ, &dir->wfd); dir->file_no = 0; } diff --git a/util/folder/dirut.cpp b/util/folder/dirut.cpp index ffc9b09f96..096cf3fa00 100644 --- a/util/folder/dirut.cpp +++ b/util/folder/dirut.cpp @@ -3,7 +3,7 @@ #include "filelist.h" #include "fts.h" #include "pathsplit.h" -#include "path.h" +#include "path.h" #include <util/generic/yexception.h> #include <util/system/compiler.h> @@ -396,7 +396,7 @@ void RemoveDirWithContents(TString dirName) { } int mkpath(char* path, int mode) { - return NFs::MakeDirectoryRecursive(path, NFs::EFilePermission(mode)) ? 0 : -1; + return NFs::MakeDirectoryRecursive(path, NFs::EFilePermission(mode)) ? 0 : -1; } // Implementation of realpath in FreeBSD (version 9.0 and less) and GetFullPathName in Windows @@ -415,10 +415,10 @@ TString RealPath(const TString& path) { } TString RealLocation(const TString& path) { - if (NFs::Exists(path)) + if (NFs::Exists(path)) return RealPath(path); TString dirpath = GetDirName(path); - if (NFs::Exists(dirpath)) + if (NFs::Exists(dirpath)) return RealPath(dirpath) + GetDirectorySeparatorS() + GetFileNameComponent(path.data()); ythrow TFileError() << "RealLocation failed \"" << path << "\""; } @@ -439,8 +439,8 @@ int MakeTempDir(char path[/*FILENAME_MAX*/], const char* prefix) { if ((ret = ResolvePath(prefix, nullptr, path, 1)) != 0) return ret; - if (!TFileStat(path).IsDir()) - return ENOENT; + if (!TFileStat(path).IsDir()) + return ENOENT; if ((strlcat(path, "tmpXXXXXX", FILENAME_MAX) > FILENAME_MAX - 100)) return EINVAL; if (!(mkdtemp(path))) @@ -450,7 +450,7 @@ int MakeTempDir(char path[/*FILENAME_MAX*/], const char* prefix) { } bool IsDir(const TString& path) { - return TFileStat(path).IsDir(); + return TFileStat(path).IsDir(); } TString GetHomeDir() { @@ -483,9 +483,9 @@ void MakeDirIfNotExist(const char* path, int mode) { } void MakePathIfNotExist(const char* path, int mode) { - NFs::MakeDirectoryRecursive(path, NFs::EFilePermission(mode)); - if (!NFs::Exists(path) || !TFileStat(path).IsDir()) { - ythrow TSystemError() << "failed to create directory " << path; + NFs::MakeDirectoryRecursive(path, NFs::EFilePermission(mode)); + if (!NFs::Exists(path) || !TFileStat(path).IsDir()) { + ythrow TSystemError() << "failed to create directory " << path; } } @@ -536,7 +536,7 @@ bool SafeResolveDir(const char* path, TString& result) { } TString GetDirName(const TString& path) { - return TFsPath(path).Dirname(); + return TFsPath(path).Dirname(); } #ifdef _win32_ @@ -549,13 +549,13 @@ char* realpath(const char* pathname, char resolved_path[MAXPATHLEN]) { #endif TString GetBaseName(const TString& path) { - return TFsPath(path).Basename(); + return TFsPath(path).Basename(); } -static bool IsAbsolutePath(const char* str) { +static bool IsAbsolutePath(const char* str) { return str && TPathSplitTraitsLocal::IsAbsolutePath(TStringBuf(str, NStringPrivate::GetStringLengthWithLimit(str, 3))); -} - +} + int ResolvePath(const char* rel, const char* abs, char res[/*MAXPATHLEN*/], bool isdir) { char t[MAXPATHLEN * 2 + 3]; size_t len; diff --git a/util/folder/dirut.h b/util/folder/dirut.h index 2537027b12..03de8ff143 100644 --- a/util/folder/dirut.h +++ b/util/folder/dirut.h @@ -2,7 +2,7 @@ #include <util/system/defaults.h> #include <util/system/sysstat.h> -#include <util/system/fs.h> +#include <util/system/fs.h> #include <util/generic/string.h> #include <util/generic/yexception.h> @@ -108,8 +108,8 @@ public: if (!fname || !*fname) return nullptr; if (Strict) { - NFs::EnsureExists(fname); - } else if (!NFs::Exists(fname)) + NFs::EnsureExists(fname); + } else if (!NFs::Exists(fname)) fname = nullptr; return fname; } diff --git a/util/folder/dirut_ut.cpp b/util/folder/dirut_ut.cpp index 45ebfc842c..e355038bf5 100644 --- a/util/folder/dirut_ut.cpp +++ b/util/folder/dirut_ut.cpp @@ -1,7 +1,7 @@ #include "dirut.h" #include "tempdir.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/memory/tempbuf.h> diff --git a/util/folder/filelist_ut.cpp b/util/folder/filelist_ut.cpp index 0cdcdf3d00..94c75f884e 100644 --- a/util/folder/filelist_ut.cpp +++ b/util/folder/filelist_ut.cpp @@ -2,7 +2,7 @@ #include "filelist.h" #include "tempdir.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/file.h> #include <util/generic/string.h> diff --git a/util/folder/fts.cpp b/util/folder/fts.cpp index 0e6a6f86eb..86d6420536 100644 --- a/util/folder/fts.cpp +++ b/util/folder/fts.cpp @@ -91,29 +91,29 @@ int cmp_dird(dird fd1, dird fd2) { #else // ndef _win_ int stat64UTF(const char* path, struct _stat64* _Stat) { - int len_converted = MultiByteToWideChar(CP_UTF8, 0, path, -1, 0, 0); - if (len_converted == 0) { - return -1; - } + int len_converted = MultiByteToWideChar(CP_UTF8, 0, path, -1, 0, 0); + if (len_converted == 0) { + return -1; + } WCHAR* buf = (WCHAR*)malloc(sizeof(WCHAR) * (len_converted)); - if (buf == nullptr) { - return -1; - } - MultiByteToWideChar(CP_UTF8, 0, path, -1, buf, len_converted); - - int ret = _wstat64(buf, _Stat); - free(buf); - return ret; -} - -int stat64UTF(dird path, struct _stat64* _Stat) { - return _wstat64(path, _Stat); -} - + if (buf == nullptr) { + return -1; + } + MultiByteToWideChar(CP_UTF8, 0, path, -1, buf, len_converted); + + int ret = _wstat64(buf, _Stat); + free(buf); + return ret; +} + +int stat64UTF(dird path, struct _stat64* _Stat) { + return _wstat64(path, _Stat); +} + const dird invalidDirD = nullptr; dird get_cwdd() { - return _wgetcwd(nullptr, 0); + return _wgetcwd(nullptr, 0); } int valid_dird(dird fd) { @@ -125,42 +125,42 @@ void close_dird(dird fd) { } int chdir_dird(dird fd) { - return _wchdir(fd); + return _wchdir(fd); } -int chdir_dird(const char* path) { - int len_converted = MultiByteToWideChar(CP_UTF8, 0, path, -1, 0, 0); - if (len_converted == 0) { - return -1; - } +int chdir_dird(const char* path) { + int len_converted = MultiByteToWideChar(CP_UTF8, 0, path, -1, 0, 0); + if (len_converted == 0) { + return -1; + } WCHAR* buf = (WCHAR*)malloc(sizeof(WCHAR) * (len_converted)); - if (buf == nullptr) { - return -1; - } - MultiByteToWideChar(CP_UTF8, 0, path, -1, buf, len_converted); - int ret = _wchdir(buf); - free(buf); - return ret; -} - + if (buf == nullptr) { + return -1; + } + MultiByteToWideChar(CP_UTF8, 0, path, -1, buf, len_converted); + int ret = _wchdir(buf); + free(buf); + return ret; +} + int cmp_dird(dird fd1, dird fd2) { - return lstrcmpW(fd1, fd2); + return lstrcmpW(fd1, fd2); } dird get_dird(char* path) { - int len_converted = MultiByteToWideChar(CP_UTF8, 0, path, -1, 0, 0); - if (len_converted == 0) { - return nullptr; - } + int len_converted = MultiByteToWideChar(CP_UTF8, 0, path, -1, 0, 0); + if (len_converted == 0) { + return nullptr; + } WCHAR* buf = (WCHAR*)malloc(sizeof(WCHAR) * (len_converted)); - if (buf == nullptr) { - return nullptr; - } - MultiByteToWideChar(CP_UTF8, 0, path, -1, buf, len_converted); - + if (buf == nullptr) { + return nullptr; + } + MultiByteToWideChar(CP_UTF8, 0, path, -1, buf, len_converted); + WCHAR* ret = _wfullpath(0, buf, 0); - - free(buf); + + free(buf); return ret; } @@ -1404,29 +1404,29 @@ fts_safe_changedir(FTS* sp, FTSENT* p, int /*fd*/, const char* path) ret = -1; goto bail; } - ret = chdir_dird(path); + ret = chdir_dird(path); bail: return (ret); } - -static int -fts_safe_changedir(FTS* sp, FTSENT* p, int /*fd*/, dird path) { - int ret; - stat_struct sb; - - if (ISSET(FTS_NOCHDIR)) - return (0); - if (STAT_FUNC(path, &sb)) { - ret = -1; - goto bail; - } - if (p->fts_dev != sb.st_dev) { + +static int +fts_safe_changedir(FTS* sp, FTSENT* p, int /*fd*/, dird path) { + int ret; + stat_struct sb; + + if (ISSET(FTS_NOCHDIR)) + return (0); + if (STAT_FUNC(path, &sb)) { + ret = -1; + goto bail; + } + if (p->fts_dev != sb.st_dev) { errno = ENOENT; /* disinformation */ - ret = -1; - goto bail; - } - ret = chdir_dird(path); -bail: - return (ret); -} + ret = -1; + goto bail; + } + ret = chdir_dird(path); +bail: + return (ret); +} #endif diff --git a/util/folder/fts.h b/util/folder/fts.h index f3c799e8c8..7da796bb62 100644 --- a/util/folder/fts.h +++ b/util/folder/fts.h @@ -10,7 +10,7 @@ typedef struct stat stat_struct; #define STAT_FUNC stat #else #include <util/folder/dirent_win.h> -typedef WCHAR* dird; +typedef WCHAR* dird; typedef unsigned short u_short; typedef unsigned int nlink_t; typedef struct _stat64 stat_struct; @@ -18,7 +18,7 @@ typedef struct _stat64 stat_struct; //TODO: remove from global scope stat64UTF stat64UTF #ifdef __cplusplus int stat64UTF(const char* path, struct _stat64* _Stat); -int stat64UTF(dird path, struct _stat64* _Stat); +int stat64UTF(dird path, struct _stat64* _Stat); #endif #endif diff --git a/util/folder/fts_ut.cpp b/util/folder/fts_ut.cpp index c5d59e35f4..d6a882fa60 100644 --- a/util/folder/fts_ut.cpp +++ b/util/folder/fts_ut.cpp @@ -2,7 +2,7 @@ #include "dirut.h" #include "tempdir.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/threading/future/async.h> #include <util/system/file.h> diff --git a/util/folder/iterator_ut.cpp b/util/folder/iterator_ut.cpp index 936becd139..98e28ba639 100644 --- a/util/folder/iterator_ut.cpp +++ b/util/folder/iterator_ut.cpp @@ -1,7 +1,7 @@ #include "dirut.h" #include "iterator.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/fs.h> #include <util/system/file.h> diff --git a/util/folder/lstat_win.c b/util/folder/lstat_win.c index cf94cec01a..43951ecd32 100644 --- a/util/folder/lstat_win.c +++ b/util/folder/lstat_win.c @@ -5,22 +5,22 @@ #include "lstat_win.h" int lstat(const char* fileName, stat_struct* fileStat) { - int len = strlen(fileName); - int convRes = MultiByteToWideChar(CP_UTF8, 0, fileName, len, 0, 0); - if (convRes == 0) { - return -1; - } - WCHAR* buf = malloc(sizeof(WCHAR) * (convRes + 1)); - MultiByteToWideChar(CP_UTF8, 0, fileName, len, buf, convRes); - buf[convRes] = 0; - + int len = strlen(fileName); + int convRes = MultiByteToWideChar(CP_UTF8, 0, fileName, len, 0, 0); + if (convRes == 0) { + return -1; + } + WCHAR* buf = malloc(sizeof(WCHAR) * (convRes + 1)); + MultiByteToWideChar(CP_UTF8, 0, fileName, len, buf, convRes); + buf[convRes] = 0; + HANDLE findHandle; - WIN32_FIND_DATAW findBuf; + WIN32_FIND_DATAW findBuf; int result; - result = _wstat64(buf, fileStat); + result = _wstat64(buf, fileStat); if (result == 0) { SetLastError(0); - findHandle = FindFirstFileW(buf, &findBuf); + findHandle = FindFirstFileW(buf, &findBuf); if (findBuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && (findBuf.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT || findBuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) { @@ -28,7 +28,7 @@ int lstat(const char* fileName, stat_struct* fileStat) { } FindClose(findHandle); } - free(buf); + free(buf); return result; } diff --git a/util/folder/path.cpp b/util/folder/path.cpp index bfe0c67d68..cdb1d6cd6f 100644 --- a/util/folder/path.cpp +++ b/util/folder/path.cpp @@ -188,21 +188,21 @@ TFsPath::TSplit& TFsPath::GetSplit() const { static Y_FORCE_INLINE void VerifyPath(const TStringBuf path) { Y_VERIFY(!path.Contains('\0'), "wrong format of TFsPath"); -} - +} + TFsPath::TFsPath() { } TFsPath::TFsPath(const TString& path) : Path_(path) { - VerifyPath(Path_); + VerifyPath(Path_); } TFsPath::TFsPath(const TStringBuf path) : Path_(ToString(path)) { - VerifyPath(Path_); + VerifyPath(Path_); } TFsPath::TFsPath(const char* path) @@ -330,7 +330,7 @@ TFsPath TFsPath::ReadLink() const { } bool TFsPath::Exists() const { - return IsDefined() && NFs::Exists(*this); + return IsDefined() && NFs::Exists(*this); } void TFsPath::CheckExists() const { @@ -459,7 +459,7 @@ void TFsPath::ForceRenameTo(const TString& newPath) const { } TFsPath TFsPath::Cwd() { - return TFsPath(::NFs::CurrentWorkingDirectory()); + return TFsPath(::NFs::CurrentWorkingDirectory()); } const TPathSplit& TFsPath::PathSplit() const { diff --git a/util/folder/path_ut.cpp b/util/folder/path_ut.cpp index e6a3451016..d621554769 100644 --- a/util/folder/path_ut.cpp +++ b/util/folder/path_ut.cpp @@ -3,7 +3,7 @@ #include "dirut.h" #include "tempdir.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/scope.h> #include <util/system/platform.h> @@ -444,9 +444,9 @@ Y_UNIT_TEST_SUITE(TFsPathTests) { TFsPath(link).ForceDelete(); - UNIT_ASSERT(!NFs::Exists(link)); - UNIT_ASSERT(NFs::Exists(originFile)); - UNIT_ASSERT(NFs::Exists(originDir)); + UNIT_ASSERT(!NFs::Exists(link)); + UNIT_ASSERT(NFs::Exists(originFile)); + UNIT_ASSERT(NFs::Exists(originDir)); } Y_UNIT_TEST(TestRemoveSymlinkToFile) { @@ -467,9 +467,9 @@ Y_UNIT_TEST_SUITE(TFsPathTests) { TFsPath(link).ForceDelete(); - UNIT_ASSERT(!NFs::Exists(link)); - UNIT_ASSERT(NFs::Exists(originFile)); - UNIT_ASSERT(NFs::Exists(originDir)); + UNIT_ASSERT(!NFs::Exists(link)); + UNIT_ASSERT(NFs::Exists(originFile)); + UNIT_ASSERT(NFs::Exists(originDir)); } Y_UNIT_TEST(TestRemoveDirWithSymlinkToDir) { @@ -493,10 +493,10 @@ Y_UNIT_TEST_SUITE(TFsPathTests) { TFsPath(symlinkedDir).ForceDelete(); - UNIT_ASSERT(!NFs::Exists(symlinkedFile)); - UNIT_ASSERT(!NFs::Exists(symlinkedDir)); - UNIT_ASSERT(NFs::Exists(originFile)); - UNIT_ASSERT(NFs::Exists(originDir)); + UNIT_ASSERT(!NFs::Exists(symlinkedFile)); + UNIT_ASSERT(!NFs::Exists(symlinkedDir)); + UNIT_ASSERT(NFs::Exists(originFile)); + UNIT_ASSERT(NFs::Exists(originDir)); } Y_UNIT_TEST(TestRemoveDirWithSymlinkToFile) { @@ -520,10 +520,10 @@ Y_UNIT_TEST_SUITE(TFsPathTests) { TFsPath(symlinkedDir).ForceDelete(); - UNIT_ASSERT(!NFs::Exists(symlinkedFile)); - UNIT_ASSERT(!NFs::Exists(symlinkedDir)); - UNIT_ASSERT(NFs::Exists(originFile)); - UNIT_ASSERT(NFs::Exists(originDir)); + UNIT_ASSERT(!NFs::Exists(symlinkedFile)); + UNIT_ASSERT(!NFs::Exists(symlinkedDir)); + UNIT_ASSERT(NFs::Exists(originFile)); + UNIT_ASSERT(NFs::Exists(originDir)); } #endif diff --git a/util/generic/adaptor_ut.cpp b/util/generic/adaptor_ut.cpp index 721f849f93..c36d035843 100644 --- a/util/generic/adaptor_ut.cpp +++ b/util/generic/adaptor_ut.cpp @@ -1,7 +1,7 @@ #include "adaptor.h" #include "yexception.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> struct TOnCopy: yexception { }; diff --git a/util/generic/algorithm_ut.cpp b/util/generic/algorithm_ut.cpp index 8d732fcc0c..dd9629da4d 100644 --- a/util/generic/algorithm_ut.cpp +++ b/util/generic/algorithm_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "algorithm.h" #include "strbuf.h" diff --git a/util/generic/array_ref_ut.cpp b/util/generic/array_ref_ut.cpp index 4c8eaf7135..d1bc763c51 100644 --- a/util/generic/array_ref_ut.cpp +++ b/util/generic/array_ref_ut.cpp @@ -1,6 +1,6 @@ #include "array_ref.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestArrayRef) { Y_UNIT_TEST(TestDefaultConstructor) { diff --git a/util/generic/array_size_ut.cpp b/util/generic/array_size_ut.cpp index 13f45903c5..369c23658b 100644 --- a/util/generic/array_size_ut.cpp +++ b/util/generic/array_size_ut.cpp @@ -1,6 +1,6 @@ #include "array_size.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ArraySizeTest) { Y_UNIT_TEST(Test1) { diff --git a/util/generic/benchmark/fastclp2/main.cpp b/util/generic/benchmark/fastclp2/main.cpp index 49277db077..f4095b0c57 100644 --- a/util/generic/benchmark/fastclp2/main.cpp +++ b/util/generic/benchmark/fastclp2/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/bitops.h> #include <util/generic/vector.h> diff --git a/util/generic/benchmark/log2/main.cpp b/util/generic/benchmark/log2/main.cpp index 969f09a309..32b83e9538 100644 --- a/util/generic/benchmark/log2/main.cpp +++ b/util/generic/benchmark/log2/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <library/cpp/fast_log/fast_log.h> diff --git a/util/generic/benchmark/rotate_bits/main.cpp b/util/generic/benchmark/rotate_bits/main.cpp index 057edbe864..838c8cf869 100644 --- a/util/generic/benchmark/rotate_bits/main.cpp +++ b/util/generic/benchmark/rotate_bits/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/vector.h> #include <util/generic/xrange.h> diff --git a/util/generic/benchmark/singleton/main.cpp b/util/generic/benchmark/singleton/main.cpp index 2b06bd371d..3a2a759370 100644 --- a/util/generic/benchmark/singleton/main.cpp +++ b/util/generic/benchmark/singleton/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/singleton.h> #include <util/generic/xrange.h> diff --git a/util/generic/benchmark/smart_pointers/main.cpp b/util/generic/benchmark/smart_pointers/main.cpp index 92c2f923bb..1d04c00bf6 100644 --- a/util/generic/benchmark/smart_pointers/main.cpp +++ b/util/generic/benchmark/smart_pointers/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/ptr.h> #include <util/generic/xrange.h> diff --git a/util/generic/benchmark/sort/main.cpp b/util/generic/benchmark/sort/main.cpp index d58f491f4d..7f3b5a9b26 100644 --- a/util/generic/benchmark/sort/main.cpp +++ b/util/generic/benchmark/sort/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/algorithm.h> #include <util/generic/vector.h> diff --git a/util/generic/benchmark/vector_count_ctor/f.cpp b/util/generic/benchmark/vector_count_ctor/f.cpp index b89e351ba7..19ddc48781 100644 --- a/util/generic/benchmark/vector_count_ctor/f.cpp +++ b/util/generic/benchmark/vector_count_ctor/f.cpp @@ -1,6 +1,6 @@ #include "f.h" -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/vector.h> #include <util/generic/ptr.h> diff --git a/util/generic/benchmark/vector_count_ctor/main.cpp b/util/generic/benchmark/vector_count_ctor/main.cpp index 6fb1fda9c9..78ac40ffc3 100644 --- a/util/generic/benchmark/vector_count_ctor/main.cpp +++ b/util/generic/benchmark/vector_count_ctor/main.cpp @@ -1,6 +1,6 @@ #include "f.h" -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #define DEFINE_BENCHMARK(N) \ Y_CPU_BENCHMARK(Yvector_##N, iface) { \ diff --git a/util/generic/bitmap_ut.cpp b/util/generic/bitmap_ut.cpp index 087d34a8dc..4e90309c74 100644 --- a/util/generic/bitmap_ut.cpp +++ b/util/generic/bitmap_ut.cpp @@ -1,6 +1,6 @@ #include "bitmap.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #define INIT_BITMAP(bitmap, bits) \ for (size_t i = 0; i < sizeof(bits) / sizeof(size_t); ++i) { \ diff --git a/util/generic/bitops.h b/util/generic/bitops.h index 2db15fc59b..0de23f0be9 100644 --- a/util/generic/bitops.h +++ b/util/generic/bitops.h @@ -430,8 +430,8 @@ constexpr T RotateBitsRightCT(T value, const ui8 shift) noexcept { */ template <size_t Offset, size_t Size, class T> Y_FORCE_INLINE T SelectBits(T value) { - static_assert(Size < sizeof(T) * 8, "violated: Size < sizeof(T) * 8"); - static_assert(Offset < sizeof(T) * 8, "violated: Offset < sizeof(T) * 8"); + static_assert(Size < sizeof(T) * 8, "violated: Size < sizeof(T) * 8"); + static_assert(Offset < sizeof(T) * 8, "violated: Offset < sizeof(T) * 8"); T id = 1; return (value >> Offset) & ((id << Size) - id); } @@ -441,8 +441,8 @@ Y_FORCE_INLINE T SelectBits(T value) { */ template <size_t Offset, size_t Size, class T> void SetBits(T& value, T bits) { - static_assert(Size < sizeof(T) * 8, "violated: Size < sizeof(T) * 8"); - static_assert(Offset < sizeof(T) * 8, "violated: Offset < sizeof(T) * 8"); + static_assert(Size < sizeof(T) * 8, "violated: Size < sizeof(T) * 8"); + static_assert(Offset < sizeof(T) * 8, "violated: Offset < sizeof(T) * 8"); T id = 1; T maxValue = ((id << Size) - id); Y_ASSERT(bits <= maxValue); diff --git a/util/generic/bitops_ut.cpp b/util/generic/bitops_ut.cpp index d23c2b5c27..a2a4539300 100644 --- a/util/generic/bitops_ut.cpp +++ b/util/generic/bitops_ut.cpp @@ -1,6 +1,6 @@ #include "bitops.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/builder.h> diff --git a/util/generic/buffer.cpp b/util/generic/buffer.cpp index b92697e1d0..71931aa467 100644 --- a/util/generic/buffer.cpp +++ b/util/generic/buffer.cpp @@ -4,7 +4,7 @@ #include "ymath.h" #include <util/system/sys_alloc.h> -#include <util/system/sanitizers.h> +#include <util/system/sanitizers.h> TBuffer::TBuffer(size_t len) : Data_(nullptr) @@ -44,20 +44,20 @@ TBuffer& TBuffer::operator=(TBuffer&& b) noexcept { return *this; } -void TBuffer::Append(const char* buf, size_t len) { - if (len > Avail()) { - Reserve(Pos_ + len); - } - - Y_ASSERT(len <= Avail()); - +void TBuffer::Append(const char* buf, size_t len) { + if (len > Avail()) { + Reserve(Pos_ + len); + } + + Y_ASSERT(len <= Avail()); + MemCopy(Data() + Pos_, buf, len); - NSan::Unpoison(Data() + Pos_, len); - Pos_ += len; - - Y_ASSERT(Pos_ <= Len_); -} - + NSan::Unpoison(Data() + Pos_, len); + Pos_ += len; + + Y_ASSERT(Pos_ <= Len_); +} + void TBuffer::Fill(char ch, size_t len) { if (len > Avail()) { Reserve(Pos_ + len); diff --git a/util/generic/buffer.h b/util/generic/buffer.h index 9576467404..8bc3d9e8fe 100644 --- a/util/generic/buffer.h +++ b/util/generic/buffer.h @@ -92,7 +92,7 @@ public: return Len_ - Pos_; } - void Append(const char* buf, size_t len); + void Append(const char* buf, size_t len); inline void Append(const char* b, const char* e) { Append(b, e - b); diff --git a/util/generic/buffer_ut.cpp b/util/generic/buffer_ut.cpp index 437d7122ec..b824798641 100644 --- a/util/generic/buffer_ut.cpp +++ b/util/generic/buffer_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/datetime.h> #include "string.h" diff --git a/util/generic/cast_ut.cpp b/util/generic/cast_ut.cpp index 718a8de79d..7b51fb3ced 100644 --- a/util/generic/cast_ut.cpp +++ b/util/generic/cast_ut.cpp @@ -1,6 +1,6 @@ #include "cast.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TGenericCastsTest: public TTestBase { UNIT_TEST_SUITE(TGenericCastsTest); diff --git a/util/generic/deque_ut.cpp b/util/generic/deque_ut.cpp index 93bf50fa92..80adaef4b9 100644 --- a/util/generic/deque_ut.cpp +++ b/util/generic/deque_ut.cpp @@ -1,6 +1,6 @@ #include "deque.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <utility> #include "yexception.h" diff --git a/util/generic/explicit_type_ut.cpp b/util/generic/explicit_type_ut.cpp index 50a745f090..09e839b77e 100644 --- a/util/generic/explicit_type_ut.cpp +++ b/util/generic/explicit_type_ut.cpp @@ -1,6 +1,6 @@ #include "explicit_type.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> struct TCallableBase { public: diff --git a/util/generic/flags_ut.cpp b/util/generic/flags_ut.cpp index 5377c6a058..1ca01e4006 100644 --- a/util/generic/flags_ut.cpp +++ b/util/generic/flags_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "flags.h" diff --git a/util/generic/function_ut.cpp b/util/generic/function_ut.cpp index 3880295a9f..8c754ec9db 100644 --- a/util/generic/function_ut.cpp +++ b/util/generic/function_ut.cpp @@ -1,7 +1,7 @@ #include "function.h" #include "typetraits.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestFunctionSignature) { int FF(double x) { diff --git a/util/generic/guid_ut.cpp b/util/generic/guid_ut.cpp index 048354ff39..607ab75adc 100644 --- a/util/generic/guid_ut.cpp +++ b/util/generic/guid_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "guid.h" diff --git a/util/generic/hash.h b/util/generic/hash.h index e46db21fa9..d9312fb860 100644 --- a/util/generic/hash.h +++ b/util/generic/hash.h @@ -621,7 +621,7 @@ public: size_type max_size() const noexcept { return size_type(-1); } - + Y_PURE_FUNCTION bool empty() const noexcept { return size() == 0; } @@ -1530,7 +1530,7 @@ public: size_type max_size() const noexcept { return rep.max_size(); } - + Y_PURE_FUNCTION bool empty() const noexcept { return rep.empty(); } @@ -1855,7 +1855,7 @@ public: size_type max_size() const { return rep.max_size(); } - + Y_PURE_FUNCTION bool empty() const { return rep.empty(); } diff --git a/util/generic/hash_primes_ut.cpp b/util/generic/hash_primes_ut.cpp index 7b5bf8b5c9..3cde6e69a0 100644 --- a/util/generic/hash_primes_ut.cpp +++ b/util/generic/hash_primes_ut.cpp @@ -1,6 +1,6 @@ #include "hash_primes.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/string/builder.h> diff --git a/util/generic/hash_set.h b/util/generic/hash_set.h index e8088cf23b..8df4e0db79 100644 --- a/util/generic/hash_set.h +++ b/util/generic/hash_set.h @@ -122,7 +122,7 @@ public: size_type max_size() const { return rep.max_size(); } - + Y_PURE_FUNCTION bool empty() const { return rep.empty(); } @@ -371,7 +371,7 @@ public: size_type max_size() const { return rep.max_size(); } - + Y_PURE_FUNCTION bool empty() const { return rep.empty(); } diff --git a/util/generic/hash_ut.cpp b/util/generic/hash_ut.cpp index 0551d58770..ee66b668d7 100644 --- a/util/generic/hash_ut.cpp +++ b/util/generic/hash_ut.cpp @@ -3,7 +3,7 @@ #include "hash_set.h" #include <library/cpp/testing/common/probe.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <utility> #include <util/str_stl.h> diff --git a/util/generic/intrlist_ut.cpp b/util/generic/intrlist_ut.cpp index eff7cdf2ee..a2c42448db 100644 --- a/util/generic/intrlist_ut.cpp +++ b/util/generic/intrlist_ut.cpp @@ -1,6 +1,6 @@ #include "intrlist.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/util/generic/is_in_ut.cpp b/util/generic/is_in_ut.cpp index c668bce807..9e8a82d6fa 100644 --- a/util/generic/is_in_ut.cpp +++ b/util/generic/is_in_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "algorithm.h" #include "hash.h" diff --git a/util/generic/iterator_range_ut.cpp b/util/generic/iterator_range_ut.cpp index a7e3670ae1..ebd6633e33 100644 --- a/util/generic/iterator_range_ut.cpp +++ b/util/generic/iterator_range_ut.cpp @@ -1,6 +1,6 @@ #include "iterator_range.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/generic/vector.h> diff --git a/util/generic/iterator_ut.cpp b/util/generic/iterator_ut.cpp index 00be19e10e..96ecb8f899 100644 --- a/util/generic/iterator_ut.cpp +++ b/util/generic/iterator_ut.cpp @@ -1,6 +1,6 @@ #include "iterator.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TIterator) { Y_UNIT_TEST(ToForwardIteratorTest) { diff --git a/util/generic/lazy_value_ut.cpp b/util/generic/lazy_value_ut.cpp index f6135880c3..033b68c8ef 100644 --- a/util/generic/lazy_value_ut.cpp +++ b/util/generic/lazy_value_ut.cpp @@ -1,6 +1,6 @@ #include "lazy_value.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TLazyValueTestSuite) { Y_UNIT_TEST(TestLazyValue) { diff --git a/util/generic/list_ut.cpp b/util/generic/list_ut.cpp index 9e60ecf01b..2542358dfa 100644 --- a/util/generic/list_ut.cpp +++ b/util/generic/list_ut.cpp @@ -1,6 +1,6 @@ #include "list.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TYListSuite) { Y_UNIT_TEST(TestInitializerList) { diff --git a/util/generic/map_ut.cpp b/util/generic/map_ut.cpp index 79e832b024..d13bc3ae84 100644 --- a/util/generic/map_ut.cpp +++ b/util/generic/map_ut.cpp @@ -1,6 +1,6 @@ #include "map.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/memory/pool.h> #include <algorithm> diff --git a/util/generic/mapfindptr_ut.cpp b/util/generic/mapfindptr_ut.cpp index 613da7a96b..74f8ad6b67 100644 --- a/util/generic/mapfindptr_ut.cpp +++ b/util/generic/mapfindptr_ut.cpp @@ -1,7 +1,7 @@ #include "string.h" #include "hash.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <map> diff --git a/util/generic/maybe_ut.cpp b/util/generic/maybe_ut.cpp index 2c1a425c5e..f63b6362dc 100644 --- a/util/generic/maybe_ut.cpp +++ b/util/generic/maybe_ut.cpp @@ -1,7 +1,7 @@ #include <util/generic/string.h> #include <util/generic/vector.h> #include <util/stream/str.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "maybe.h" @@ -150,11 +150,11 @@ Y_UNIT_TEST_SUITE(TMaybeTest) { UNIT_ASSERT(m == 1); - auto& x = m.ConstructInPlace(2); + auto& x = m.ConstructInPlace(2); UNIT_ASSERT(m == 2); - x = 7; - UNIT_ASSERT(m == 7); + x = 7; + UNIT_ASSERT(m == 7); } Y_UNIT_TEST(TestMove) { diff --git a/util/generic/mem_copy_ut.cpp b/util/generic/mem_copy_ut.cpp index 8b55a11cf6..114181d27a 100644 --- a/util/generic/mem_copy_ut.cpp +++ b/util/generic/mem_copy_ut.cpp @@ -1,6 +1,6 @@ #include "mem_copy.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace { class TAssignBCalled: public yexception { diff --git a/util/generic/objects_counter_ut.cpp b/util/generic/objects_counter_ut.cpp index 4d5da37a56..0578decc62 100644 --- a/util/generic/objects_counter_ut.cpp +++ b/util/generic/objects_counter_ut.cpp @@ -1,6 +1,6 @@ #include "object_counter.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ObjectsCounter) { struct TObject: public TObjectCounter<TObject> { diff --git a/util/generic/overloaded_ut.cpp b/util/generic/overloaded_ut.cpp index f3d73895ad..68ddba94cf 100644 --- a/util/generic/overloaded_ut.cpp +++ b/util/generic/overloaded_ut.cpp @@ -1,6 +1,6 @@ #include <util/generic/overloaded.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/variant.h> #include <util/generic/algorithm.h> diff --git a/util/generic/ptr.h b/util/generic/ptr.h index 19db0e3ec5..8a4fcc3da9 100644 --- a/util/generic/ptr.h +++ b/util/generic/ptr.h @@ -185,7 +185,7 @@ public: return *this; } - inline T* Release() const noexcept Y_WARN_UNUSED_RESULT { + inline T* Release() const noexcept Y_WARN_UNUSED_RESULT { return this->DoRelease(T_); } @@ -280,7 +280,7 @@ public: Reset(nullptr); } - inline T* Release() noexcept Y_WARN_UNUSED_RESULT { + inline T* Release() noexcept Y_WARN_UNUSED_RESULT { return this->DoRelease(T_); } @@ -566,7 +566,7 @@ public: TIntrusivePtr(nullptr).Swap(*this); } - inline T* Release() const noexcept Y_WARN_UNUSED_RESULT { + inline T* Release() const noexcept Y_WARN_UNUSED_RESULT { T* res = T_; if (T_) { Ops::DecRef(T_); @@ -1011,7 +1011,7 @@ public: return *this; } - inline T* Release() noexcept Y_WARN_UNUSED_RESULT { + inline T* Release() noexcept Y_WARN_UNUSED_RESULT { return DoRelease(T_); } diff --git a/util/generic/ptr_ut.cpp b/util/generic/ptr_ut.cpp index c2dcff23f6..306646d12d 100644 --- a/util/generic/ptr_ut.cpp +++ b/util/generic/ptr_ut.cpp @@ -2,7 +2,7 @@ #include "vector.h" #include "noncopyable.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> #include <util/generic/is_in.h> diff --git a/util/generic/queue_ut.cpp b/util/generic/queue_ut.cpp index a33399e104..7bee07699d 100644 --- a/util/generic/queue_ut.cpp +++ b/util/generic/queue_ut.cpp @@ -2,7 +2,7 @@ #include "list.h" #include "vector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <utility> diff --git a/util/generic/reserve.h b/util/generic/reserve.h index 81ceed19dc..72fb466018 100644 --- a/util/generic/reserve.h +++ b/util/generic/reserve.h @@ -1,11 +1,11 @@ -#pragma once - -namespace NDetail { - struct TReserveTag { - size_t Capacity; - }; -} - +#pragma once + +namespace NDetail { + struct TReserveTag { + size_t Capacity; + }; +} + constexpr ::NDetail::TReserveTag Reserve(size_t capacity) { return ::NDetail::TReserveTag{capacity}; -} +} diff --git a/util/generic/scope_ut.cpp b/util/generic/scope_ut.cpp index bdb434d487..d1742ab444 100644 --- a/util/generic/scope_ut.cpp +++ b/util/generic/scope_ut.cpp @@ -1,7 +1,7 @@ #include "scope.h" #include <util/generic/ptr.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ScopeToolsTest) { Y_UNIT_TEST(OnScopeExitTest) { diff --git a/util/generic/serialized_enum_ut.cpp b/util/generic/serialized_enum_ut.cpp index 3a94e1d471..ab85b65961 100644 --- a/util/generic/serialized_enum_ut.cpp +++ b/util/generic/serialized_enum_ut.cpp @@ -1,6 +1,6 @@ #include "serialized_enum.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/deque.h> #include <util/generic/map.h> diff --git a/util/generic/set_ut.cpp b/util/generic/set_ut.cpp index d2769d327f..e11453c8e8 100644 --- a/util/generic/set_ut.cpp +++ b/util/generic/set_ut.cpp @@ -1,6 +1,6 @@ #include "set.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <utility> diff --git a/util/generic/singleton.cpp b/util/generic/singleton.cpp index eb5a0662f8..687b2b3f64 100644 --- a/util/generic/singleton.cpp +++ b/util/generic/singleton.cpp @@ -2,7 +2,7 @@ #include <util/system/spinlock.h> #include <util/system/thread.h> -#include <util/system/sanitizers.h> +#include <util/system/sanitizers.h> #include <cstring> @@ -32,12 +32,12 @@ void NPrivate::FillWithTrash(void* ptr, size_t len) { Y_UNUSED(ptr); Y_UNUSED(len); #else - if constexpr (NSan::TSanIsOn()) { - Y_UNUSED(ptr); - Y_UNUSED(len); - } else { - memset(ptr, 0xBA, len); - } + if constexpr (NSan::TSanIsOn()) { + Y_UNUSED(ptr); + Y_UNUSED(len); + } else { + memset(ptr, 0xBA, len); + } #endif } diff --git a/util/generic/singleton_ut.cpp b/util/generic/singleton_ut.cpp index 35ba90cd76..2d50855677 100644 --- a/util/generic/singleton_ut.cpp +++ b/util/generic/singleton_ut.cpp @@ -1,6 +1,6 @@ #include "singleton.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestSingleton) { struct THuge { diff --git a/util/generic/stack_ut.cpp b/util/generic/stack_ut.cpp index 248127d326..1c9dd7ed89 100644 --- a/util/generic/stack_ut.cpp +++ b/util/generic/stack_ut.cpp @@ -1,6 +1,6 @@ #include "stack.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TYStackTest) { Y_UNIT_TEST(ExplicitBool) { diff --git a/util/generic/store_policy_ut.cpp b/util/generic/store_policy_ut.cpp index c9722203aa..c867a853f5 100644 --- a/util/generic/store_policy_ut.cpp +++ b/util/generic/store_policy_ut.cpp @@ -1,6 +1,6 @@ #include "store_policy.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/generic/vector.h> diff --git a/util/generic/strbase.h b/util/generic/strbase.h index ab39fc7537..e8bc89569a 100644 --- a/util/generic/strbase.h +++ b/util/generic/strbase.h @@ -483,14 +483,14 @@ public: return !s.length() || find(s, pos) != npos; } - inline bool Contains(TChar c, size_t pos = 0) const noexcept { + inline bool Contains(TChar c, size_t pos = 0) const noexcept { return find(c, pos) != npos; } - inline void Contains(std::enable_if<std::is_unsigned<TCharType>::value, char> c, size_t pos = 0) const noexcept { - return find(ui8(c), pos) != npos; - } - + inline void Contains(std::enable_if<std::is_unsigned<TCharType>::value, char> c, size_t pos = 0) const noexcept { + return find(ui8(c), pos) != npos; + } + //~~~~Character Set Search~~~ inline size_t find_first_of(TCharType c) const noexcept { return find_first_of(c, 0); @@ -569,12 +569,12 @@ public: return n; } - inline TDerived copy() const Y_WARN_UNUSED_RESULT { + inline TDerived copy() const Y_WARN_UNUSED_RESULT { return TDerived(Ptr(), Len()); } // ~~~ Partial copy ~~~~ - TDerived substr(size_t pos, size_t n = npos) const Y_WARN_UNUSED_RESULT { + TDerived substr(size_t pos, size_t n = npos) const Y_WARN_UNUSED_RESULT { return TDerived(*This(), pos, n); } diff --git a/util/generic/strbuf_ut.cpp b/util/generic/strbuf_ut.cpp index 69cde785af..20c284d352 100644 --- a/util/generic/strbuf_ut.cpp +++ b/util/generic/strbuf_ut.cpp @@ -1,6 +1,6 @@ #include "strbuf.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <string_view> diff --git a/util/generic/string.cpp b/util/generic/string.cpp index 3c655f1f66..6242c45685 100644 --- a/util/generic/string.cpp +++ b/util/generic/string.cpp @@ -80,7 +80,7 @@ template <> bool TBasicString<wchar16, std::char_traits<wchar16>>::to_title(size_t pos, size_t n) { return ToTitle(*this, pos, n); } - + template <> TUtf32String& TBasicString<wchar32, std::char_traits<wchar32>>::AppendAscii(const ::TStringBuf& s) { @@ -112,9 +112,9 @@ TBasicString<char, std::char_traits<char>>::AppendUtf16(const ::TWtringBuf& s) { template <> TUtf32String& TBasicString<wchar32, std::char_traits<wchar32>>::AppendUtf8(const ::TStringBuf& s) { - size_t oldSize = size(); + size_t oldSize = size(); ReserveAndResize(size() + s.size() * 4); - size_t written = 0; + size_t written = 0; size_t pos = UTF8ToWideImpl(s.data(), s.size(), begin() + oldSize, written); if (pos != s.size()) { ythrow yexception() << "failed to decode UTF-8 string at pos " << pos << ::NDetail::InStringMsg(s.data(), s.size()); @@ -122,35 +122,35 @@ TBasicString<wchar32, std::char_traits<wchar32>>::AppendUtf8(const ::TStringBuf& resize(oldSize + written); return *this; -} - +} + template <> TUtf32String& TBasicString<wchar32, std::char_traits<wchar32>>::AppendUtf16(const ::TWtringBuf& s) { - size_t oldSize = size(); + size_t oldSize = size(); ReserveAndResize(size() + s.size() * 2); - - wchar32* oldEnd = begin() + oldSize; - wchar32* end = oldEnd; + + wchar32* oldEnd = begin() + oldSize; + wchar32* end = oldEnd; NDetail::UTF16ToUTF32ImplScalar(s.data(), s.data() + s.size(), end); - size_t written = end - oldEnd; - + size_t written = end - oldEnd; + resize(oldSize + written); - + return *this; -} - +} + template <> bool TBasicString<wchar32, std::char_traits<wchar32>>::to_lower(size_t pos, size_t n) { return ToLower(*this, pos, n); -} - +} + template <> bool TBasicString<wchar32, std::char_traits<wchar32>>::to_upper(size_t pos, size_t n) { return ToUpper(*this, pos, n); -} - +} + template <> bool TBasicString<wchar32, std::char_traits<wchar32>>::to_title(size_t pos, size_t n) { return ToTitle(*this, pos, n); -} +} diff --git a/util/generic/string.h b/util/generic/string.h index 8cd8aa6917..543c494eda 100644 --- a/util/generic/string.h +++ b/util/generic/string.h @@ -14,7 +14,7 @@ #include "utility.h" #include "bitops.h" #include "explicit_type.h" -#include "reserve.h" +#include "reserve.h" #include "singleton.h" #include "strbase.h" #include "strbuf.h" @@ -379,7 +379,7 @@ public: { } - inline explicit TBasicString(::NDetail::TReserveTag rt) + inline explicit TBasicString(::NDetail::TReserveTag rt) #ifndef TSTRING_IS_STD_STRING : S_(Construct()) #endif diff --git a/util/generic/string_transparent_hash_ut.cpp b/util/generic/string_transparent_hash_ut.cpp index b87fa2843e..cf1170c3ac 100644 --- a/util/generic/string_transparent_hash_ut.cpp +++ b/util/generic/string_transparent_hash_ut.cpp @@ -2,7 +2,7 @@ #include "vector.h" #include "strbuf.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/containers/absl_flat_hash/flat_hash_set.h> #include <util/str_stl.h> diff --git a/util/generic/string_ut.cpp b/util/generic/string_ut.cpp index ac82e9091d..93b9be3387 100644 --- a/util/generic/string_ut.cpp +++ b/util/generic/string_ut.cpp @@ -908,191 +908,191 @@ private: UNIT_TEST_SUITE_REGISTRATION(TWideStringTest); class TUtf32StringTest: public TTestBase, private TStringTestImpl<TUtf32String, TTestData<wchar32>> { -public: - UNIT_TEST_SUITE(TUtf32StringTest); - UNIT_TEST(TestConstructors); - UNIT_TEST(TestReplace); +public: + UNIT_TEST_SUITE(TUtf32StringTest); + UNIT_TEST(TestConstructors); + UNIT_TEST(TestReplace); #ifndef TSTRING_IS_STD_STRING - UNIT_TEST(TestRefCount); + UNIT_TEST(TestRefCount); #endif - UNIT_TEST(TestFind); - UNIT_TEST(TestContains); - UNIT_TEST(TestOperators); - UNIT_TEST(TestLetOperator) - UNIT_TEST(TestMulOperators); - UNIT_TEST(TestFuncs); - UNIT_TEST(TestUtils); - UNIT_TEST(TestEmpty); - UNIT_TEST(TestJoin); - UNIT_TEST(TestCopy); - UNIT_TEST(TestStrCpy); - UNIT_TEST(TestPrefixSuffix); + UNIT_TEST(TestFind); + UNIT_TEST(TestContains); + UNIT_TEST(TestOperators); + UNIT_TEST(TestLetOperator) + UNIT_TEST(TestMulOperators); + UNIT_TEST(TestFuncs); + UNIT_TEST(TestUtils); + UNIT_TEST(TestEmpty); + UNIT_TEST(TestJoin); + UNIT_TEST(TestCopy); + UNIT_TEST(TestStrCpy); + UNIT_TEST(TestPrefixSuffix); #ifndef TSTRING_IS_STD_STRING - UNIT_TEST(TestCharRef); + UNIT_TEST(TestCharRef); #endif - UNIT_TEST(TestBack); - UNIT_TEST(TestFront) - UNIT_TEST(TestDecodingMethods); - UNIT_TEST(TestDecodingMethodsMixedStr); + UNIT_TEST(TestBack); + UNIT_TEST(TestFront) + UNIT_TEST(TestDecodingMethods); + UNIT_TEST(TestDecodingMethodsMixedStr); UNIT_TEST(TestIterators); UNIT_TEST(TestReverseIterators); UNIT_TEST(TestStringLiterals); - UNIT_TEST_SUITE_END(); - -private: - void TestDecodingMethods() { - UNIT_ASSERT(TUtf32String::FromAscii("").empty()); - UNIT_ASSERT(TUtf32String::FromAscii("abc") == ASCIIToUTF32("abc")); - - const char* text = "123kx83abcd ej)#$%ddja&%J&"; - TUtf32String wtext = ASCIIToUTF32(text); - - UNIT_ASSERT(wtext == TUtf32String::FromAscii(text)); - - TString strtext(text); - UNIT_ASSERT(wtext == TUtf32String::FromAscii(strtext)); - - TStringBuf strbuftext(text); - UNIT_ASSERT(wtext == TUtf32String::FromAscii(strbuftext)); - - UNIT_ASSERT(wtext.substr(5) == TUtf32String::FromAscii(text + 5)); - - const wchar32 wideCyrillicAlphabet[] = { - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, - 0x00}; - - TUtf32String strWide(wideCyrillicAlphabet); - TString strUtf8 = WideToUTF8(strWide); - - UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8.c_str())); - UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8)); - UNIT_ASSERT(strWide == TUtf32String::FromUtf8(TStringBuf(strUtf8))); - - // assign - - TUtf32String s1; - s1.AssignAscii("1234"); - UNIT_ASSERT(s1 == ASCIIToUTF32("1234")); - - s1.AssignUtf8(strUtf8); - UNIT_ASSERT(s1 == strWide); - - s1.AssignAscii(text); - UNIT_ASSERT(s1 == wtext); - - // append - - TUtf32String s2; - TUtf32String testAppend = strWide; - s2.AppendUtf8(strUtf8); - UNIT_ASSERT(testAppend == s2); - - testAppend += ' '; - s2.AppendAscii(" "); - UNIT_ASSERT(testAppend == s2); - - testAppend += '_'; - s2.AppendUtf8("_"); - UNIT_ASSERT(testAppend == s2); - - testAppend += wtext; - s2.AppendAscii(text); - UNIT_ASSERT(testAppend == s2); - - testAppend += wtext; - s2.AppendUtf8(text); - - UNIT_ASSERT(testAppend == s2); - } - - void TestDecodingMethodsMixedStr() { - UNIT_ASSERT(TUtf32String::FromAscii("").empty()); - UNIT_ASSERT(TUtf32String::FromAscii("abc") == ASCIIToUTF32("abc")); - - const char* text = "123kx83abcd ej)#$%ddja&%J&"; - TUtf32String wtext = ASCIIToUTF32(text); - - UNIT_ASSERT(wtext == TUtf32String::FromAscii(text)); - - TString strtext(text); - UNIT_ASSERT(wtext == TUtf32String::FromAscii(strtext)); - - TStringBuf strbuftext(text); - UNIT_ASSERT(wtext == TUtf32String::FromAscii(strbuftext)); - - UNIT_ASSERT(wtext.substr(5) == TUtf32String::FromAscii(text + 5)); - - const wchar32 cyrilicAndLatinWide[] = { - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - wchar32('z'), - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, - wchar32('z'), - 0x00}; - - TUtf32String strWide(cyrilicAndLatinWide); - TString strUtf8 = WideToUTF8(strWide); - - UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8.c_str())); - UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8)); - UNIT_ASSERT(strWide == UTF8ToUTF32<true>(strUtf8)); - UNIT_ASSERT(strWide == UTF8ToUTF32<false>(strUtf8)); - UNIT_ASSERT(strWide == TUtf32String::FromUtf8(TStringBuf(strUtf8))); - - // assign - - TUtf32String s1; - s1.AssignAscii("1234"); - UNIT_ASSERT(s1 == ASCIIToUTF32("1234")); - - s1.AssignUtf8(strUtf8); - UNIT_ASSERT(s1 == strWide); - - s1.AssignAscii(text); - UNIT_ASSERT(s1 == wtext); - - // append - - TUtf32String s2; - TUtf32String testAppend = strWide; - s2.AppendUtf16(UTF8ToWide(strUtf8)); - UNIT_ASSERT(testAppend == s2); - - testAppend += ' '; - s2.AppendAscii(" "); - UNIT_ASSERT(testAppend == s2); - - testAppend += '_'; - s2.AppendUtf8("_"); - UNIT_ASSERT(testAppend == s2); - - testAppend += wtext; - s2.AppendAscii(text); - UNIT_ASSERT(testAppend == s2); - - testAppend += wtext; - s2.AppendUtf8(text); - - UNIT_ASSERT(testAppend == s2); - } - - void TestLetOperator() { - TUtf32String str; - + UNIT_TEST_SUITE_END(); + +private: + void TestDecodingMethods() { + UNIT_ASSERT(TUtf32String::FromAscii("").empty()); + UNIT_ASSERT(TUtf32String::FromAscii("abc") == ASCIIToUTF32("abc")); + + const char* text = "123kx83abcd ej)#$%ddja&%J&"; + TUtf32String wtext = ASCIIToUTF32(text); + + UNIT_ASSERT(wtext == TUtf32String::FromAscii(text)); + + TString strtext(text); + UNIT_ASSERT(wtext == TUtf32String::FromAscii(strtext)); + + TStringBuf strbuftext(text); + UNIT_ASSERT(wtext == TUtf32String::FromAscii(strbuftext)); + + UNIT_ASSERT(wtext.substr(5) == TUtf32String::FromAscii(text + 5)); + + const wchar32 wideCyrillicAlphabet[] = { + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, + 0x00}; + + TUtf32String strWide(wideCyrillicAlphabet); + TString strUtf8 = WideToUTF8(strWide); + + UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8.c_str())); + UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8)); + UNIT_ASSERT(strWide == TUtf32String::FromUtf8(TStringBuf(strUtf8))); + + // assign + + TUtf32String s1; + s1.AssignAscii("1234"); + UNIT_ASSERT(s1 == ASCIIToUTF32("1234")); + + s1.AssignUtf8(strUtf8); + UNIT_ASSERT(s1 == strWide); + + s1.AssignAscii(text); + UNIT_ASSERT(s1 == wtext); + + // append + + TUtf32String s2; + TUtf32String testAppend = strWide; + s2.AppendUtf8(strUtf8); + UNIT_ASSERT(testAppend == s2); + + testAppend += ' '; + s2.AppendAscii(" "); + UNIT_ASSERT(testAppend == s2); + + testAppend += '_'; + s2.AppendUtf8("_"); + UNIT_ASSERT(testAppend == s2); + + testAppend += wtext; + s2.AppendAscii(text); + UNIT_ASSERT(testAppend == s2); + + testAppend += wtext; + s2.AppendUtf8(text); + + UNIT_ASSERT(testAppend == s2); + } + + void TestDecodingMethodsMixedStr() { + UNIT_ASSERT(TUtf32String::FromAscii("").empty()); + UNIT_ASSERT(TUtf32String::FromAscii("abc") == ASCIIToUTF32("abc")); + + const char* text = "123kx83abcd ej)#$%ddja&%J&"; + TUtf32String wtext = ASCIIToUTF32(text); + + UNIT_ASSERT(wtext == TUtf32String::FromAscii(text)); + + TString strtext(text); + UNIT_ASSERT(wtext == TUtf32String::FromAscii(strtext)); + + TStringBuf strbuftext(text); + UNIT_ASSERT(wtext == TUtf32String::FromAscii(strbuftext)); + + UNIT_ASSERT(wtext.substr(5) == TUtf32String::FromAscii(text + 5)); + + const wchar32 cyrilicAndLatinWide[] = { + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + wchar32('z'), + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, + wchar32('z'), + 0x00}; + + TUtf32String strWide(cyrilicAndLatinWide); + TString strUtf8 = WideToUTF8(strWide); + + UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8.c_str())); + UNIT_ASSERT(strWide == TUtf32String::FromUtf8(strUtf8)); + UNIT_ASSERT(strWide == UTF8ToUTF32<true>(strUtf8)); + UNIT_ASSERT(strWide == UTF8ToUTF32<false>(strUtf8)); + UNIT_ASSERT(strWide == TUtf32String::FromUtf8(TStringBuf(strUtf8))); + + // assign + + TUtf32String s1; + s1.AssignAscii("1234"); + UNIT_ASSERT(s1 == ASCIIToUTF32("1234")); + + s1.AssignUtf8(strUtf8); + UNIT_ASSERT(s1 == strWide); + + s1.AssignAscii(text); + UNIT_ASSERT(s1 == wtext); + + // append + + TUtf32String s2; + TUtf32String testAppend = strWide; + s2.AppendUtf16(UTF8ToWide(strUtf8)); + UNIT_ASSERT(testAppend == s2); + + testAppend += ' '; + s2.AppendAscii(" "); + UNIT_ASSERT(testAppend == s2); + + testAppend += '_'; + s2.AppendUtf8("_"); + UNIT_ASSERT(testAppend == s2); + + testAppend += wtext; + s2.AppendAscii(text); + UNIT_ASSERT(testAppend == s2); + + testAppend += wtext; + s2.AppendUtf8(text); + + UNIT_ASSERT(testAppend == s2); + } + + void TestLetOperator() { + TUtf32String str; + str = wchar32('X'); - UNIT_ASSERT(str == TUtf32String::FromAscii("X")); - - const TUtf32String hello = TUtf32String::FromAscii("hello"); + UNIT_ASSERT(str == TUtf32String::FromAscii("X")); + + const TUtf32String hello = TUtf32String::FromAscii("hello"); str = hello.data(); - UNIT_ASSERT(str == hello); - - str = hello; - UNIT_ASSERT(str == hello); - } + UNIT_ASSERT(str == hello); + + str = hello; + UNIT_ASSERT(str == hello); + } void TestStringLiterals() { TUtf32String s1 = U"hello"; @@ -1101,10 +1101,10 @@ private: TUtf32String s2 = U"привет"; UNIT_ASSERT_VALUES_EQUAL(s2, TUtf32String::FromUtf8("привет")); } -}; - -UNIT_TEST_SUITE_REGISTRATION(TUtf32StringTest); - +}; + +UNIT_TEST_SUITE_REGISTRATION(TUtf32StringTest); + class TStringStdTest: public TTestBase, private TStringStdTestImpl<TString, TTestData<char>> { public: UNIT_TEST_SUITE(TStringStdTest); diff --git a/util/generic/string_ut.h b/util/generic/string_ut.h index 44bb10bdeb..55cd378e01 100644 --- a/util/generic/string_ut.h +++ b/util/generic/string_ut.h @@ -2,7 +2,7 @@ #include "string.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/reverse.h> @@ -565,9 +565,9 @@ public: TStringType s9(*Data._1()); UNIT_ASSERT(s9 == Data._1()); - + TStringType s10(Reserve(100)); - UNIT_ASSERT(s10.empty()); + UNIT_ASSERT(s10.empty()); UNIT_ASSERT(s10.capacity() >= 100); } @@ -1011,14 +1011,14 @@ public: UNIT_ASSERT(!s1.IsDetached()); /* Read access shouldn't detach. */ - UNIT_ASSERT_VALUES_EQUAL(s0[0], (ui8)'a'); + UNIT_ASSERT_VALUES_EQUAL(s0[0], (ui8)'a'); UNIT_ASSERT(!s0.IsDetached()); UNIT_ASSERT(!s1.IsDetached()); /* Writing should detach. */ - s1[0] = (ui8)'b'; + s1[0] = (ui8)'b'; TStringType s2 = s0; - s0[0] = (ui8)'c'; + s0[0] = (ui8)'c'; UNIT_ASSERT_VALUES_EQUAL(s0, cbc); UNIT_ASSERT_VALUES_EQUAL(s1, bbc); @@ -1028,9 +1028,9 @@ public: UNIT_ASSERT(s2.IsDetached()); /* Accessing null terminator is OK. Note that writing into it is UB. */ - UNIT_ASSERT_VALUES_EQUAL(s0[3], (ui8)'\0'); - UNIT_ASSERT_VALUES_EQUAL(s1[3], (ui8)'\0'); - UNIT_ASSERT_VALUES_EQUAL(s2[3], (ui8)'\0'); + UNIT_ASSERT_VALUES_EQUAL(s0[3], (ui8)'\0'); + UNIT_ASSERT_VALUES_EQUAL(s1[3], (ui8)'\0'); + UNIT_ASSERT_VALUES_EQUAL(s2[3], (ui8)'\0'); /* Assignment one char reference to another results in modification of underlying character */ { @@ -1053,12 +1053,12 @@ public: TStringType str = chars; const TStringType constStr = str; - UNIT_ASSERT_VALUES_EQUAL(constStr.back(), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(str.back(), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(constStr.back(), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(str.back(), (ui8)'o'); str.back() = 'r'; - UNIT_ASSERT_VALUES_EQUAL(constStr.back(), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(str.back(), (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(constStr.back(), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(str.back(), (ui8)'r'); } void TestFront() { @@ -1067,12 +1067,12 @@ public: TStringType str = chars; const TStringType constStr = str; - UNIT_ASSERT_VALUES_EQUAL(constStr.front(), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(str.front(), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(constStr.front(), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(str.front(), (ui8)'f'); str.front() = 'r'; - UNIT_ASSERT_VALUES_EQUAL(constStr.front(), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(str.front(), (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(constStr.front(), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(str.front(), (ui8)'r'); } void TestIterators() { @@ -1086,31 +1086,31 @@ public: typename TStringType::const_iterator citBegin = constStr.begin(); typename TStringType::const_iterator citEnd = constStr.end(); - UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'f'); str.front() = 'r'; - UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'f'); UNIT_ASSERT_VALUES_EQUAL(2, itEnd - itBegin); UNIT_ASSERT_VALUES_EQUAL(2, citEnd - citBegin); - UNIT_ASSERT_VALUES_EQUAL(*(++itBegin), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*(++citBegin), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*(++itBegin), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*(++citBegin), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*(--itBegin), (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*(--citBegin), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*(--itBegin), (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*(--citBegin), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*(itBegin++), (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*(citBegin++), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*(itBegin++), (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*(citBegin++), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*(itBegin--), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*(citBegin--), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*(itBegin--), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*(citBegin--), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*itBegin, (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*citBegin, (ui8)'f'); } void TestReverseIterators() { @@ -1124,33 +1124,33 @@ public: typename TStringType::const_reverse_iterator critBegin = constStr.rbegin(); typename TStringType::const_reverse_iterator critEnd = constStr.rend(); - UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'o'); - str.back() = (ui8)'r'; - UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'o'); + str.back() = (ui8)'r'; + UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'o'); UNIT_ASSERT_VALUES_EQUAL(2, ritEnd - ritBegin); UNIT_ASSERT_VALUES_EQUAL(2, critEnd - critBegin); - UNIT_ASSERT_VALUES_EQUAL(*(++ritBegin), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*(++critBegin), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*(++ritBegin), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*(++critBegin), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*(--ritBegin), (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*(--critBegin), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*(--ritBegin), (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*(--critBegin), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*(ritBegin++), (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*(critBegin++), (ui8)'o'); - UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*(ritBegin++), (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*(critBegin++), (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*(ritBegin--), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*(critBegin--), (ui8)'f'); - UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'r'); - UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'o'); + UNIT_ASSERT_VALUES_EQUAL(*(ritBegin--), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*(critBegin--), (ui8)'f'); + UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'r'); + UNIT_ASSERT_VALUES_EQUAL(*critBegin, (ui8)'o'); - *ritBegin = (ui8)'e'; - UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'e'); + *ritBegin = (ui8)'e'; + UNIT_ASSERT_VALUES_EQUAL(*ritBegin, (ui8)'e'); } }; diff --git a/util/generic/typelist_ut.cpp b/util/generic/typelist_ut.cpp index eeabfa97b1..6216d5e0a0 100644 --- a/util/generic/typelist_ut.cpp +++ b/util/generic/typelist_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/type_name.h> #include "typelist.h" diff --git a/util/generic/typetraits.h b/util/generic/typetraits.h index d165bd1a06..e8ad545631 100644 --- a/util/generic/typetraits.h +++ b/util/generic/typetraits.h @@ -235,7 +235,7 @@ struct TPodTraits<std::pair<T1, T2>> { }; }; -template <class T> +template <class T> struct TIsPointerToConstMemberFunction: std::false_type { }; diff --git a/util/generic/typetraits_ut.cpp b/util/generic/typetraits_ut.cpp index e7571c75ec..afad5cc4d2 100644 --- a/util/generic/typetraits_ut.cpp +++ b/util/generic/typetraits_ut.cpp @@ -1,6 +1,6 @@ #include "typetraits.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <vector> #include <tuple> diff --git a/util/generic/utility_ut.cpp b/util/generic/utility_ut.cpp index 8e9d5afff9..3226322cc5 100644 --- a/util/generic/utility_ut.cpp +++ b/util/generic/utility_ut.cpp @@ -1,7 +1,7 @@ #include "utility.h" #include "ymath.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> // DO_NOT_STYLE diff --git a/util/generic/va_args_ut.cpp b/util/generic/va_args_ut.cpp index a9c96a0f55..3ea47b43ea 100644 --- a/util/generic/va_args_ut.cpp +++ b/util/generic/va_args_ut.cpp @@ -1,6 +1,6 @@ #include "va_args.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TMacroVarargMapTest) { Y_UNIT_TEST(TestMapArgs) { diff --git a/util/generic/vector.h b/util/generic/vector.h index a5b258955a..935e9c0c59 100644 --- a/util/generic/vector.h +++ b/util/generic/vector.h @@ -1,7 +1,7 @@ #pragma once #include "fwd.h" -#include "reserve.h" +#include "reserve.h" #include <util/memory/alloc.h> @@ -26,17 +26,17 @@ public: } inline explicit TVector(::NDetail::TReserveTag rt) - : TBase() - { - this->reserve(rt.Capacity); - } - + : TBase() + { + this->reserve(rt.Capacity); + } + inline explicit TVector(::NDetail::TReserveTag rt, const typename TBase::allocator_type& a) - : TBase(a) - { - this->reserve(rt.Capacity); - } - + : TBase(a) + { + this->reserve(rt.Capacity); + } + inline explicit TVector(size_type count) : TBase(count) { @@ -103,9 +103,9 @@ public: } Y_PURE_FUNCTION inline bool empty() const noexcept { - return TBase::empty(); - } - + return TBase::empty(); + } + inline yssize_t ysize() const noexcept { return (yssize_t)TBase::size(); } diff --git a/util/generic/vector_ut.cpp b/util/generic/vector_ut.cpp index 0f6b4037a0..be3cd24828 100644 --- a/util/generic/vector_ut.cpp +++ b/util/generic/vector_ut.cpp @@ -1,6 +1,6 @@ #include "vector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <utility> #include "yexception.h" @@ -279,13 +279,13 @@ private: UNIT_ASSERT(v[5] == 25); UNIT_ASSERT(v[6] == 36); - size_t curCapacity = v.capacity(); + size_t curCapacity = v.capacity(); v.clear(); UNIT_ASSERT(v.empty()); - //check that clear save reserved data - UNIT_ASSERT_EQUAL(curCapacity, v.capacity()); - + //check that clear save reserved data + UNIT_ASSERT_EQUAL(curCapacity, v.capacity()); + v.insert(v.begin(), 5, 10); UNIT_ASSERT(v.size() == 5); UNIT_ASSERT(v[0] == 10); @@ -312,12 +312,12 @@ private: { TVector<int> v(Reserve(100)); - - UNIT_ASSERT(v.capacity() >= 100); - UNIT_ASSERT(v.size() == 0); - } - - { + + UNIT_ASSERT(v.capacity() >= 100); + UNIT_ASSERT(v.size() == 0); + } + + { //Test that used to generate an assertion when using __debug_alloc. TVector<TestStruct> va; va.reserve(1); diff --git a/util/generic/xrange.h b/util/generic/xrange.h index 5fc8c82912..578605f356 100644 --- a/util/generic/xrange.h +++ b/util/generic/xrange.h @@ -13,16 +13,16 @@ * for (auto i: xrange(MyVector.size())) { // instead for (size_t i = 0; i < MyVector.size(); ++i) * DoSomething(i, MyVector[i]); * } - * + * * TVector<int> arithmeticSeq = xrange(10); // instead: TVector<int> arithmeticSeq; for(size_t i = 0; i < 10; ++i) { arithmeticSeq.push_back(i); } - * + * */ namespace NPrivate { template <typename T> class TSimpleXRange { - using TDiff = decltype(T() - T()); - + using TDiff = decltype(T() - T()); + public: constexpr TSimpleXRange(T start, T finish) noexcept : Start(start) @@ -52,12 +52,12 @@ namespace NPrivate { } constexpr bool operator==(const TIterator& other) const noexcept { - return Value == other.Value; - } - - TIterator& operator++() noexcept { + return Value == other.Value; + } + + TIterator& operator++() noexcept { ++Value; - return *this; + return *this; } TIterator& operator--() noexcept { @@ -66,25 +66,25 @@ namespace NPrivate { } constexpr TDiff operator-(const TIterator& b) const noexcept { - return Value - b.Value; - } - + return Value - b.Value; + } + template <typename IntType> constexpr TIterator operator+(const IntType& b) const noexcept { - return TIterator(Value + b); - } - + return TIterator(Value + b); + } + template <typename IntType> TIterator& operator+=(const IntType& b) noexcept { - Value += b; - return *this; - } - + Value += b; + return *this; + } + template <typename IntType> constexpr TIterator operator-(const IntType& b) const noexcept { - return TIterator(Value - b); - } - + return TIterator(Value - b); + } + template <typename IntType> TIterator& operator-=(const IntType& b) noexcept { Value -= b; @@ -100,9 +100,9 @@ namespace NPrivate { }; using value_type = T; - using iterator = TIterator; - using const_iterator = TIterator; - + using iterator = TIterator; + using const_iterator = TIterator; + constexpr TIterator begin() const noexcept { return TIterator(Start); } @@ -112,14 +112,14 @@ namespace NPrivate { } constexpr T size() const noexcept { - return Finish - Start; - } - - template <class Container> + return Finish - Start; + } + + template <class Container> operator Container() const { - return Container(begin(), end()); - } - + return Container(begin(), end()); + } + private: T Start; T Finish; @@ -161,12 +161,12 @@ namespace NPrivate { } constexpr bool operator==(const TIterator& other) const noexcept { - return Value_ == other.Value_; - } - - TIterator& operator++() noexcept { + return Value_ == other.Value_; + } + + TIterator& operator++() noexcept { Value_ += Parent_->Step_; - return *this; + return *this; } TIterator& operator--() noexcept { @@ -176,23 +176,23 @@ namespace NPrivate { constexpr TDiff operator-(const TIterator& b) const noexcept { return (Value_ - b.Value_) / Parent_->Step_; - } - + } + template <typename IntType> constexpr TIterator operator+(const IntType& b) const noexcept { return TIterator(*this) += b; - } - + } + template <typename IntType> TIterator& operator+=(const IntType& b) noexcept { Value_ += b * Parent_->Step_; - return *this; - } - + return *this; + } + template <typename IntType> constexpr TIterator operator-(const IntType& b) const noexcept { return TIterator(*this) -= b; - } + } template <typename IntType> TIterator& operator-=(const IntType& b) noexcept { @@ -206,9 +206,9 @@ namespace NPrivate { }; using value_type = T; - using iterator = TIterator; - using const_iterator = TIterator; - + using iterator = TIterator; + using const_iterator = TIterator; + constexpr TIterator begin() const noexcept { return TIterator(Start_, *this); } @@ -229,14 +229,14 @@ namespace NPrivate { } constexpr T size() const noexcept { - return (Finish_ - Start_) / Step_; - } - - template <class Container> + return (Finish_ - Start_) / Step_; + } + + template <class Container> operator Container() const { - return Container(begin(), end()); - } - + return Container(begin(), end()); + } + private: const T Start_; const TDiff Step_; diff --git a/util/generic/xrange_ut.cpp b/util/generic/xrange_ut.cpp index 8106da03e7..f8ba3c6f1f 100644 --- a/util/generic/xrange_ut.cpp +++ b/util/generic/xrange_ut.cpp @@ -3,7 +3,7 @@ #include "algorithm.h" #include "maybe.h" #include "vector.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/builder.h> Y_UNIT_TEST_SUITE(XRange) { @@ -78,40 +78,40 @@ Y_UNIT_TEST_SUITE(XRange) { } UNIT_ASSERT_VALUES_EQUAL(digSumByPtr, digSumExpected); } - + Y_UNIT_TEST(SizeMethodCheck) { - UNIT_ASSERT_VALUES_EQUAL(xrange(5).size(), 5); - UNIT_ASSERT_VALUES_EQUAL(xrange(0, 5, 2).size(), 3); - UNIT_ASSERT_VALUES_EQUAL(xrange(0, 6, 2).size(), 3); - } - + UNIT_ASSERT_VALUES_EQUAL(xrange(5).size(), 5); + UNIT_ASSERT_VALUES_EQUAL(xrange(0, 5, 2).size(), 3); + UNIT_ASSERT_VALUES_EQUAL(xrange(0, 6, 2).size(), 3); + } + class TVectorChild: public TVector<size_t> { - public: + public: template <typename TIterator> TVectorChild(TIterator a, TIterator b) : TVector<size_t>(a, b) { } - }; - + }; + Y_UNIT_TEST(ConvertionWorks) { TVector<size_t> data = {0, 1, 2, 3, 4, 5, 6, 7, 8}; - + TVector<size_t> convertionResults[] = {xrange<size_t>(9), xrange<ui32>(0, 9), xrange(0, 9, 1)}; - - for (const auto& arr : convertionResults) { - UNIT_ASSERT(arr == data); - } - - TVectorChild sons[] = {xrange(0, 9), + + for (const auto& arr : convertionResults) { + UNIT_ASSERT(arr == data); + } + + TVectorChild sons[] = {xrange(0, 9), xrange(0, 9, 1)}; - - for (const auto& arr : sons) { - UNIT_ASSERT(arr == data); - } - } + + for (const auto& arr : sons) { + UNIT_ASSERT(arr == data); + } + } template <class XRangeContainer> void TestEmptyRanges(const XRangeContainer& c) { diff --git a/util/generic/yexception_ut.cpp b/util/generic/yexception_ut.cpp index cb3e29fed8..3b3a66eb73 100644 --- a/util/generic/yexception_ut.cpp +++ b/util/generic/yexception_ut.cpp @@ -8,7 +8,7 @@ static inline void Throw2DontMove() { ythrow yexception() << 1 << " qw " << 12.1; // don't move this line } -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/memory/tempbuf.h> diff --git a/util/generic/ylimits_ut.cpp b/util/generic/ylimits_ut.cpp index f1b3c6858c..a77fb0c74c 100644 --- a/util/generic/ylimits_ut.cpp +++ b/util/generic/ylimits_ut.cpp @@ -1,7 +1,7 @@ #include "cast.h" #include "ylimits.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> #include <util/system/valgrind.h> diff --git a/util/generic/ymath_ut.cpp b/util/generic/ymath_ut.cpp index 29190b55eb..270ab5d1b1 100644 --- a/util/generic/ymath_ut.cpp +++ b/util/generic/ymath_ut.cpp @@ -1,7 +1,7 @@ #include "bitops.h" #include "ymath.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> #include <util/datetime/cputimer.h> diff --git a/util/memory/addstorage_ut.cpp b/util/memory/addstorage_ut.cpp index 9b0c4989ab..f9b66d10fc 100644 --- a/util/memory/addstorage_ut.cpp +++ b/util/memory/addstorage_ut.cpp @@ -1,6 +1,6 @@ #include "addstorage.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TAddStorageTest: public TTestBase { UNIT_TEST_SUITE(TAddStorageTest); diff --git a/util/memory/benchmark/pool/main.cpp b/util/memory/benchmark/pool/main.cpp index 0b4d6c94af..0ab611761c 100644 --- a/util/memory/benchmark/pool/main.cpp +++ b/util/memory/benchmark/pool/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/memory/pool.h> #include <util/generic/xrange.h> diff --git a/util/memory/blob.cpp b/util/memory/blob.cpp index 91da5cadca..341071e625 100644 --- a/util/memory/blob.cpp +++ b/util/memory/blob.cpp @@ -179,7 +179,7 @@ static inline TBlob CopyConstruct(const void* data, size_t len) { memcpy(base->Data(), data, len); TBlob ret(base->Data(), len, base.Get()); - Y_UNUSED(base.Release()); + Y_UNUSED(base.Release()); return ret; } @@ -201,7 +201,7 @@ static inline TBlob ConstructFromMap(const TMemoryMap& map, ui64 offset, size_t using TBase = TMappedBlobBase<TCounter>; THolder<TBase> base(new TBase(map, offset, length, mode)); TBlob ret(base->Data(), base->Length(), base.Get()); - Y_UNUSED(base.Release()); + Y_UNUSED(base.Release()); return ret; } @@ -310,7 +310,7 @@ static inline TBlob ReadFromFile(const TFile& file, ui64 offset, size_t length) file.Pload(base->Data(), length, offset); TBlob ret(base->Data(), length, base.Get()); - Y_UNUSED(base.Release()); + Y_UNUSED(base.Release()); return ret; } @@ -356,7 +356,7 @@ static inline TBlob ConstructFromBuffer(TBuffer& in) { THolder<TBase> base(new TBase(in)); TBlob ret(base->Buffer().Data(), base->Buffer().Size(), base.Get()); - Y_UNUSED(base.Release()); + Y_UNUSED(base.Release()); return ret; } @@ -396,7 +396,7 @@ TBlob ConstructFromString(S&& s) { auto base = MakeHolder<TBase>(std::forward<S>(s)); TBlob ret(base->String().data(), base->String().size(), base.Get()); - Y_UNUSED(base.Release()); + Y_UNUSED(base.Release()); return ret; } diff --git a/util/memory/blob_ut.cpp b/util/memory/blob_ut.cpp index 023f9a0487..1a82ca58db 100644 --- a/util/memory/blob_ut.cpp +++ b/util/memory/blob_ut.cpp @@ -1,6 +1,6 @@ #include "blob.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/tempfile.h> #include <util/folder/path.h> diff --git a/util/memory/pool_ut.cpp b/util/memory/pool_ut.cpp index 1158a8ca42..d3a0123166 100644 --- a/util/memory/pool_ut.cpp +++ b/util/memory/pool_ut.cpp @@ -1,6 +1,6 @@ #include "pool.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/util/memory/smallobj_ut.cpp b/util/memory/smallobj_ut.cpp index 86003d1d53..49483c498d 100644 --- a/util/memory/smallobj_ut.cpp +++ b/util/memory/smallobj_ut.cpp @@ -1,6 +1,6 @@ #include "smallobj.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> diff --git a/util/memory/tempbuf.h b/util/memory/tempbuf.h index 334670eb1e..ad66fee283 100644 --- a/util/memory/tempbuf.h +++ b/util/memory/tempbuf.h @@ -26,26 +26,26 @@ public: TTempBuf& operator=(TTempBuf&& b) noexcept; Y_PURE_FUNCTION char* Data() noexcept; - + Y_PURE_FUNCTION const char* Data() const noexcept; - + Y_PURE_FUNCTION char* Current() noexcept; - + Y_PURE_FUNCTION const char* Current() const noexcept; - + Y_PURE_FUNCTION size_t Size() const noexcept; - + Y_PURE_FUNCTION size_t Filled() const noexcept; - + Y_PURE_FUNCTION size_t Left() const noexcept; - + void Reset() noexcept; void SetPos(size_t off); char* Proceed(size_t off); void Append(const void* data, size_t len); Y_PURE_FUNCTION bool IsNull() const noexcept; - + private: TIntrusivePtr<TImpl> Impl_; }; diff --git a/util/memory/tempbuf_ut.cpp b/util/memory/tempbuf_ut.cpp index d6bcf9d546..9a37eadd55 100644 --- a/util/memory/tempbuf_ut.cpp +++ b/util/memory/tempbuf_ut.cpp @@ -2,7 +2,7 @@ #include <utility> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TTempBufTest: public TTestBase { UNIT_TEST_SUITE(TTempBufTest); diff --git a/util/network/address_ut.cpp b/util/network/address_ut.cpp index 28f45172ff..bf0a988f2d 100644 --- a/util/network/address_ut.cpp +++ b/util/network/address_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "address.h" diff --git a/util/network/endpoint_ut.cpp b/util/network/endpoint_ut.cpp index d5e40dd6e1..216f8cb071 100644 --- a/util/network/endpoint_ut.cpp +++ b/util/network/endpoint_ut.cpp @@ -1,6 +1,6 @@ #include "endpoint.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> #include <util/generic/strbuf.h> diff --git a/util/network/ip_ut.cpp b/util/network/ip_ut.cpp index 6716c6a699..c04063c910 100644 --- a/util/network/ip_ut.cpp +++ b/util/network/ip_ut.cpp @@ -1,6 +1,6 @@ #include "ip.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/yexception.h> diff --git a/util/network/poller_ut.cpp b/util/network/poller_ut.cpp index 6df0dda8ec..fe03dfc7c1 100644 --- a/util/network/poller_ut.cpp +++ b/util/network/poller_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/error.h> #include "pair.h" diff --git a/util/network/sock_ut.cpp b/util/network/sock_ut.cpp index fd8c783747..af5542185f 100644 --- a/util/network/sock_ut.cpp +++ b/util/network/sock_ut.cpp @@ -1,7 +1,7 @@ #include "sock.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/threading/future/legacy_future.h> #include <util/system/fs.h> diff --git a/util/network/socket_ut.cpp b/util/network/socket_ut.cpp index 6b20e11f70..60650a2680 100644 --- a/util/network/socket_ut.cpp +++ b/util/network/socket_ut.cpp @@ -2,7 +2,7 @@ #include "pair.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/builder.h> #include <util/generic/vector.h> diff --git a/util/network/ut/ya.make b/util/network/ut/ya.make index 1ba03e167c..71357d4b7d 100644 --- a/util/network/ut/ya.make +++ b/util/network/ut/ya.make @@ -6,7 +6,7 @@ OWNER(g:util) SUBSCRIBER(g:util-subscribers) PEERDIR( - library/cpp/threading/future + library/cpp/threading/future ) SRCS( diff --git a/util/random/benchmark/prng/main.cpp b/util/random/benchmark/prng/main.cpp index 2c6279ff71..2b3ebcaa2e 100644 --- a/util/random/benchmark/prng/main.cpp +++ b/util/random/benchmark/prng/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/random/entropy.h> #include <util/random/fast.h> diff --git a/util/random/common_ops_ut.cpp b/util/random/common_ops_ut.cpp index 905912bd1e..22ca1ce8eb 100644 --- a/util/random/common_ops_ut.cpp +++ b/util/random/common_ops_ut.cpp @@ -1,7 +1,7 @@ #include "common_ops.h" #include "random.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/digest/numeric.h> diff --git a/util/random/easy_ut.cpp b/util/random/easy_ut.cpp index d1d024a91f..1857e6c747 100644 --- a/util/random/easy_ut.cpp +++ b/util/random/easy_ut.cpp @@ -1,6 +1,6 @@ #include "easy.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TEasyRndInterface) { Y_UNIT_TEST(Test1) { diff --git a/util/random/entropy_ut.cpp b/util/random/entropy_ut.cpp index 1ff27203f0..cf0a0512f0 100644 --- a/util/random/entropy_ut.cpp +++ b/util/random/entropy_ut.cpp @@ -1,6 +1,6 @@ #include "entropy.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestEntropy) { Y_UNIT_TEST(TestSeed) { diff --git a/util/random/fast_ut.cpp b/util/random/fast_ut.cpp index 60994a98b0..4e110aea0b 100644 --- a/util/random/fast_ut.cpp +++ b/util/random/fast_ut.cpp @@ -1,6 +1,6 @@ #include "fast.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TTestFastRng) { Y_UNIT_TEST(Test1) { diff --git a/util/random/mersenne_ut.cpp b/util/random/mersenne_ut.cpp index a4b84efa3d..774a5f7fa8 100644 --- a/util/random/mersenne_ut.cpp +++ b/util/random/mersenne_ut.cpp @@ -1,6 +1,6 @@ #include "mersenne.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/util/random/normal_ut.cpp b/util/random/normal_ut.cpp index 42b6cc4ba2..e690bff845 100644 --- a/util/random/normal_ut.cpp +++ b/util/random/normal_ut.cpp @@ -1,7 +1,7 @@ #include "normal.h" #include "fast.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> diff --git a/util/random/random_ut.cpp b/util/random/random_ut.cpp index 30427676f3..4b9f1b1101 100644 --- a/util/random/random_ut.cpp +++ b/util/random/random_ut.cpp @@ -1,6 +1,6 @@ #include "random.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> diff --git a/util/random/shuffle_ut.cpp b/util/random/shuffle_ut.cpp index 87cbae94c0..3bb437ab44 100644 --- a/util/random/shuffle_ut.cpp +++ b/util/random/shuffle_ut.cpp @@ -2,7 +2,7 @@ #include "shuffle.h" #include "mersenne.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> diff --git a/util/str_stl.h b/util/str_stl.h index f1e137181d..a01d07716e 100644 --- a/util/str_stl.h +++ b/util/str_stl.h @@ -84,14 +84,14 @@ template <> struct hash<TString>: ::NHashPrivate::TStringHash<char> { }; -template <> +template <> struct hash<TUtf16String>: ::NHashPrivate::TStringHash<wchar16> { -}; - +}; + template <> struct THash<TWtringBuf>: ::NHashPrivate::TStringHash<wchar16> { }; - + template <> struct hash<TUtf32String>: ::NHashPrivate::TStringHash<wchar32> { }; @@ -194,11 +194,11 @@ struct TEqualTo<TUtf16String>: public TEqualTo<TWtringBuf> { using is_transparent = void; }; -template <> +template <> struct TEqualTo<TUtf32String>: public TEqualTo<TUtf32StringBuf> { - using is_transparent = void; -}; - + using is_transparent = void; +}; + template <class TFirst, class TSecond> struct TEqualTo<std::pair<TFirst, TSecond>> { template <class TOther> @@ -247,11 +247,11 @@ struct TLess<TUtf16String>: public TLess<TWtringBuf> { using is_transparent = void; }; -template <> +template <> struct TLess<TUtf32String>: public TLess<TUtf32StringBuf> { - using is_transparent = void; -}; - + using is_transparent = void; +}; + template <class T> struct TGreater: public std::greater<T> { }; @@ -265,8 +265,8 @@ template <> struct TGreater<TUtf16String>: public TGreater<TWtringBuf> { using is_transparent = void; }; - -template <> + +template <> struct TGreater<TUtf32String>: public TGreater<TUtf32StringBuf> { - using is_transparent = void; -}; + using is_transparent = void; +}; diff --git a/util/stream/aligned_ut.cpp b/util/stream/aligned_ut.cpp index e980d05cf7..4f0e19d07b 100644 --- a/util/stream/aligned_ut.cpp +++ b/util/stream/aligned_ut.cpp @@ -1,6 +1,6 @@ #include "aligned.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TNastyInputStream: public IInputStream { public: diff --git a/util/stream/buffer_ut.cpp b/util/stream/buffer_ut.cpp index 3494696190..22c05e77e1 100644 --- a/util/stream/buffer_ut.cpp +++ b/util/stream/buffer_ut.cpp @@ -1,6 +1,6 @@ #include "buffer.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/buffer.h> diff --git a/util/stream/buffered_ut.cpp b/util/stream/buffered_ut.cpp index 41d2fc3030..d091a23648 100644 --- a/util/stream/buffered_ut.cpp +++ b/util/stream/buffered_ut.cpp @@ -1,6 +1,6 @@ #include "buffered.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/random/mersenne.h> diff --git a/util/stream/direct_io_ut.cpp b/util/stream/direct_io_ut.cpp index 01d09db232..6c23d6c5f3 100644 --- a/util/stream/direct_io_ut.cpp +++ b/util/stream/direct_io_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/generic/array_size.h> diff --git a/util/stream/file_ut.cpp b/util/stream/file_ut.cpp index ac0f09796e..84de4e9a05 100644 --- a/util/stream/file_ut.cpp +++ b/util/stream/file_ut.cpp @@ -1,6 +1,6 @@ #include "file.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/tempfile.h> diff --git a/util/stream/format.cpp b/util/stream/format.cpp index 3996130df5..eafdd20f81 100644 --- a/util/stream/format.cpp +++ b/util/stream/format.cpp @@ -4,13 +4,13 @@ #include <util/generic/ymath.h> #include <util/string/cast.h> -namespace NFormatPrivate { - static inline i64 Round(double value) { - double res1 = floor(value); - double res2 = ceil(value); +namespace NFormatPrivate { + static inline i64 Round(double value) { + double res1 = floor(value); + double res2 = ceil(value); return (value - res1 < res2 - value) ? (i64)res1 : (i64)res2; - } - + } + static inline IOutputStream& PrintDoubleShortly(IOutputStream& os, const double& d) { // General case: request 3 significant digits // Side-effect: allows exponential representation @@ -33,95 +33,95 @@ namespace NFormatPrivate { } return os << Prec(d, mode, ndigits); - } + } } - + template <> void Out<NFormatPrivate::THumanReadableSize>(IOutputStream& stream, const NFormatPrivate::THumanReadableSize& value) { ui64 base = value.Format == SF_BYTES ? 1024 : 1000; ui64 base2 = base * base; ui64 base3 = base * base2; ui64 base4 = base * base3; - - double v = value.Value; - if (v < 0) { - stream << "-"; - v = -v; - } - - if (v < base) { - NFormatPrivate::PrintDoubleShortly(stream, v); + + double v = value.Value; + if (v < 0) { + stream << "-"; + v = -v; + } + + if (v < base) { + NFormatPrivate::PrintDoubleShortly(stream, v); } else if (v < base2) { - NFormatPrivate::PrintDoubleShortly(stream, v / (double)base) << 'K'; + NFormatPrivate::PrintDoubleShortly(stream, v / (double)base) << 'K'; } else if (v < base3) { - NFormatPrivate::PrintDoubleShortly(stream, v / (double)base2) << 'M'; + NFormatPrivate::PrintDoubleShortly(stream, v / (double)base2) << 'M'; } else if (v < base4) { - NFormatPrivate::PrintDoubleShortly(stream, v / (double)base3) << 'G'; - } else { - NFormatPrivate::PrintDoubleShortly(stream, v / (double)base4) << 'T'; - } - + NFormatPrivate::PrintDoubleShortly(stream, v / (double)base3) << 'G'; + } else { + NFormatPrivate::PrintDoubleShortly(stream, v / (double)base4) << 'T'; + } + if (value.Format == SF_BYTES) { - if (v < base) { + if (v < base) { stream << "B"; } else { stream << "iB"; } } -} - +} + template <> void Out<NFormatPrivate::THumanReadableDuration>(IOutputStream& os, const NFormatPrivate::THumanReadableDuration& hr) { - TTempBuf buf; - TMemoryOutput ss(buf.Data(), buf.Size()); - - do { - ui64 microSeconds = hr.Value.MicroSeconds(); - if (microSeconds < 1000) { - ss << microSeconds << "us"; - break; - } - if (microSeconds < 1000 * 1000) { + TTempBuf buf; + TMemoryOutput ss(buf.Data(), buf.Size()); + + do { + ui64 microSeconds = hr.Value.MicroSeconds(); + if (microSeconds < 1000) { + ss << microSeconds << "us"; + break; + } + if (microSeconds < 1000 * 1000) { NFormatPrivate::PrintDoubleShortly(ss, (double)microSeconds / 1000.0) << "ms"; - break; - } - + break; + } + double seconds = (double)(hr.Value.MilliSeconds()) / 1000.0; - if (seconds < 60) { - NFormatPrivate::PrintDoubleShortly(ss, seconds) << 's'; - break; - } - - ui64 s = NFormatPrivate::Round(seconds * 1000 + 0.5) / 1000; - - ui64 m = s / 60; - s = s % 60; - - ui64 h = m / 60; - m = m % 60; - - ui64 d = h / 24; - h = h % 24; - - ui64 times[] = {d, h, m, s}; - char names[] = {'d', 'h', 'm', 's'}; - bool first = true; - + if (seconds < 60) { + NFormatPrivate::PrintDoubleShortly(ss, seconds) << 's'; + break; + } + + ui64 s = NFormatPrivate::Round(seconds * 1000 + 0.5) / 1000; + + ui64 m = s / 60; + s = s % 60; + + ui64 h = m / 60; + m = m % 60; + + ui64 d = h / 24; + h = h % 24; + + ui64 times[] = {d, h, m, s}; + char names[] = {'d', 'h', 'm', 's'}; + bool first = true; + for (size_t i = 0; i < Y_ARRAY_SIZE(times); ++i) { - if (times[i] > 0) { + if (times[i] > 0) { if (!first) { - ss << ' '; + ss << ' '; } - ss << times[i] << names[i]; - first = false; - } - } - } while (false); - - size_t written = buf.Size() - ss.Avail(); - os.Write(buf.Data(), written); -} - + ss << times[i] << names[i]; + first = false; + } + } + } while (false); + + size_t written = buf.Size() - ss.Avail(); + os.Write(buf.Data(), written); +} + void Time(IOutputStream& l) { l << millisec(); } diff --git a/util/stream/format.h b/util/stream/format.h index b033208a1b..031559a424 100644 --- a/util/stream/format.h +++ b/util/stream/format.h @@ -3,10 +3,10 @@ #include "mem.h" #include "output.h" -#include <util/datetime/base.h> -#include <util/generic/strbuf.h> +#include <util/datetime/base.h> +#include <util/generic/strbuf.h> #include <util/generic/flags.h> -#include <util/memory/tempbuf.h> +#include <util/memory/tempbuf.h> #include <util/string/cast.h> enum ENumberFormatFlag { @@ -131,27 +131,27 @@ namespace NFormatPrivate { stream << str; return stream; } - + template <typename Char, size_t Base> struct TBaseText { TBasicStringBuf<Char> Text; - + inline TBaseText(const TBasicStringBuf<Char> text) - : Text(text) + : Text(text) { } - }; - + }; + template <typename Char, size_t Base> IOutputStream& operator<<(IOutputStream& os, const TBaseText<Char, Base>& text) { for (size_t i = 0; i < text.Text.size(); ++i) { - if (i != 0) { - os << ' '; - } + if (i != 0) { + os << ' '; + } os << TUnsignedBaseNumber<Char, Base>(text.Text[i], HF_FULL); - } - return os; - } + } + return os; + } template <typename T> struct TFloatPrecision { @@ -170,20 +170,20 @@ namespace NFormatPrivate { o << TStringBuf(buf, count); return o; } - - struct THumanReadableDuration { - TDuration Value; - + + struct THumanReadableDuration { + TDuration Value; + constexpr THumanReadableDuration(const TDuration& value) - : Value(value) + : Value(value) { } - }; - - struct THumanReadableSize { - double Value; + }; + + struct THumanReadableSize { + double Value; ESizeFormat Format; - }; + }; } /** @@ -280,7 +280,7 @@ static constexpr ::NFormatPrivate::TBaseNumber<T, 16> SHex(const T& value, const return {value, flags}; } -/** +/** * Output manipulator similar to `std::setbase(2)`. * * When written into a `IOutputStream`, writes out the provided value in @@ -335,12 +335,12 @@ static constexpr ::NFormatPrivate::TBaseNumber<T, 2> SBin(const T& value, const * * @param value String to output. */ -template <typename TChar> +template <typename TChar> static inline ::NFormatPrivate::TBaseText<TChar, 16> HexText(const TBasicStringBuf<TChar> value) { return ::NFormatPrivate::TBaseText<TChar, 16>(value); -} - -/** +} + +/** * Output manipulator for binary string output. * * When written into a `IOutputStream`, writes out the provided characters @@ -373,10 +373,10 @@ static inline ::NFormatPrivate::TBaseText<TChar, 2> BinText(const TBasicStringBu * @param value Value to output. */ static constexpr ::NFormatPrivate::THumanReadableDuration HumanReadable(const TDuration duration) noexcept { - return ::NFormatPrivate::THumanReadableDuration(duration); -} - -/** + return ::NFormatPrivate::THumanReadableDuration(duration); +} + +/** * Output manipulator for writing out human-readable number of elements / memory * amount in `ls -h` style. * @@ -388,22 +388,22 @@ static constexpr ::NFormatPrivate::THumanReadableDuration HumanReadable(const TD * * Example usage: * @code - * stream << HumanReadableSize(1024, SF_QUANTITY); // Will output "1.02K" - * stream << HumanReadableSize(1024, SF_BYTES); // Will output "1KiB" - * stream << "average usage " << HumanReadableSize(100 / 3., SF_BYTES); // Will output "average usage "33.3B"" + * stream << HumanReadableSize(1024, SF_QUANTITY); // Will output "1.02K" + * stream << HumanReadableSize(1024, SF_BYTES); // Will output "1KiB" + * stream << "average usage " << HumanReadableSize(100 / 3., SF_BYTES); // Will output "average usage "33.3B"" * @endcode * * @param value Value to output. * @param format Format to use. */ -static constexpr ::NFormatPrivate::THumanReadableSize HumanReadableSize(const double size, ESizeFormat format) noexcept { +static constexpr ::NFormatPrivate::THumanReadableSize HumanReadableSize(const double size, ESizeFormat format) noexcept { return {size, format}; -} - +} + void Time(IOutputStream& l); void TimeHumanReadable(IOutputStream& l); -/** +/** * Output manipulator for adjusting precision of floating point values. * * When written into a `IOutputStream`, writes out the provided floating point @@ -424,7 +424,7 @@ static constexpr ::NFormatPrivate::TFloatPrecision<T> Prec(const T& value, const return {value, mode, ndigits}; } -/** +/** * Output manipulator for adjusting precision of floating point values. * * When written into a `IOutputStream`, writes out the provided floating point diff --git a/util/stream/format_ut.cpp b/util/stream/format_ut.cpp index 43245aeb48..b650a4f57f 100644 --- a/util/stream/format_ut.cpp +++ b/util/stream/format_ut.cpp @@ -1,7 +1,7 @@ #include "format.h" -#include <library/cpp/testing/unittest/registar.h> -#include <util/charset/wide.h> +#include <library/cpp/testing/unittest/registar.h> +#include <util/charset/wide.h> Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { Y_UNIT_TEST(TestLeftPad) { @@ -45,20 +45,20 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { (*ss) << Hex(*ii); UNIT_ASSERT_VALUES_EQUAL("0x01234567", ss->Str()); } - + Y_UNIT_TEST(TestHexText) { - { - TStringStream ss; + { + TStringStream ss; ss << HexText(TStringBuf("abcи")); - UNIT_ASSERT_VALUES_EQUAL("61 62 63 D0 B8", ss.Str()); - } - { - TStringStream ss; + UNIT_ASSERT_VALUES_EQUAL("61 62 63 D0 B8", ss.Str()); + } + { + TStringStream ss; TUtf16String w = UTF8ToWide("abcи"); - ss << HexText<wchar16>(w); - UNIT_ASSERT_VALUES_EQUAL("0061 0062 0063 0438", ss.Str()); - } - } + ss << HexText<wchar16>(w); + UNIT_ASSERT_VALUES_EQUAL("0061 0062 0063 0438", ss.Str()); + } + } Y_UNIT_TEST(TestBin) { UNIT_ASSERT_VALUES_EQUAL(ToString(Bin(static_cast<ui32>(2), nullptr)), "10"); @@ -94,7 +94,7 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { ss << Prec(1.2345678901234567, PREC_POINT_DIGITS, 3); UNIT_ASSERT_VALUES_EQUAL("1.235", ss.Str()); } - + Y_UNIT_TEST(TestHumanReadableSize1000) { UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(0, SF_QUANTITY)), "0"); @@ -109,8 +109,8 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1234567, SF_QUANTITY)), "-1.23M"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-12345678, SF_QUANTITY)), "-12.3M"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-12345678 * 1000ll, SF_QUANTITY)), "-12.3G"); - } - + } + Y_UNIT_TEST(TestHumanReadableSize1024) { UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(0, SF_BYTES)), "0B"); @@ -123,7 +123,7 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(5 * 1024 * 1024, SF_BYTES)), "5MiB"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(1236 * 1024 * 1024, SF_BYTES)), "1.21GiB"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(1024ull * 1024 * 1024 * 1024, SF_BYTES)), "1TiB"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(100 / 3., SF_BYTES)), "33.3B"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(100 / 3., SF_BYTES)), "33.3B"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-100, SF_BYTES)), "-100B"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1024, SF_BYTES)), "-1KiB"); @@ -134,7 +134,7 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-5 * 1024 * 1024, SF_BYTES)), "-5MiB"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1236 * 1024 * 1024, SF_BYTES)), "-1.21GiB"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1024ll * 1024 * 1024 * 1024, SF_BYTES)), "-1TiB"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-100 / 3., SF_BYTES)), "-33.3B"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-100 / 3., SF_BYTES)), "-33.3B"); // XXX: For 1000 <= x < 1024, Prec(x, 3) falls back to exponential form @@ -159,24 +159,24 @@ Y_UNIT_TEST_SUITE(TOutputStreamFormattingTest) { UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1010ll * 1024 * 1024 * 1024, SF_BYTES)), "-1010GiB"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1000ll * 1024 * 1024 * 1024 * 1024, SF_BYTES)), "-1000TiB"); UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadableSize(-1010ll * 1024 * 1024 * 1024 * 1024, SF_BYTES)), "-1010TiB"); - } - + } + Y_UNIT_TEST(TestHumanReadableDuration) { - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(0))), "0us"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(1))), "1us"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(100))), "100us"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(1234))), "1.23ms"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(12345))), "12.3ms"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(1234567))), "1.23s"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(5))), "5s"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(59.9))), "59.9s"); - - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(60))), "1m"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(61))), "1m 1s"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(72))), "1m 12s"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(620))), "10m 20s"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(3600))), "1h"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(3672))), "1h 1m 12s"); - UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(4220))), "1h 10m 20s"); - } + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(0))), "0us"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(1))), "1us"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(100))), "100us"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(1234))), "1.23ms"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(12345))), "12.3ms"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::MicroSeconds(1234567))), "1.23s"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(5))), "5s"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(59.9))), "59.9s"); + + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(60))), "1m"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(61))), "1m 1s"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(72))), "1m 12s"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(620))), "10m 20s"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(3600))), "1h"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(3672))), "1h 1m 12s"); + UNIT_ASSERT_VALUES_EQUAL(ToString(HumanReadable(TDuration::Seconds(4220))), "1h 10m 20s"); + } } diff --git a/util/stream/hex_ut.cpp b/util/stream/hex_ut.cpp index 5074a0b616..f4c29a2c90 100644 --- a/util/stream/hex_ut.cpp +++ b/util/stream/hex_ut.cpp @@ -1,6 +1,6 @@ #include "hex.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "str.h" Y_UNIT_TEST_SUITE(THexCodingTest) { diff --git a/util/stream/input_ut.cpp b/util/stream/input_ut.cpp index 4a93f5458e..fd45827407 100644 --- a/util/stream/input_ut.cpp +++ b/util/stream/input_ut.cpp @@ -1,7 +1,7 @@ #include "input.h" #include "output.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/file.h> #include <util/system/yassert.h> diff --git a/util/stream/ios_ut.cpp b/util/stream/ios_ut.cpp index 139f4296e5..51ab9a5735 100644 --- a/util/stream/ios_ut.cpp +++ b/util/stream/ios_ut.cpp @@ -4,7 +4,7 @@ #include "buffered.h" #include "walk.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/cast.h> #include <util/memory/tempbuf.h> diff --git a/util/stream/labeled_ut.cpp b/util/stream/labeled_ut.cpp index 12d0dc5004..da3b99fdba 100644 --- a/util/stream/labeled_ut.cpp +++ b/util/stream/labeled_ut.cpp @@ -1,6 +1,6 @@ #include "str.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TLabeledOutputTest) { Y_UNIT_TEST(TBasicTest) { diff --git a/util/stream/length_ut.cpp b/util/stream/length_ut.cpp index 8968448954..5a21ca1630 100644 --- a/util/stream/length_ut.cpp +++ b/util/stream/length_ut.cpp @@ -1,6 +1,6 @@ #include "length.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/util/stream/mem_ut.cpp b/util/stream/mem_ut.cpp index f388ae66ac..5042ee55f5 100644 --- a/util/stream/mem_ut.cpp +++ b/util/stream/mem_ut.cpp @@ -1,6 +1,6 @@ #include "mem.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestMemIO) { Y_UNIT_TEST(TestReadTo) { diff --git a/util/stream/multi_ut.cpp b/util/stream/multi_ut.cpp index fc2553b533..ef67d30861 100644 --- a/util/stream/multi_ut.cpp +++ b/util/stream/multi_ut.cpp @@ -1,7 +1,7 @@ #include "mem.h" #include "multi.h" #include "str.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestMultiInput) { struct TTestCase { diff --git a/util/stream/output.cpp b/util/stream/output.cpp index db81b81b70..8faaca2b32 100644 --- a/util/stream/output.cpp +++ b/util/stream/output.cpp @@ -79,16 +79,16 @@ static void WriteString(IOutputStream& o, const wchar16* w, size_t n) { o.Write(data, written); } -static void WriteString(IOutputStream& o, const wchar32* w, size_t n) { +static void WriteString(IOutputStream& o, const wchar32* w, size_t n) { const size_t buflen = (n * MAX_UTF8_BYTES); // * 4 because the conversion functions can convert unicode character into maximum 4 bytes of UTF8 - TTempBuf buffer(buflen + 1); - char* const data = buffer.Data(); - size_t written = 0; - WideToUTF8(w, n, data, written); - data[written] = 0; - o.Write(data, written); -} - + TTempBuf buffer(buflen + 1); + char* const data = buffer.Data(); + size_t written = 0; + WideToUTF8(w, n, data, written); + data[written] = 0; + o.Write(data, written); +} + template <> void Out<TString>(IOutputStream& o, const TString& p) { o.Write(p.data(), p.size()); @@ -139,24 +139,24 @@ void Out<const wchar16*>(IOutputStream& o, const wchar16* w) { } template <> -void Out<const wchar32*>(IOutputStream& o, const wchar32* w) { - if (w) { +void Out<const wchar32*>(IOutputStream& o, const wchar32* w) { + if (w) { WriteString(o, w, std::char_traits<wchar32>::length(w)); - } else { - o.Write("(null)"); - } -} - -template <> + } else { + o.Write("(null)"); + } +} + +template <> void Out<TUtf16String>(IOutputStream& o, const TUtf16String& w) { WriteString(o, w.c_str(), w.size()); } -template <> -void Out<TUtf32String>(IOutputStream& o, const TUtf32String& w) { - WriteString(o, w.c_str(), w.size()); -} - +template <> +void Out<TUtf32String>(IOutputStream& o, const TUtf32String& w) { + WriteString(o, w.c_str(), w.size()); +} + #define DEF_CONV_DEFAULT(type) \ template <> \ void Out<type>(IOutputStream & o, type p) { \ @@ -221,12 +221,12 @@ void Out<TBasicCharRef<TUtf16String>>(IOutputStream& o, const TBasicCharRef<TUtf } template <> -void Out<TBasicCharRef<TUtf32String>>(IOutputStream& o, const TBasicCharRef<TUtf32String>& c) { - o << static_cast<wchar32>(c); -} +void Out<TBasicCharRef<TUtf32String>>(IOutputStream& o, const TBasicCharRef<TUtf32String>& c) { + o << static_cast<wchar32>(c); +} #endif - -template <> + +template <> void Out<const void*>(IOutputStream& o, const void* t) { o << Hex(size_t(t)); } diff --git a/util/stream/output.h b/util/stream/output.h index 00eef50b95..a5d992206d 100644 --- a/util/stream/output.h +++ b/util/stream/output.h @@ -45,7 +45,7 @@ public: inline ~TPart() = default; static inline TPart CrLf() noexcept { - return TPart("\r\n", 2); + return TPart("\r\n", 2); } const void* buf; @@ -204,9 +204,9 @@ inline void Out<const char*>(IOutputStream& o, const char* t) { template <> void Out<const wchar16*>(IOutputStream& o, const wchar16* w); -template <> -void Out<const wchar32*>(IOutputStream& o, const wchar32* w); - +template <> +void Out<const wchar32*>(IOutputStream& o, const wchar32* w); + static inline IOutputStream& operator<<(IOutputStream& o, TStreamManipulator m) { m(o); @@ -249,16 +249,16 @@ static inline IOutputStream& operator<<(IOutputStream& o, wchar16* t) { return o; } -static inline IOutputStream& operator<<(IOutputStream& o, const wchar32* t) { - Out<const wchar32*>(o, t); - return o; -} - -static inline IOutputStream& operator<<(IOutputStream& o, wchar32* t) { - Out<const wchar32*>(o, t); - return o; -} - +static inline IOutputStream& operator<<(IOutputStream& o, const wchar32* t) { + Out<const wchar32*>(o, t); + return o; +} + +static inline IOutputStream& operator<<(IOutputStream& o, wchar32* t) { + Out<const wchar32*>(o, t); + return o; +} + namespace NPrivate { IOutputStream& StdOutStream() noexcept; IOutputStream& StdErrStream() noexcept; diff --git a/util/stream/printf_ut.cpp b/util/stream/printf_ut.cpp index 0eab167062..a364194a76 100644 --- a/util/stream/printf_ut.cpp +++ b/util/stream/printf_ut.cpp @@ -4,7 +4,7 @@ #include <util/generic/string.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TStreamPrintfTest) { Y_UNIT_TEST(TestPrintf) { diff --git a/util/stream/str.h b/util/stream/str.h index 028bd572c0..03c7003820 100644 --- a/util/stream/str.h +++ b/util/stream/str.h @@ -79,7 +79,7 @@ public: } TStringOutput(TStringOutput&& s) noexcept = default; - + ~TStringOutput() override; /** diff --git a/util/stream/str_ut.cpp b/util/stream/str_ut.cpp index fc6b46c31a..ca770770b9 100644 --- a/util/stream/str_ut.cpp +++ b/util/stream/str_ut.cpp @@ -1,6 +1,6 @@ #include "str.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/typetraits.h> template <typename T> @@ -136,17 +136,17 @@ Y_UNIT_TEST_SUITE(TStringInputOutputTest) { UNIT_ASSERT_STRINGS_EQUAL(str, "1234567890"); } - - Y_UNIT_TEST(MoveConstructor) { - TString str; - TStringOutput output1(str); - output1 << "foo"; - - TStringOutput output2 = std::move(output1); - output2 << "bar"; - UNIT_ASSERT_STRINGS_EQUAL(str, "foobar"); - - // Check old stream is in a valid state - output1 << "baz"; - } + + Y_UNIT_TEST(MoveConstructor) { + TString str; + TStringOutput output1(str); + output1 << "foo"; + + TStringOutput output2 = std::move(output1); + output2 << "bar"; + UNIT_ASSERT_STRINGS_EQUAL(str, "foobar"); + + // Check old stream is in a valid state + output1 << "baz"; + } } diff --git a/util/stream/tokenizer_ut.cpp b/util/stream/tokenizer_ut.cpp index afc566da86..1d0de89b12 100644 --- a/util/stream/tokenizer_ut.cpp +++ b/util/stream/tokenizer_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/array_size.h> #include <util/generic/strbuf.h> diff --git a/util/stream/walk_ut.cpp b/util/stream/walk_ut.cpp index e0a783799f..30a0c7c59e 100644 --- a/util/stream/walk_ut.cpp +++ b/util/stream/walk_ut.cpp @@ -1,6 +1,6 @@ #include "walk.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TStringListInput: public IWalkInput { public: diff --git a/util/stream/zerocopy_output_ut.cpp b/util/stream/zerocopy_output_ut.cpp index e81f7fb056..81474adf84 100644 --- a/util/stream/zerocopy_output_ut.cpp +++ b/util/stream/zerocopy_output_ut.cpp @@ -1,6 +1,6 @@ #include "zerocopy_output.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/util/stream/zlib_ut.cpp b/util/stream/zlib_ut.cpp index 2290b4a9de..e093b9df79 100644 --- a/util/stream/zlib_ut.cpp +++ b/util/stream/zlib_ut.cpp @@ -1,6 +1,6 @@ #include "zlib.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "file.h" #include <util/system/tempfile.h> diff --git a/util/string/ascii_ut.cpp b/util/string/ascii_ut.cpp index 89069fee50..2da5b47219 100644 --- a/util/string/ascii_ut.cpp +++ b/util/string/ascii_ut.cpp @@ -1,7 +1,7 @@ #include "ascii.h" #include <ctype.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TAsciiTest) { Y_UNIT_TEST(TestAscii) { diff --git a/util/string/benchmark/ascii/main.cpp b/util/string/benchmark/ascii/main.cpp index 673047025d..a1036a01f7 100644 --- a/util/string/benchmark/ascii/main.cpp +++ b/util/string/benchmark/ascii/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/xrange.h> #include <util/string/ascii.h> diff --git a/util/string/benchmark/cast/main.cpp b/util/string/benchmark/cast/main.cpp index f604712ab6..652af83901 100644 --- a/util/string/benchmark/cast/main.cpp +++ b/util/string/benchmark/cast/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/string/cast.h> #include <util/generic/xrange.h> diff --git a/util/string/benchmark/float_to_string/main.cpp b/util/string/benchmark/float_to_string/main.cpp index 1c7c0684a3..c13ca55ac3 100644 --- a/util/string/benchmark/float_to_string/main.cpp +++ b/util/string/benchmark/float_to_string/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/singleton.h> #include <util/generic/vector.h> diff --git a/util/string/benchmark/join/main.cpp b/util/string/benchmark/join/main.cpp index 1a8633d3a8..ba5653813c 100644 --- a/util/string/benchmark/join/main.cpp +++ b/util/string/benchmark/join/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/function.h> #include <util/generic/singleton.h> diff --git a/util/string/benchmark/subst_global/main.cpp b/util/string/benchmark/subst_global/main.cpp index e0decfa042..aa26383b39 100644 --- a/util/string/benchmark/subst_global/main.cpp +++ b/util/string/benchmark/subst_global/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/generic/cast.h> #include <util/generic/singleton.h> diff --git a/util/string/builder_ut.cpp b/util/string/builder_ut.cpp index 22def683ec..5c1f24a7e4 100644 --- a/util/string/builder_ut.cpp +++ b/util/string/builder_ut.cpp @@ -1,6 +1,6 @@ #include "builder.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static void TestEquals(const TString& expected, const TString& actual) { UNIT_ASSERT_VALUES_EQUAL(expected, actual); diff --git a/util/string/cast_ut.cpp b/util/string/cast_ut.cpp index 033450c38c..c7a802ba06 100644 --- a/util/string/cast_ut.cpp +++ b/util/string/cast_ut.cpp @@ -1,6 +1,6 @@ #include "cast.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/wide.h> #include <util/system/defaults.h> diff --git a/util/string/escape_ut.cpp b/util/string/escape_ut.cpp index cd38ecffd3..366b6688dc 100644 --- a/util/string/escape_ut.cpp +++ b/util/string/escape_ut.cpp @@ -1,6 +1,6 @@ #include "escape.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/charset/wide.h> diff --git a/util/string/hex_ut.cpp b/util/string/hex_ut.cpp index 39a83d5e62..f4e8ba5bb0 100644 --- a/util/string/hex_ut.cpp +++ b/util/string/hex_ut.cpp @@ -1,6 +1,6 @@ #include "hex.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(THexCodingTest) { Y_UNIT_TEST(TestEncode) { diff --git a/util/string/join_ut.cpp b/util/string/join_ut.cpp index 3ed2b2459c..5f27e6b9ac 100644 --- a/util/string/join_ut.cpp +++ b/util/string/join_ut.cpp @@ -1,6 +1,6 @@ #include "join.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/stream/output.h> diff --git a/util/string/printf_ut.cpp b/util/string/printf_ut.cpp index 2b2f980b70..e82db07a8d 100644 --- a/util/string/printf_ut.cpp +++ b/util/string/printf_ut.cpp @@ -1,6 +1,6 @@ #include "printf.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TStringPrintf) { Y_UNIT_TEST(TestSprintf) { diff --git a/util/string/split_ut.cpp b/util/string/split_ut.cpp index 43e59f2d75..dc57ebf2d8 100644 --- a/util/string/split_ut.cpp +++ b/util/string/split_ut.cpp @@ -1,6 +1,6 @@ #include "split.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> #include <util/charset/wide.h> diff --git a/util/string/strip_ut.cpp b/util/string/strip_ut.cpp index d1029d1498..f19a17d439 100644 --- a/util/string/strip_ut.cpp +++ b/util/string/strip_ut.cpp @@ -1,6 +1,6 @@ #include "strip.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/wide.h> diff --git a/util/string/subst.cpp b/util/string/subst.cpp index b2df328dc1..034002ac8e 100644 --- a/util/string/subst.cpp +++ b/util/string/subst.cpp @@ -153,9 +153,9 @@ inline size_t SubstCharGlobalImpl(TStringType& s, typename TStringType::value_ty * sure that we can make safe casts between values of these types and pointers. */ static_assert(sizeof(wchar16) == sizeof(char16_t), ""); -static_assert(sizeof(wchar32) == sizeof(char32_t), ""); +static_assert(sizeof(wchar32) == sizeof(char32_t), ""); static_assert(std::is_unsigned<wchar16>::value == std::is_unsigned<char16_t>::value, ""); -static_assert(std::is_unsigned<wchar32>::value == std::is_unsigned<char32_t>::value, ""); +static_assert(std::is_unsigned<wchar32>::value == std::is_unsigned<char32_t>::value, ""); size_t SubstGlobal(TString& text, const TStringBuf what, const TStringBuf with, size_t from) { return SubstGlobalImpl(text, what, with, from); @@ -169,10 +169,10 @@ size_t SubstGlobal(TUtf16String& text, const TWtringBuf what, const TWtringBuf w return SubstGlobalImpl(text, what, with, from); } -size_t SubstGlobal(TUtf32String& text, const TUtf32StringBuf what, const TUtf32StringBuf with, size_t from) { - return SubstGlobalImpl(text, what, with, from); -} - +size_t SubstGlobal(TUtf32String& text, const TUtf32StringBuf what, const TUtf32StringBuf with, size_t from) { + return SubstGlobalImpl(text, what, with, from); +} + size_t SubstGlobal(std::u16string& text, const TWtringBuf what, const TWtringBuf with, size_t from) { return SubstGlobalImpl(text, std::u16string_view(reinterpret_cast<const char16_t*>(what.data()), what.size()), @@ -195,7 +195,7 @@ size_t SubstGlobal(TUtf16String& text, wchar16 what, wchar16 with, size_t from) size_t SubstGlobal(std::u16string& text, wchar16 what, wchar16 with, size_t from) { return SubstCharGlobalImpl(text, (char16_t)what, (char16_t)with, from); } - -size_t SubstGlobal(TUtf32String& text, wchar32 what, wchar32 with, size_t from) { + +size_t SubstGlobal(TUtf32String& text, wchar32 what, wchar32 with, size_t from) { return SubstCharGlobalImpl(text, (char32_t)what, (char32_t)with, from); -} +} diff --git a/util/string/subst.h b/util/string/subst.h index 45b622fbef..7288398515 100644 --- a/util/string/subst.h +++ b/util/string/subst.h @@ -17,7 +17,7 @@ size_t SubstGlobal(TString& text, TStringBuf what, TStringBuf with, size_t from size_t SubstGlobal(std::string& text, TStringBuf what, TStringBuf with, size_t from = 0); size_t SubstGlobal(TUtf16String& text, TWtringBuf what, TWtringBuf with, size_t from = 0); size_t SubstGlobal(std::u16string& text, TWtringBuf what, TWtringBuf with, size_t from = 0); -size_t SubstGlobal(TUtf32String& text, TUtf32StringBuf what, TUtf32StringBuf with, size_t from = 0); +size_t SubstGlobal(TUtf32String& text, TUtf32StringBuf what, TUtf32StringBuf with, size_t from = 0); /* Replace all occurences of character `what` with character `with` starting from position `from`. * @@ -32,7 +32,7 @@ size_t SubstGlobal(TString& text, char what, char with, size_t from = 0); size_t SubstGlobal(std::string& text, char what, char with, size_t from = 0); size_t SubstGlobal(TUtf16String& text, wchar16 what, wchar16 with, size_t from = 0); size_t SubstGlobal(std::u16string& text, wchar16 what, wchar16 with, size_t from = 0); -size_t SubstGlobal(TUtf32String& text, wchar32 what, wchar32 with, size_t from = 0); +size_t SubstGlobal(TUtf32String& text, wchar32 what, wchar32 with, size_t from = 0); // TODO(yazevnul): // - rename `SubstGlobal` to `ReplaceAll` for convenience diff --git a/util/string/subst_ut.cpp b/util/string/subst_ut.cpp index 21eccef779..0c0e53fddb 100644 --- a/util/string/subst_ut.cpp +++ b/util/string/subst_ut.cpp @@ -2,7 +2,7 @@ #include "subst.h" #include <string> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TStringSubst) { static const size_t MIN_FROM_CTX = 4; diff --git a/util/string/type.cpp b/util/string/type.cpp index 49671c02c2..d798a7f03a 100644 --- a/util/string/type.cpp +++ b/util/string/type.cpp @@ -73,7 +73,7 @@ bool IsTrue(const TStringBuf v) noexcept { return IsCaseInsensitiveAnyOf(v, trueOptions); } -bool IsFalse(const TStringBuf v) noexcept { +bool IsFalse(const TStringBuf v) noexcept { static constexpr std::array<TStringBuf, 7> falseOptions{ "false", "f", diff --git a/util/string/type.h b/util/string/type.h index d6cb29ea58..4d6b52643f 100644 --- a/util/string/type.h +++ b/util/string/type.h @@ -11,12 +11,12 @@ Y_PURE_FUNCTION static inline bool IsSpace(const TStringBuf s) noexcept { /// Returns "true" if the given string is an arabic number ([0-9]+) Y_PURE_FUNCTION bool IsNumber(const TStringBuf s) noexcept; - + Y_PURE_FUNCTION bool IsNumber(const TWtringBuf s) noexcept; /// Returns "true" if the given string is a hex number ([0-9a-fA-F]+) Y_PURE_FUNCTION bool IsHexNumber(const TStringBuf s) noexcept; - + Y_PURE_FUNCTION bool IsHexNumber(const TWtringBuf s) noexcept; /* Tests if the given string is case insensitive equal to one of: diff --git a/util/string/type_ut.cpp b/util/string/type_ut.cpp index 03e7af62bd..a8e723e404 100644 --- a/util/string/type_ut.cpp +++ b/util/string/type_ut.cpp @@ -1,6 +1,6 @@ #include "type.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/wide.h> diff --git a/util/string/util_ut.cpp b/util/string/util_ut.cpp index 18a2d8e195..14aaa86bd5 100644 --- a/util/string/util_ut.cpp +++ b/util/string/util_ut.cpp @@ -1,6 +1,6 @@ #include "util.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TStrUtilTest: public TTestBase { UNIT_TEST_SUITE(TStrUtilTest); diff --git a/util/string/vector_ut.cpp b/util/string/vector_ut.cpp index 817120f268..9b0016542e 100644 --- a/util/string/vector_ut.cpp +++ b/util/string/vector_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/charset/wide.h> #include "cast.h" diff --git a/util/system/align_ut.cpp b/util/system/align_ut.cpp index 3ba3a3442b..0d80d42e6a 100644 --- a/util/system/align_ut.cpp +++ b/util/system/align_ut.cpp @@ -1,6 +1,6 @@ #include "align.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TAlignTest: public TTestBase { UNIT_TEST_SUITE(TAlignTest); diff --git a/util/system/atexit_ut.cpp b/util/system/atexit_ut.cpp index 953f432811..a26f5abb35 100644 --- a/util/system/atexit_ut.cpp +++ b/util/system/atexit_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "atexit.h" diff --git a/util/system/atomic_ut.cpp b/util/system/atomic_ut.cpp index 07211ffba7..235d2dd060 100644 --- a/util/system/atomic_ut.cpp +++ b/util/system/atomic_ut.cpp @@ -1,6 +1,6 @@ #include "atomic.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> diff --git a/util/system/backtrace_ut.cpp b/util/system/backtrace_ut.cpp index 9b5ead71bc..7e4919a1bb 100644 --- a/util/system/backtrace_ut.cpp +++ b/util/system/backtrace_ut.cpp @@ -1,7 +1,7 @@ #include "backtrace.h" #include <util/generic/array_ref.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> diff --git a/util/system/benchmark/cpu_id/main.cpp b/util/system/benchmark/cpu_id/main.cpp index 8efe539983..a073543508 100644 --- a/util/system/benchmark/cpu_id/main.cpp +++ b/util/system/benchmark/cpu_id/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/system/cpu_id.h> diff --git a/util/system/benchmark/create_destroy_thread/main.cpp b/util/system/benchmark/create_destroy_thread/main.cpp index 0ca2a9d96f..ebafa960d2 100644 --- a/util/system/benchmark/create_destroy_thread/main.cpp +++ b/util/system/benchmark/create_destroy_thread/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/system/thread.h> diff --git a/util/system/benchmark/rdtsc/main.cpp b/util/system/benchmark/rdtsc/main.cpp index 8189d10f06..d51ea9d172 100644 --- a/util/system/benchmark/rdtsc/main.cpp +++ b/util/system/benchmark/rdtsc/main.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/system/datetime.h> #include <util/generic/xrange.h> diff --git a/util/system/byteorder_ut.cpp b/util/system/byteorder_ut.cpp index 39b8603d3f..f53b19af48 100644 --- a/util/system/byteorder_ut.cpp +++ b/util/system/byteorder_ut.cpp @@ -1,6 +1,6 @@ #include "byteorder.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TByteOrderTest: public TTestBase { UNIT_TEST_SUITE(TByteOrderTest); diff --git a/util/system/compat_ut.cpp b/util/system/compat_ut.cpp index dbd9289c17..eac69c58cb 100644 --- a/util/system/compat_ut.cpp +++ b/util/system/compat_ut.cpp @@ -1,6 +1,6 @@ #include "compat.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/dirut.h> #include <util/stream/output.h> diff --git a/util/system/compiler.h b/util/system/compiler.h index b373edcc46..d534f92779 100644 --- a/util/system/compiler.h +++ b/util/system/compiler.h @@ -187,15 +187,15 @@ #define Y_PUBLIC #endif -#if !defined(Y_UNUSED) && !defined(__cplusplus) +#if !defined(Y_UNUSED) && !defined(__cplusplus) #define Y_UNUSED(var) (void)(var) #endif -#if !defined(Y_UNUSED) && defined(__cplusplus) +#if !defined(Y_UNUSED) && defined(__cplusplus) template <class... Types> constexpr Y_FORCE_INLINE int Y_UNUSED(Types&&...) { return 0; }; -#endif +#endif /** * @def Y_ASSUME @@ -553,15 +553,15 @@ _YandexAbort(); // Memory sanitizer sometimes doesn't correctly set parameter shadow of constant functions. #if (defined(__clang__) || defined(__GNUC__)) && !defined(_msan_enabled_) /** - * @def Y_CONST_FUNCTION - methods and functions, marked with this method are promised to: - 1. do not have side effects - 2. this method do not read global memory - NOTE: this attribute can't be set for methods that depend on data, pointed by this - this allow compilers to do hard optimization of that functions - NOTE: in common case this attribute can't be set if method have pointer-arguments - NOTE: as result there no any reason to discard result of such method -*/ + * @def Y_CONST_FUNCTION + methods and functions, marked with this method are promised to: + 1. do not have side effects + 2. this method do not read global memory + NOTE: this attribute can't be set for methods that depend on data, pointed by this + this allow compilers to do hard optimization of that functions + NOTE: in common case this attribute can't be set if method have pointer-arguments + NOTE: as result there no any reason to discard result of such method +*/ #define Y_CONST_FUNCTION [[gnu::const]] #endif @@ -571,13 +571,13 @@ _YandexAbort(); #if defined(__clang__) || defined(__GNUC__) /** - * @def Y_PURE_FUNCTION - methods and functions, marked with this method are promised to: - 1. do not have side effects - 2. result will be the same if no global memory changed - this allow compilers to do hard optimization of that functions - NOTE: as result there no any reason to discard result of such method -*/ + * @def Y_PURE_FUNCTION + methods and functions, marked with this method are promised to: + 1. do not have side effects + 2. result will be the same if no global memory changed + this allow compilers to do hard optimization of that functions + NOTE: as result there no any reason to discard result of such method +*/ #define Y_PURE_FUNCTION [[gnu::pure]] #endif diff --git a/util/system/compiler_ut.cpp b/util/system/compiler_ut.cpp index f93b1c0850..63cc6cdbeb 100644 --- a/util/system/compiler_ut.cpp +++ b/util/system/compiler_ut.cpp @@ -1,6 +1,6 @@ #include "compiler.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TCompilerTest) { Y_UNIT_TEST(TestPragmaNoWshadow) { diff --git a/util/system/condvar_ut.cpp b/util/system/condvar_ut.cpp index 5130a18d32..cc8ae57dd2 100644 --- a/util/system/condvar_ut.cpp +++ b/util/system/condvar_ut.cpp @@ -2,7 +2,7 @@ #include "guard.h" #include "condvar.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/atomic.h> #include <util/system/atomic_ops.h> diff --git a/util/system/context_ut.cpp b/util/system/context_ut.cpp index 45cb0249f7..042a934bab 100644 --- a/util/system/context_ut.cpp +++ b/util/system/context_ut.cpp @@ -1,6 +1,6 @@ #include "context.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/deque.h> #include <util/generic/yexception.h> diff --git a/util/system/cpu_id.cpp b/util/system/cpu_id.cpp index 598c71f4d9..aa9c180c64 100644 --- a/util/system/cpu_id.cpp +++ b/util/system/cpu_id.cpp @@ -118,10 +118,10 @@ bool NX86::HaveSSE42() noexcept { return (TX86CpuInfo(0x1).ECX >> 20) & 1u; } -bool NX86::HaveF16C() noexcept { - return (TX86CpuInfo(0x1).ECX >> 29) & 1u; -} - +bool NX86::HaveF16C() noexcept { + return (TX86CpuInfo(0x1).ECX >> 29) & 1u; +} + bool NX86::HavePOPCNT() noexcept { return (TX86CpuInfo(0x1).ECX >> 23) & 1u; } diff --git a/util/system/cpu_id.h b/util/system/cpu_id.h index 3c49e728a7..f6ec49a9fa 100644 --- a/util/system/cpu_id.h +++ b/util/system/cpu_id.h @@ -1,7 +1,7 @@ #pragma once #include "types.h" -#include "compiler.h" +#include "compiler.h" #include <util/generic/singleton.h> #define Y_CPU_ID_ENUMERATE(F) \ @@ -11,7 +11,7 @@ F(SSSE3) \ F(SSE41) \ F(SSE42) \ - F(F16C) \ + F(F16C) \ F(POPCNT) \ F(BMI1) \ F(BMI2) \ @@ -78,11 +78,11 @@ namespace NX86 { bool CpuId(ui32 op, ui32 res[4]) noexcept; bool CpuId(ui32 op, ui32 subOp, ui32 res[4]) noexcept; -#define Y_DEF_NAME(X) Y_CONST_FUNCTION bool Have##X() noexcept; +#define Y_DEF_NAME(X) Y_CONST_FUNCTION bool Have##X() noexcept; Y_CPU_ID_ENUMERATE(Y_DEF_NAME) #undef Y_DEF_NAME -#define Y_DEF_NAME(X) Y_CONST_FUNCTION bool CachedHave##X() noexcept; +#define Y_DEF_NAME(X) Y_CONST_FUNCTION bool CachedHave##X() noexcept; Y_CPU_ID_ENUMERATE_OUTLINED_CACHED_DEFINE(Y_DEF_NAME) #undef Y_DEF_NAME diff --git a/util/system/cpu_id_ut.cpp b/util/system/cpu_id_ut.cpp index 68f1f8aac7..ac41440900 100644 --- a/util/system/cpu_id_ut.cpp +++ b/util/system/cpu_id_ut.cpp @@ -2,7 +2,7 @@ #include "platform.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> // There are no tests yet for instructions that use 512-bit wide registers because they are not // supported by some compilers yet. @@ -18,7 +18,7 @@ static void ExecuteSSE3Instruction(); static void ExecuteSSSE3Instruction(); static void ExecuteSSE41Instruction(); static void ExecuteSSE42Instruction(); -static void ExecuteF16CInstruction(); +static void ExecuteF16CInstruction(); static void ExecuteAVXInstruction(); static void ExecuteAVX2Instruction(); static void ExecutePOPCNTInstruction(); @@ -134,13 +134,13 @@ void ExecuteSSE42Instruction() { : "eax"); } -void ExecuteF16CInstruction() { - __asm__ __volatile__("vcvtph2ps %%xmm0, %%ymm0\n" - : - : - : "xmm0"); -} - +void ExecuteF16CInstruction() { + __asm__ __volatile__("vcvtph2ps %%xmm0, %%ymm0\n" + : + : + : "xmm0"); +} + void ExecuteAVXInstruction() { __asm__ __volatile__("vzeroupper\n" : @@ -276,9 +276,9 @@ void ExecuteSSE41Instruction() { void ExecuteSSE42Instruction() { } -void ExecuteF16CInstruction() { -} - +void ExecuteF16CInstruction() { +} + void ExecuteAVXInstruction() { } @@ -373,9 +373,9 @@ void ExecuteSSE41Instruction() { void ExecuteSSE42Instruction() { } -void ExecuteF16CInstruction() { -} - +void ExecuteF16CInstruction() { +} + void ExecuteAVXInstruction() { } diff --git a/util/system/daemon_ut.cpp b/util/system/daemon_ut.cpp index f93b9a9645..5a0201185c 100644 --- a/util/system/daemon_ut.cpp +++ b/util/system/daemon_ut.cpp @@ -1,6 +1,6 @@ #include "daemon.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/network/pair.h> #include <util/network/socket.h> diff --git a/util/system/defaults.h b/util/system/defaults.h index dcd7abea38..325480a55b 100644 --- a/util/system/defaults.h +++ b/util/system/defaults.h @@ -83,14 +83,14 @@ #ifdef NDEBUG #define Y_IF_DEBUG(X) - #ifdef __cplusplus -constexpr bool Y_IS_DEBUG_BUILD = false; - #endif + #ifdef __cplusplus +constexpr bool Y_IS_DEBUG_BUILD = false; + #endif #else #define Y_IF_DEBUG(X) X - #ifdef __cplusplus -constexpr bool Y_IS_DEBUG_BUILD = true; - #endif + #ifdef __cplusplus +constexpr bool Y_IS_DEBUG_BUILD = true; + #endif #endif /** diff --git a/util/system/direct_io_ut.cpp b/util/system/direct_io_ut.cpp index 839c3de7ca..f8f7ede132 100644 --- a/util/system/direct_io_ut.cpp +++ b/util/system/direct_io_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/yexception.h> #include <util/system/fs.h> diff --git a/util/system/env.cpp b/util/system/env.cpp index ead9b566a5..a3d46e48d3 100644 --- a/util/system/env.cpp +++ b/util/system/env.cpp @@ -50,18 +50,18 @@ TString GetEnv(const TString& key, const TString& def) { } void SetEnv(const TString& key, const TString& value) { - bool isOk = false; - int errorCode = 0; + bool isOk = false; + int errorCode = 0; #ifdef _win_ isOk = SetEnvironmentVariable(key.data(), value.data()); - if (!isOk) { - errorCode = GetLastError(); - } + if (!isOk) { + errorCode = GetLastError(); + } #else isOk = (0 == setenv(key.data(), value.data(), true /*replace*/)); - if (!isOk) { - errorCode = errno; - } + if (!isOk) { + errorCode = errno; + } #endif - Y_ENSURE_EX(isOk, TSystemError() << "failed to SetEnv with error-code " << errorCode); + Y_ENSURE_EX(isOk, TSystemError() << "failed to SetEnv with error-code " << errorCode); } diff --git a/util/system/env_ut.cpp b/util/system/env_ut.cpp index e03cc01658..fb8bcd2420 100644 --- a/util/system/env_ut.cpp +++ b/util/system/env_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include "env.h" diff --git a/util/system/error_ut.cpp b/util/system/error_ut.cpp index 763b0dddb7..98ea0e9f7d 100644 --- a/util/system/error_ut.cpp +++ b/util/system/error_ut.cpp @@ -1,6 +1,6 @@ #include "error.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> diff --git a/util/system/event_ut.cpp b/util/system/event_ut.cpp index 2506cb7a91..40565a8688 100644 --- a/util/system/event_ut.cpp +++ b/util/system/event_ut.cpp @@ -1,7 +1,7 @@ #include "event.h" #include "atomic.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/thread/pool.h> diff --git a/util/system/execpath.cpp b/util/system/execpath.cpp index 33198af58b..c2d798e1c4 100644 --- a/util/system/execpath.cpp +++ b/util/system/execpath.cpp @@ -84,7 +84,7 @@ static inline TString FreeBSDGetArgv0() { } static inline bool FreeBSDGuessExecPath(const TString& guessPath, TString& execPath) { - if (NFs::Exists(guessPath)) { + if (NFs::Exists(guessPath)) { // now it should work for real execPath = FreeBSDGetExecPath(); if (RealPath(execPath) == RealPath(guessPath)) { diff --git a/util/system/execpath_ut.cpp b/util/system/execpath_ut.cpp index 16b01466f5..40838e01a7 100644 --- a/util/system/execpath_ut.cpp +++ b/util/system/execpath_ut.cpp @@ -1,6 +1,6 @@ #include "execpath.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "platform.h" #include <util/folder/dirut.h> @@ -11,7 +11,7 @@ Y_UNIT_TEST_SUITE(TExecPathTest) { TString persistentExecPath = GetPersistentExecPath(); try { - UNIT_ASSERT(NFs::Exists(execPath)); + UNIT_ASSERT(NFs::Exists(execPath)); UNIT_ASSERT(NFs::Exists(persistentExecPath)); } catch (...) { Cerr << execPath << Endl; diff --git a/util/system/file_ut.cpp b/util/system/file_ut.cpp index 941e6a50f3..8b759a8a89 100644 --- a/util/system/file_ut.cpp +++ b/util/system/file_ut.cpp @@ -2,7 +2,7 @@ #include "fs.h" #include "tempfile.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> #include <util/generic/yexception.h> diff --git a/util/system/filemap.cpp b/util/system/filemap.cpp index 7454a4cb94..42b6b775d2 100644 --- a/util/system/filemap.cpp +++ b/util/system/filemap.cpp @@ -31,7 +31,7 @@ #endif #include <util/generic/utility.h> -#include <util/system/sanitizers.h> +#include <util/system/sanitizers.h> #include "filemap.h" #undef PAGE_SIZE @@ -260,7 +260,7 @@ public: } else { ythrow yexception() << "Can't map " << (unsigned long)size << " bytes at offset " << offset << " of '" << DbgName_ << "': " << LastSystemErrorText(); } - NSan::Unpoison(result.Ptr, result.Size); + NSan::Unpoison(result.Ptr, result.Size); if (Mode_ & oPrecharge) { NPrivate::Precharge(result.Ptr, result.Size, 0, result.Size); } diff --git a/util/system/filemap.h b/util/system/filemap.h index 11be64bff4..a1c1c43bc5 100644 --- a/util/system/filemap.h +++ b/util/system/filemap.h @@ -255,7 +255,7 @@ public: Y_PURE_FUNCTION bool empty() const noexcept { return Empty(); } - + Y_PURE_FUNCTION bool Empty() const noexcept { return 0 == Size_; } diff --git a/util/system/filemap_ut.cpp b/util/system/filemap_ut.cpp index 73f109dc88..415b42ca7d 100644 --- a/util/system/filemap_ut.cpp +++ b/util/system/filemap_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #ifdef _unix_ #include <sys/resource.h> diff --git a/util/system/flock_ut.cpp b/util/system/flock_ut.cpp index b5f6cb5328..7b4f7e1c5e 100644 --- a/util/system/flock_ut.cpp +++ b/util/system/flock_ut.cpp @@ -3,7 +3,7 @@ #include "guard.h" #include "tempfile.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TFileLockTest) { Y_UNIT_TEST(TestFlock) { diff --git a/util/system/fs.cpp b/util/system/fs.cpp index d2611a8ccc..2ee29591a7 100644 --- a/util/system/fs.cpp +++ b/util/system/fs.cpp @@ -12,9 +12,9 @@ #include <util/memory/tempbuf.h> #include <util/stream/file.h> #include <util/charset/wide.h> -#include <util/folder/iterator.h> -#include <util/system/fstat.h> -#include <util/folder/path.h> +#include <util/folder/iterator.h> +#include <util/system/fstat.h> +#include <util/folder/path.h> bool NFs::Remove(const TString& path) { #if defined(_win_) @@ -25,65 +25,65 @@ bool NFs::Remove(const TString& path) { } void NFs::RemoveRecursive(const TString& path) { - static const TStringBuf errStr = "error while removing "; - - if (!NFs::Exists(path)) { - return; - } - - if (!TFileStat(path).IsDir()) { + static const TStringBuf errStr = "error while removing "; + + if (!NFs::Exists(path)) { + return; + } + + if (!TFileStat(path).IsDir()) { if (!NFs::Remove(path)) { - ythrow TSystemError() << errStr << path << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; + ythrow TSystemError() << errStr << path << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; } - } - - TDirIterator dir(path); - + } + + TDirIterator dir(path); + for (auto it = dir.begin(); it != dir.end(); ++it) { - switch (it->fts_info) { - case FTS_DOT: - case FTS_D: + switch (it->fts_info) { + case FTS_DOT: + case FTS_D: break; - default: + default: if (!NFs::Remove(it->fts_path)) { - ythrow TSystemError() << errStr << it->fts_path << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; + ythrow TSystemError() << errStr << it->fts_path << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; } - break; - } - } -} - + break; + } + } +} + bool NFs::MakeDirectory(const TString& path, EFilePermissions mode) { -#if defined(_win_) +#if defined(_win_) Y_UNUSED(mode); - return NFsPrivate::WinMakeDirectory(path); -#else + return NFsPrivate::WinMakeDirectory(path); +#else return mkdir(path.data(), mode) == 0; -#endif -} - +#endif +} + bool NFs::MakeDirectoryRecursive(const TString& path, EFilePermissions mode, bool alwaysCreate) { - if (NFs::Exists(path) && TFileStat(path).IsDir()) { - if (alwaysCreate) { + if (NFs::Exists(path) && TFileStat(path).IsDir()) { + if (alwaysCreate) { ythrow TIoException() << "path " << path << " already exists" << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; - } - return true; - } else { - //NOTE: recursion is finite due to existence of "." and "/" + } + return true; + } else { + //NOTE: recursion is finite due to existence of "." and "/" if (!NFs::MakeDirectoryRecursive(TFsPath(path).Parent(), mode, false)) { return false; } bool isDirMade = NFs::MakeDirectory(path, mode); if (!isDirMade && alwaysCreate) { - ythrow TIoException() << "failed to create " << path << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; - } + ythrow TIoException() << "failed to create " << path << " with cwd (" << NFs::CurrentWorkingDirectory() << ")"; + } return TFileStat(path).IsDir(); - } -} - + } +} + bool NFs::Rename(const TString& oldPath, const TString& newPath) { #if defined(_win_) return NFsPrivate::WinRename(oldPath, newPath); @@ -145,35 +145,35 @@ void NFs::Copy(const TString& existingPath, const TString& newPath) { TransferData(&src, &dst); } - + bool NFs::Exists(const TString& path) { -#if defined(_win_) +#if defined(_win_) return NFsPrivate::WinExists(path); -#elif defined(_unix_) +#elif defined(_unix_) return access(path.data(), F_OK) == 0; -#endif -} - +#endif +} + TString NFs::CurrentWorkingDirectory() { -#if defined(_win_) - return NFsPrivate::WinCurrentWorkingDirectory(); -#elif defined(_unix_) - TTempBuf result; - char* r = getcwd(result.Data(), result.Size()); +#if defined(_win_) + return NFsPrivate::WinCurrentWorkingDirectory(); +#elif defined(_unix_) + TTempBuf result; + char* r = getcwd(result.Data(), result.Size()); if (r == nullptr) { - throw TIoSystemError() << "failed to getcwd"; + throw TIoSystemError() << "failed to getcwd"; } - return result.Data(); -#endif -} - + return result.Data(); +#endif +} + void NFs::SetCurrentWorkingDirectory(TString path) { -#ifdef _win_ - bool ok = NFsPrivate::WinSetCurrentWorkingDirectory(path); -#else +#ifdef _win_ + bool ok = NFsPrivate::WinSetCurrentWorkingDirectory(path); +#else bool ok = !chdir(path.data()); -#endif +#endif if (!ok) { - ythrow TSystemError() << "failed to change directory to " << path.Quote(); + ythrow TSystemError() << "failed to change directory to " << path.Quote(); } -} +} diff --git a/util/system/fs.h b/util/system/fs.h index 237daf2d2d..613ae9c793 100644 --- a/util/system/fs.h +++ b/util/system/fs.h @@ -1,11 +1,11 @@ #pragma once -#include <util/generic/flags.h> +#include <util/generic/flags.h> #include <util/generic/string.h> -#include <util/generic/yexception.h> +#include <util/generic/yexception.h> namespace NFs { - enum EFilePermission { + enum EFilePermission { FP_ALL_EXEC = 01, FP_ALL_WRITE = 02, FP_ALL_READ = 04, @@ -15,14 +15,14 @@ namespace NFs { FP_OWNER_READ = 0400, FP_OWNER_WRITE = 0200, FP_OWNER_EXEC = 0100, - + FP_COMMON_FILE = 0777, FP_SECRET_FILE = 0700, - FP_NONSECRET_FILE = 0744, - }; - - Y_DECLARE_FLAGS(EFilePermissions, EFilePermission); - + FP_NONSECRET_FILE = 0744, + }; + + Y_DECLARE_FLAGS(EFilePermissions, EFilePermission); + /// Remove a file or empty directory /// /// @param[in] path Path to file or directory @@ -30,53 +30,53 @@ namespace NFs { /// LastSystemError() is set in case of failure bool Remove(const TString& path); - /// Remove a file or directory with contents - /// - /// @param[in] path Path to file or directory - /// @throws + /// Remove a file or directory with contents + /// + /// @param[in] path Path to file or directory + /// @throws void RemoveRecursive(const TString& path); - - /// Creates directory - /// - /// @param[in] path Path to the directory - /// @param[in] mode Access permissions field; NOTE: ignored on win - /// @returns true on success or false otherwise + + /// Creates directory + /// + /// @param[in] path Path to the directory + /// @param[in] mode Access permissions field; NOTE: ignored on win + /// @returns true on success or false otherwise bool MakeDirectory(const TString& path, EFilePermissions mode); - - /// Creates directory - /// - /// @param[in] path Path to the directory - /// @returns true on success or false otherwise - /// NOTE: access permissions is set to 0777 + + /// Creates directory + /// + /// @param[in] path Path to the directory + /// @returns true on success or false otherwise + /// NOTE: access permissions is set to 0777 inline bool MakeDirectory(const TString& path) { - return MakeDirectory(path, FP_COMMON_FILE); - } - - /// Creates directory and all non-existings parents - /// - /// @param[in] path Path to be created - /// @param[in] mode Access permissions field; NOTE: ignored on win - /// @param[in] alwaysCreate Throw if path already exists or failed to create - /// @returns true if target path created or exists (and directory) + return MakeDirectory(path, FP_COMMON_FILE); + } + + /// Creates directory and all non-existings parents + /// + /// @param[in] path Path to be created + /// @param[in] mode Access permissions field; NOTE: ignored on win + /// @param[in] alwaysCreate Throw if path already exists or failed to create + /// @returns true if target path created or exists (and directory) bool MakeDirectoryRecursive(const TString& path, EFilePermissions mode, bool alwaysCreate); - - /// Creates directory and all non-existings parents - /// - /// @param[in] path Path to be created - /// @param[in] mode Access permissions field; NOTE: ignored on win + + /// Creates directory and all non-existings parents + /// + /// @param[in] path Path to be created + /// @param[in] mode Access permissions field; NOTE: ignored on win /// @returns true if target path created or exists (and directory) inline bool MakeDirectoryRecursive(const TString& path, EFilePermissions mode) { - return MakeDirectoryRecursive(path, mode, false); - } - - /// Creates directory and all non-existings parents - /// - /// @param[in] path Path to be created - /// @returns true if target path created or exists (and directory) + return MakeDirectoryRecursive(path, mode, false); + } + + /// Creates directory and all non-existings parents + /// + /// @param[in] path Path to be created + /// @returns true if target path created or exists (and directory) inline bool MakeDirectoryRecursive(const TString& path) { - return MakeDirectoryRecursive(path, FP_COMMON_FILE, false); - } - + return MakeDirectoryRecursive(path, FP_COMMON_FILE, false); + } + /// Rename a file or directory. /// Removes newPath if it exists /// @@ -126,31 +126,31 @@ namespace NFs { /// @param[in] existingPath Path to an existing file /// @param[in] newPath New path of file void Copy(const TString& existingPath, const TString& newPath); - - /// Returns path to the current working directory - /// - /// Note: is not threadsafe + + /// Returns path to the current working directory + /// + /// Note: is not threadsafe TString CurrentWorkingDirectory(); - - /// Changes current working directory - /// - /// @param[in] path Path for new cwd - /// Note: is not threadsafe + + /// Changes current working directory + /// + /// @param[in] path Path for new cwd + /// Note: is not threadsafe void SetCurrentWorkingDirectory(TString path); - - /// Checks if file exists - /// - /// @param[in] path Path to check + + /// Checks if file exists + /// + /// @param[in] path Path to check bool Exists(const TString& path); - - /// Ensures that file exists - /// - /// @param[in] path Path to check - /// @returns input argument + + /// Ensures that file exists + /// + /// @param[in] path Path to check + /// @returns input argument inline const TString& EnsureExists(const TString& path) { Y_ENSURE_EX(Exists(path), TFileError{} << "Path " << path << " does not exists (checked from cwd:" << NFs::CurrentWorkingDirectory() << ")"); - return path; - } + return path; + } } - -Y_DECLARE_OPERATORS_FOR_FLAGS(NFs::EFilePermissions) + +Y_DECLARE_OPERATORS_FOR_FLAGS(NFs::EFilePermissions) diff --git a/util/system/fs_ut.cpp b/util/system/fs_ut.cpp index de071ebf55..21d0a9729a 100644 --- a/util/system/fs_ut.cpp +++ b/util/system/fs_ut.cpp @@ -1,6 +1,6 @@ #include "fs.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "file.h" #include "sysstat.h" @@ -8,61 +8,61 @@ #include <util/folder/dirut.h> #include <util/folder/path.h> -//WARNING: on windows the test must be run with administative rules - +//WARNING: on windows the test must be run with administative rules + class TFsTest: public TTestBase { UNIT_TEST_SUITE(TFsTest); - UNIT_TEST(TestCreateRemove); - UNIT_TEST(TestRename); + UNIT_TEST(TestCreateRemove); + UNIT_TEST(TestRename); UNIT_TEST(TestSymlink); UNIT_TEST(TestHardlink); - UNIT_TEST(TestCwdOpts); - UNIT_TEST(TestEnsureExists); + UNIT_TEST(TestCwdOpts); + UNIT_TEST(TestEnsureExists); UNIT_TEST_SUITE_END(); public: - void TestCreateRemove(); - void TestRename(); + void TestCreateRemove(); + void TestRename(); void TestSymlink(); void TestHardlink(); - void TestCwdOpts(); - void TestEnsureExists(); + void TestCwdOpts(); + void TestEnsureExists(); }; UNIT_TEST_SUITE_REGISTRATION(TFsTest); -static void Touch(const TFsPath& path) { - TFile file(path, CreateAlways | WrOnly); - file.Write("123", 3); -} - -void TFsTest::TestCreateRemove() { - TFsPath dir1 = "dir_aбвг"; - NFs::RemoveRecursive(dir1); - UNIT_ASSERT(!NFs::Exists(dir1)); - UNIT_ASSERT(NFs::MakeDirectory(dir1)); - - UNIT_ASSERT(TFileStat(dir1).IsDir()); - UNIT_ASSERT(!NFs::MakeDirectory(dir1)); - - UNIT_ASSERT(NFs::Exists(dir1)); - TFsPath subdir1 = dir1 / "a" / "b"; - //TFsPath link = dir1 / "link"; - - UNIT_ASSERT(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE, true)); - UNIT_ASSERT(NFs::Exists(subdir1)); - UNIT_ASSERT(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE, false)); - UNIT_ASSERT(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE)); - UNIT_ASSERT_EXCEPTION(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE, true), TIoException); - - TFsPath file1 = dir1 / "f1.txt"; +static void Touch(const TFsPath& path) { + TFile file(path, CreateAlways | WrOnly); + file.Write("123", 3); +} + +void TFsTest::TestCreateRemove() { + TFsPath dir1 = "dir_aбвг"; + NFs::RemoveRecursive(dir1); + UNIT_ASSERT(!NFs::Exists(dir1)); + UNIT_ASSERT(NFs::MakeDirectory(dir1)); + + UNIT_ASSERT(TFileStat(dir1).IsDir()); + UNIT_ASSERT(!NFs::MakeDirectory(dir1)); + + UNIT_ASSERT(NFs::Exists(dir1)); + TFsPath subdir1 = dir1 / "a" / "b"; + //TFsPath link = dir1 / "link"; + + UNIT_ASSERT(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE, true)); + UNIT_ASSERT(NFs::Exists(subdir1)); + UNIT_ASSERT(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE, false)); + UNIT_ASSERT(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE)); + UNIT_ASSERT_EXCEPTION(NFs::MakeDirectoryRecursive(subdir1, NFs::FP_COMMON_FILE, true), TIoException); + + TFsPath file1 = dir1 / "f1.txt"; TFsPath file2 = subdir1 + TString("_f2.txt"); - TFsPath file3 = subdir1 / "f2.txt"; - Touch(file1); - Touch(file2); - Touch(file3); - //UNIT_ASSERT(NFs::SymLink(file3.RealPath(), link)); - + TFsPath file3 = subdir1 / "f2.txt"; + Touch(file1); + Touch(file2); + Touch(file3); + //UNIT_ASSERT(NFs::SymLink(file3.RealPath(), link)); + UNIT_ASSERT(NFs::MakeDirectoryRecursive(dir1 / "subdir1" / "subdir2" / "subdir3" / "subdir4", NFs::FP_COMMON_FILE, false)); UNIT_ASSERT(NFs::MakeDirectoryRecursive(dir1 / "subdir1" / "subdir2", NFs::FP_COMMON_FILE, false)); @@ -72,202 +72,202 @@ void TFsTest::TestCreateRemove() { TString longUtf8Name = ""; while (longUtf8Name.size() < 255) { - longUtf8Name = longUtf8Name + "fф"; - } + longUtf8Name = longUtf8Name + "fф"; + } UNIT_ASSERT_EQUAL(longUtf8Name.size(), 255); - TFsPath longfile = dir1 / longUtf8Name; - Touch(longfile); - - UNIT_ASSERT(NFs::Exists(longfile)); - UNIT_ASSERT(NFs::Exists(file1)); - UNIT_ASSERT(NFs::Exists(file2)); - UNIT_ASSERT(NFs::Exists(file3)); - //UNIT_ASSERT(NFs::Exists(link)); - - UNIT_ASSERT(!NFs::Remove(dir1)); - NFs::RemoveRecursive(dir1); - - UNIT_ASSERT(!NFs::Exists(file1)); - UNIT_ASSERT(!NFs::Exists(file2)); - UNIT_ASSERT(!NFs::Exists(file3)); - //UNIT_ASSERT(!NFs::Exists(link)); - UNIT_ASSERT(!NFs::Exists(subdir1)); - UNIT_ASSERT(!NFs::Exists(longfile)); - UNIT_ASSERT(!NFs::Exists(dir1)); -} - + TFsPath longfile = dir1 / longUtf8Name; + Touch(longfile); + + UNIT_ASSERT(NFs::Exists(longfile)); + UNIT_ASSERT(NFs::Exists(file1)); + UNIT_ASSERT(NFs::Exists(file2)); + UNIT_ASSERT(NFs::Exists(file3)); + //UNIT_ASSERT(NFs::Exists(link)); + + UNIT_ASSERT(!NFs::Remove(dir1)); + NFs::RemoveRecursive(dir1); + + UNIT_ASSERT(!NFs::Exists(file1)); + UNIT_ASSERT(!NFs::Exists(file2)); + UNIT_ASSERT(!NFs::Exists(file3)); + //UNIT_ASSERT(!NFs::Exists(link)); + UNIT_ASSERT(!NFs::Exists(subdir1)); + UNIT_ASSERT(!NFs::Exists(longfile)); + UNIT_ASSERT(!NFs::Exists(dir1)); +} + void RunRenameTest(TFsPath src, TFsPath dst) { // if previous running was failed - TFsPath dir1 = "dir"; - TFsPath dir2 = "dst_dir"; - - NFs::Remove(src); - NFs::Remove(dst); - - NFs::Remove(dir1 / src); - NFs::Remove(dir1); - NFs::Remove(dir2 / src); - NFs::Remove(dir2); - + TFsPath dir1 = "dir"; + TFsPath dir2 = "dst_dir"; + + NFs::Remove(src); + NFs::Remove(dst); + + NFs::Remove(dir1 / src); + NFs::Remove(dir1); + NFs::Remove(dir2 / src); + NFs::Remove(dir2); + { - TFile file(src, CreateNew | WrOnly); + TFile file(src, CreateNew | WrOnly); file.Write("123", 3); } UNIT_ASSERT(NFs::Rename(src, dst)); - UNIT_ASSERT(NFs::Exists(dst)); - UNIT_ASSERT(!NFs::Exists(src)); - + UNIT_ASSERT(NFs::Exists(dst)); + UNIT_ASSERT(!NFs::Exists(src)); + { - TFile file(dst, OpenExisting); + TFile file(dst, OpenExisting); UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 3); } - - NFs::MakeDirectory(dir1); + + NFs::MakeDirectory(dir1); { - TFile file(dir1 / src, CreateNew | WrOnly); - file.Write("123", 3); - } + TFile file(dir1 / src, CreateNew | WrOnly); + file.Write("123", 3); + } UNIT_ASSERT(NFs::Rename(dir1, dir2)); - UNIT_ASSERT(NFs::Exists(dir2 / src)); - UNIT_ASSERT(!NFs::Exists(dir1)); - - { - TFile file(dir2 / src, OpenExisting); - UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 3); - } - + UNIT_ASSERT(NFs::Exists(dir2 / src)); + UNIT_ASSERT(!NFs::Exists(dir1)); + + { + TFile file(dir2 / src, OpenExisting); + UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 3); + } + UNIT_ASSERT(!NFs::Remove(src)); UNIT_ASSERT(NFs::Remove(dst)); UNIT_ASSERT(!NFs::Remove(dir1)); UNIT_ASSERT(NFs::Remove(dir2 / src)); UNIT_ASSERT(NFs::Remove(dir2)); -} - +} + void TFsTest::TestRename() { - RunRenameTest("src.txt", "dst.txt"); - RunRenameTest("src_абвг.txt", "dst_абвг.txt"); -} - -static void RunHardlinkTest(const TFsPath& src, const TFsPath& dst) { - NFs::Remove(src); - NFs::Remove(dst); - - { - TFile file(src, CreateNew | WrOnly); - file.Write("123", 3); - } - - UNIT_ASSERT(NFs::HardLink(src, dst)); - - { - TFile file(dst, OpenExisting | RdOnly); - UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 3); - } - { - TFile file(src, OpenExisting | WrOnly); + RunRenameTest("src.txt", "dst.txt"); + RunRenameTest("src_абвг.txt", "dst_абвг.txt"); +} + +static void RunHardlinkTest(const TFsPath& src, const TFsPath& dst) { + NFs::Remove(src); + NFs::Remove(dst); + + { + TFile file(src, CreateNew | WrOnly); + file.Write("123", 3); + } + + UNIT_ASSERT(NFs::HardLink(src, dst)); + + { + TFile file(dst, OpenExisting | RdOnly); + UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 3); + } + { + TFile file(src, OpenExisting | WrOnly); file.Write("1234", 4); } { - TFile file(dst, OpenExisting | RdOnly); + TFile file(dst, OpenExisting | RdOnly); UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 4); } { - TFile file(dst, OpenExisting | WrOnly); + TFile file(dst, OpenExisting | WrOnly); file.Write("12345", 5); } - + { - TFile file(src, OpenExisting | RdOnly); + TFile file(src, OpenExisting | RdOnly); UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 5); } - + UNIT_ASSERT(NFs::Remove(dst)); UNIT_ASSERT(NFs::Remove(src)); } -void TFsTest::TestHardlink() { - RunHardlinkTest("tempfile", "hardlinkfile"); - RunHardlinkTest("tempfile_абвг", "hardlinkfile_абвг"); //utf-8 names -} - +void TFsTest::TestHardlink() { + RunHardlinkTest("tempfile", "hardlinkfile"); + RunHardlinkTest("tempfile_абвг", "hardlinkfile_абвг"); //utf-8 names +} + static void RunSymLinkTest(TString fileLocalName, TString symLinkName) { // if previous running was failed - TFsPath subDir = "tempsubdir"; - TFsPath srcFile = subDir / fileLocalName; - - TFsPath subsubDir1 = subDir / "dir1"; - TFsPath subsubDir2 = subDir / "dir2"; - - TFsPath linkD1 = "symlinkdir"; - TFsPath linkD2 = subsubDir1 / "linkd2"; - TFsPath dangling = subsubDir1 / "dangling"; - - NFs::Remove(srcFile); - NFs::Remove(symLinkName); - NFs::Remove(linkD2); - NFs::Remove(dangling); - NFs::Remove(subsubDir1); - NFs::Remove(subsubDir2); - NFs::Remove(subDir); - NFs::Remove(linkD1); - - NFs::MakeDirectory(subDir); - NFs::MakeDirectory(subsubDir1, NFs::FP_NONSECRET_FILE); - NFs::MakeDirectory(subsubDir2, NFs::FP_SECRET_FILE); + TFsPath subDir = "tempsubdir"; + TFsPath srcFile = subDir / fileLocalName; + + TFsPath subsubDir1 = subDir / "dir1"; + TFsPath subsubDir2 = subDir / "dir2"; + + TFsPath linkD1 = "symlinkdir"; + TFsPath linkD2 = subsubDir1 / "linkd2"; + TFsPath dangling = subsubDir1 / "dangling"; + + NFs::Remove(srcFile); + NFs::Remove(symLinkName); + NFs::Remove(linkD2); + NFs::Remove(dangling); + NFs::Remove(subsubDir1); + NFs::Remove(subsubDir2); + NFs::Remove(subDir); + NFs::Remove(linkD1); + + NFs::MakeDirectory(subDir); + NFs::MakeDirectory(subsubDir1, NFs::FP_NONSECRET_FILE); + NFs::MakeDirectory(subsubDir2, NFs::FP_SECRET_FILE); { - TFile file(srcFile, CreateNew | WrOnly); + TFile file(srcFile, CreateNew | WrOnly); file.Write("1234567", 7); } - UNIT_ASSERT(NFs::SymLink(subDir, linkD1)); - UNIT_ASSERT(NFs::SymLink("../dir2", linkD2)); - UNIT_ASSERT(NFs::SymLink("../dir3", dangling)); + UNIT_ASSERT(NFs::SymLink(subDir, linkD1)); + UNIT_ASSERT(NFs::SymLink("../dir2", linkD2)); + UNIT_ASSERT(NFs::SymLink("../dir3", dangling)); UNIT_ASSERT_STRINGS_EQUAL(NFs::ReadLink(linkD2), TString("..") + LOCSLASH_S "dir2"); UNIT_ASSERT_STRINGS_EQUAL(NFs::ReadLink(dangling), TString("..") + LOCSLASH_S "dir3"); { - TFile file(linkD1 / fileLocalName, OpenExisting | RdOnly); + TFile file(linkD1 / fileLocalName, OpenExisting | RdOnly); UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 7); } - UNIT_ASSERT(NFs::SymLink(srcFile, symLinkName)); + UNIT_ASSERT(NFs::SymLink(srcFile, symLinkName)); { - TFile file(symLinkName, OpenExisting | RdOnly); + TFile file(symLinkName, OpenExisting | RdOnly); UNIT_ASSERT_VALUES_EQUAL(file.GetLength(), 7); } { - TFileStat fs(linkD1); + TFileStat fs(linkD1); UNIT_ASSERT(!fs.IsFile()); UNIT_ASSERT(fs.IsDir()); UNIT_ASSERT(!fs.IsSymlink()); } { - TFileStat fs(linkD1, true); + TFileStat fs(linkD1, true); UNIT_ASSERT(!fs.IsFile()); //UNIT_ASSERT(fs.IsDir()); // failed on unix UNIT_ASSERT(fs.IsSymlink()); } { - TFileStat fs(symLinkName); + TFileStat fs(symLinkName); UNIT_ASSERT(fs.IsFile()); UNIT_ASSERT(!fs.IsDir()); UNIT_ASSERT(!fs.IsSymlink()); UNIT_ASSERT_VALUES_EQUAL(fs.Size, 7u); } - + { - TFileStat fs(symLinkName, true); + TFileStat fs(symLinkName, true); //UNIT_ASSERT(fs.IsFile()); // no evidence that symlink has to be a file as well UNIT_ASSERT(!fs.IsDir()); UNIT_ASSERT(fs.IsSymlink()); } UNIT_ASSERT(NFs::Remove(symLinkName)); - UNIT_ASSERT(NFs::Exists(srcFile)); - + UNIT_ASSERT(NFs::Exists(srcFile)); + UNIT_ASSERT(NFs::Remove(linkD1)); - UNIT_ASSERT(NFs::Exists(srcFile)); - + UNIT_ASSERT(NFs::Exists(srcFile)); + UNIT_ASSERT(!NFs::Remove(subDir)); - + UNIT_ASSERT(NFs::Remove(srcFile)); UNIT_ASSERT(NFs::Remove(linkD2)); UNIT_ASSERT(NFs::Remove(dangling)); @@ -275,51 +275,51 @@ static void RunSymLinkTest(TString fileLocalName, TString symLinkName) { UNIT_ASSERT(NFs::Remove(subsubDir2)); UNIT_ASSERT(NFs::Remove(subDir)); } - + void TFsTest::TestSymlink() { - // if previous running was failed - RunSymLinkTest("f.txt", "fl.txt"); - RunSymLinkTest("f_абвг.txt", "fl_абвг.txt"); //utf-8 names -} - -void TFsTest::TestCwdOpts() { - TFsPath initialCwd = NFs::CurrentWorkingDirectory(); - TFsPath subdir = "dir_forcwd_абвг"; - NFs::MakeDirectory(subdir, NFs::FP_SECRET_FILE | NFs::FP_ALL_READ); - NFs::SetCurrentWorkingDirectory(subdir); - TFsPath newCwd = NFs::CurrentWorkingDirectory(); - - UNIT_ASSERT_EQUAL(newCwd.Fix(), (initialCwd / subdir).Fix()); - - NFs::SetCurrentWorkingDirectory(".."); - TFsPath newCwd2 = NFs::CurrentWorkingDirectory(); - UNIT_ASSERT_EQUAL(newCwd2.Fix(), initialCwd.Fix()); - UNIT_ASSERT(NFs::Remove(subdir)); -} - -void TFsTest::TestEnsureExists() { - TFsPath fileExists = "tmp_file_абвг.txt"; - TFsPath nonExists = "tmp2_file_абвг.txt"; - { - NFs::Remove(fileExists); - NFs::Remove(nonExists); - TFile file(fileExists, CreateNew | WrOnly); - file.Write("1234567", 7); - } - - UNIT_ASSERT_NO_EXCEPTION(NFs::EnsureExists(fileExists)); - UNIT_ASSERT_EXCEPTION(NFs::EnsureExists(nonExists), TFileError); - - TStringBuilder expected; + // if previous running was failed + RunSymLinkTest("f.txt", "fl.txt"); + RunSymLinkTest("f_абвг.txt", "fl_абвг.txt"); //utf-8 names +} + +void TFsTest::TestCwdOpts() { + TFsPath initialCwd = NFs::CurrentWorkingDirectory(); + TFsPath subdir = "dir_forcwd_абвг"; + NFs::MakeDirectory(subdir, NFs::FP_SECRET_FILE | NFs::FP_ALL_READ); + NFs::SetCurrentWorkingDirectory(subdir); + TFsPath newCwd = NFs::CurrentWorkingDirectory(); + + UNIT_ASSERT_EQUAL(newCwd.Fix(), (initialCwd / subdir).Fix()); + + NFs::SetCurrentWorkingDirectory(".."); + TFsPath newCwd2 = NFs::CurrentWorkingDirectory(); + UNIT_ASSERT_EQUAL(newCwd2.Fix(), initialCwd.Fix()); + UNIT_ASSERT(NFs::Remove(subdir)); +} + +void TFsTest::TestEnsureExists() { + TFsPath fileExists = "tmp_file_абвг.txt"; + TFsPath nonExists = "tmp2_file_абвг.txt"; + { + NFs::Remove(fileExists); + NFs::Remove(nonExists); + TFile file(fileExists, CreateNew | WrOnly); + file.Write("1234567", 7); + } + + UNIT_ASSERT_NO_EXCEPTION(NFs::EnsureExists(fileExists)); + UNIT_ASSERT_EXCEPTION(NFs::EnsureExists(nonExists), TFileError); + + TStringBuilder expected; TString got; - try { + try { NFs::EnsureExists(nonExists); expected << __LOCATION__; - } catch (const TFileError& err) { - got = err.what(); - } - UNIT_ASSERT(got.Contains(expected)); - UNIT_ASSERT(got.Contains(NFs::CurrentWorkingDirectory())); - - UNIT_ASSERT(NFs::Remove(fileExists)); -} + } catch (const TFileError& err) { + got = err.what(); + } + UNIT_ASSERT(got.Contains(expected)); + UNIT_ASSERT(got.Contains(NFs::CurrentWorkingDirectory())); + + UNIT_ASSERT(NFs::Remove(fileExists)); +} diff --git a/util/system/fs_win.cpp b/util/system/fs_win.cpp index a410ccac06..8736b8ef00 100644 --- a/util/system/fs_win.cpp +++ b/util/system/fs_win.cpp @@ -20,11 +20,11 @@ namespace NFsPrivate { } static TString WCHARToUTF8(const LPWSTR wstr, size_t len) { - static_assert(sizeof(WCHAR) == sizeof(wchar16), "expect sizeof(WCHAR) == sizeof(wchar16)"); - + static_assert(sizeof(WCHAR) == sizeof(wchar16), "expect sizeof(WCHAR) == sizeof(wchar16)"); + return WideToUTF8((wchar16*)wstr, len); - } - + } + HANDLE CreateFileWithUtf8Name(const TStringBuf fName, ui32 accessMode, ui32 shareMode, ui32 createMode, ui32 attributes, bool inheritHandle) { TUtf16String wstr; LPCWSTR wname = UTF8ToWCHAR(fName, wstr); @@ -37,8 +37,8 @@ namespace NFsPrivate { secAttrs.lpSecurityDescriptor = nullptr; secAttrs.nLength = sizeof(secAttrs); return ::CreateFileW(wname, accessMode, shareMode, &secAttrs, createMode, attributes, nullptr); - } - + } + bool WinRename(const TString& oldPath, const TString& newPath) { TUtf16String op, np; LPCWSTR opPtr = UTF8ToWCHAR(oldPath, op); @@ -47,10 +47,10 @@ namespace NFsPrivate { ::SetLastError(ERROR_INVALID_NAME); return false; } - + return MoveFileExW(opPtr, npPtr, MOVEFILE_REPLACE_EXISTING) != 0; } - + bool WinRemove(const TString& path) { TUtf16String wstr; LPCWSTR wname = UTF8ToWCHAR(path, wstr); @@ -67,10 +67,10 @@ namespace NFsPrivate { return false; } - + bool WinSymLink(const TString& targetName, const TString& linkName) { TString tName(targetName); - { + { size_t pos; while ((pos = tName.find('/')) != TString::npos) tName.replace(pos, 1, LOCSLASH_S); @@ -79,7 +79,7 @@ namespace NFsPrivate { LPCWSTR wname = UTF8ToWCHAR(tName, tstr); TUtf16String lstr; LPCWSTR lname = UTF8ToWCHAR(linkName, lstr); - + // we can't create a dangling link to a dir in this way ui32 attr = ::GetFileAttributesW(wname); if (attr == INVALID_FILE_ATTRIBUTES) { @@ -111,38 +111,38 @@ namespace NFsPrivate { } return (CreateHardLinkW(npPtr, epPtr, nullptr) != 0); - } - + } + bool WinExists(const TString& path) { TUtf16String buf; LPCWSTR ptr = UTF8ToWCHAR(path, buf); return ::GetFileAttributesW(ptr) != INVALID_FILE_ATTRIBUTES; } - + TString WinCurrentWorkingDirectory() { - TTempBuf result; - LPWSTR buf = reinterpret_cast<LPWSTR>(result.Data()); - int r = GetCurrentDirectoryW(result.Size() / sizeof(WCHAR), buf); - if (r == 0) - throw TIoSystemError() << "failed to GetCurrentDirectory"; - return WCHARToUTF8(buf, r); - } - + TTempBuf result; + LPWSTR buf = reinterpret_cast<LPWSTR>(result.Data()); + int r = GetCurrentDirectoryW(result.Size() / sizeof(WCHAR), buf); + if (r == 0) + throw TIoSystemError() << "failed to GetCurrentDirectory"; + return WCHARToUTF8(buf, r); + } + bool WinSetCurrentWorkingDirectory(const TString& path) { TUtf16String wstr; - LPCWSTR wname = UTF8ToWCHAR(path, wstr); - if (!wname) { - ::SetLastError(ERROR_INVALID_NAME); - return false; - } - return SetCurrentDirectoryW(wname); - } - + LPCWSTR wname = UTF8ToWCHAR(path, wstr); + if (!wname) { + ::SetLastError(ERROR_INVALID_NAME); + return false; + } + return SetCurrentDirectoryW(wname); + } + bool WinMakeDirectory(const TString path) { TUtf16String buf; - LPCWSTR ptr = UTF8ToWCHAR(path, buf); - return CreateDirectoryW(ptr, (LPSECURITY_ATTRIBUTES) nullptr); - } + LPCWSTR ptr = UTF8ToWCHAR(path, buf); + return CreateDirectoryW(ptr, (LPSECURITY_ATTRIBUTES) nullptr); + } // edited part of <Ntifs.h> from Windows DDK #define SYMLINK_FLAG_RELATIVE 1 @@ -229,5 +229,5 @@ bool GetObjectId(const char* path, GUID* id) { return false; } */ - + } diff --git a/util/system/fs_win.h b/util/system/fs_win.h index 8086129828..7fdab7c198 100644 --- a/util/system/fs_win.h +++ b/util/system/fs_win.h @@ -8,22 +8,22 @@ namespace NFsPrivate { bool WinRename(const TString& oldPath, const TString& newPath); - + bool WinSymLink(const TString& targetName, const TString& linkName); - + bool WinHardLink(const TString& existingPath, const TString& newPath); - + TString WinReadLink(const TString& path); - + HANDLE CreateFileWithUtf8Name(const TStringBuf fName, ui32 accessMode, ui32 shareMode, ui32 createMode, ui32 attributes, bool inheritHandle); - + bool WinRemove(const TString& path); - + bool WinExists(const TString& path); - + TString WinCurrentWorkingDirectory(); - + bool WinSetCurrentWorkingDirectory(const TString& path); - + bool WinMakeDirectory(const TString path); } diff --git a/util/system/fstat_ut.cpp b/util/system/fstat_ut.cpp index 160ecd936e..040cacbb09 100644 --- a/util/system/fstat_ut.cpp +++ b/util/system/fstat_ut.cpp @@ -3,8 +3,8 @@ #include "sysstat.h" #include "fs.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/folder/path.h> diff --git a/util/system/getpid_ut.cpp b/util/system/getpid_ut.cpp index e7122a2971..fb0d42ef76 100644 --- a/util/system/getpid_ut.cpp +++ b/util/system/getpid_ut.cpp @@ -1,6 +1,6 @@ #include "getpid.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TGetPidTest: public TTestBase { UNIT_TEST_SUITE(TGetPidTest); diff --git a/util/system/guard_ut.cpp b/util/system/guard_ut.cpp index 404ede99ab..6f18e9a5ee 100644 --- a/util/system/guard_ut.cpp +++ b/util/system/guard_ut.cpp @@ -1,7 +1,7 @@ #include "guard.h" #include "rwlock.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/thread/pool.h> diff --git a/util/system/hi_lo_ut.cpp b/util/system/hi_lo_ut.cpp index 850c12327d..8610fbb9fd 100644 --- a/util/system/hi_lo_ut.cpp +++ b/util/system/hi_lo_ut.cpp @@ -1,6 +1,6 @@ #include <util/system/hi_lo.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "defaults.h" diff --git a/util/system/hostname_ut.cpp b/util/system/hostname_ut.cpp index fb1cb7dde4..009c4f8064 100644 --- a/util/system/hostname_ut.cpp +++ b/util/system/hostname_ut.cpp @@ -1,6 +1,6 @@ #include "hostname.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(THostNameTest) { Y_UNIT_TEST(Test1) { diff --git a/util/system/info_ut.cpp b/util/system/info_ut.cpp index ad7449f8f4..5b2dd00460 100644 --- a/util/system/info_ut.cpp +++ b/util/system/info_ut.cpp @@ -1,6 +1,6 @@ #include "info.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TSysInfoTest: public TTestBase { UNIT_TEST_SUITE(TSysInfoTest); diff --git a/util/system/interrupt_signals_ut.cpp b/util/system/interrupt_signals_ut.cpp index bec54fec61..0dda781cea 100644 --- a/util/system/interrupt_signals_ut.cpp +++ b/util/system/interrupt_signals_ut.cpp @@ -4,7 +4,7 @@ #include <util/datetime/base.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #ifdef _win_ #include <windows.h> diff --git a/util/system/mem_info_ut.cpp b/util/system/mem_info_ut.cpp index a1100ba646..864aff9cd4 100644 --- a/util/system/mem_info_ut.cpp +++ b/util/system/mem_info_ut.cpp @@ -1,6 +1,6 @@ #include "mem_info.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "info.h" diff --git a/util/system/mincore_ut.cpp b/util/system/mincore_ut.cpp index fc46cb1632..39fe7fd91a 100644 --- a/util/system/mincore_ut.cpp +++ b/util/system/mincore_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #ifdef _unix_ #include <sys/resource.h> diff --git a/util/system/mlock.cpp b/util/system/mlock.cpp index 435338c98f..a47f94a993 100644 --- a/util/system/mlock.cpp +++ b/util/system/mlock.cpp @@ -54,27 +54,27 @@ void UnlockMemory(const void* addr, size_t len) { void LockAllMemory(ELockAllMemoryFlags flags) { Y_UNUSED(flags); -#if defined(_android_) +#if defined(_android_) // unimplemented -#elif defined(_cygwin_) +#elif defined(_cygwin_) // unimplemented -#elif defined(_unix_) - int sys_flags = 0; +#elif defined(_unix_) + int sys_flags = 0; if (flags & LockCurrentMemory) { - sys_flags |= MCL_CURRENT; - } + sys_flags |= MCL_CURRENT; + } if (flags & LockFutureMemory) { - sys_flags |= MCL_FUTURE; - } + sys_flags |= MCL_FUTURE; + } if (flags & LockMemoryOnFault) { sys_flags |= MCL_ONFAULT; } - if (mlockall(sys_flags)) { - ythrow yexception() << LastSystemErrorText(); - } -#endif -} - + if (mlockall(sys_flags)) { + ythrow yexception() << LastSystemErrorText(); + } +#endif +} + void UnlockAllMemory() { #if defined(_cygwin_) // unimplemented diff --git a/util/system/mlock.h b/util/system/mlock.h index f021c0fe67..389f65570d 100644 --- a/util/system/mlock.h +++ b/util/system/mlock.h @@ -22,10 +22,10 @@ enum ELockAllMemoryFlag { /** Since Linux 4.4, with LockCurrentMemory or LockFutureMemory or both, lock only pages that are or once they are present in memory. */ LockMemoryOnFault = 4, -}; +}; Y_DECLARE_FLAGS(ELockAllMemoryFlags, ELockAllMemoryFlag) Y_DECLARE_OPERATORS_FOR_FLAGS(ELockAllMemoryFlags) - + /** * Performs provided locking operation. * @@ -34,7 +34,7 @@ Y_DECLARE_OPERATORS_FOR_FLAGS(ELockAllMemoryFlags) * \param flags Locking operation to perform. */ void LockAllMemory(ELockAllMemoryFlags flags); - + /** * Unlocks whatever was locked with a previous call to `LockAllMemory`. * diff --git a/util/system/mutex_ut.cpp b/util/system/mutex_ut.cpp index c8d7caafa1..b7509dfe35 100644 --- a/util/system/mutex_ut.cpp +++ b/util/system/mutex_ut.cpp @@ -1,7 +1,7 @@ #include "mutex.h" #include "atomic.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/thread/pool.h> #include <util/random/random.h> diff --git a/util/system/nice_ut.cpp b/util/system/nice_ut.cpp index ae0051f285..5a49c0355a 100644 --- a/util/system/nice_ut.cpp +++ b/util/system/nice_ut.cpp @@ -2,7 +2,7 @@ #include "platform.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #ifdef _unix_ #include <sys/resource.h> diff --git a/util/system/pipe_ut.cpp b/util/system/pipe_ut.cpp index 6d53432de8..7bd6ed0c57 100644 --- a/util/system/pipe_ut.cpp +++ b/util/system/pipe_ut.cpp @@ -1,6 +1,6 @@ #include "pipe.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TPipeTest) { Y_UNIT_TEST(TestPipe) { diff --git a/util/system/platform_ut.cpp b/util/system/platform_ut.cpp index 9bfbce8315..aa2abf593e 100644 --- a/util/system/platform_ut.cpp +++ b/util/system/platform_ut.cpp @@ -1,6 +1,6 @@ #include "platform.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TPlatformTest: public TTestBase { UNIT_TEST_SUITE(TPlatformTest); diff --git a/util/system/progname_ut.cpp b/util/system/progname_ut.cpp index 11f3d9308b..7b740c8730 100644 --- a/util/system/progname_ut.cpp +++ b/util/system/progname_ut.cpp @@ -1,6 +1,6 @@ #include "progname.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TProgramNameTest) { Y_UNIT_TEST(TestIt) { diff --git a/util/system/rusage_ut.cpp b/util/system/rusage_ut.cpp index 0d4e0fe54b..ee0308c0cf 100644 --- a/util/system/rusage_ut.cpp +++ b/util/system/rusage_ut.cpp @@ -1,6 +1,6 @@ #include "rusage.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TRusageTest) { Y_UNIT_TEST(TestRusage) { diff --git a/util/system/rwlock_ut.cpp b/util/system/rwlock_ut.cpp index 2b384c05b3..b9484a9ac1 100644 --- a/util/system/rwlock_ut.cpp +++ b/util/system/rwlock_ut.cpp @@ -1,7 +1,7 @@ #include "rwlock.h" #include "atomic.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/thread/pool.h> #include <util/random/random.h> diff --git a/util/system/sanitizers_ut.cpp b/util/system/sanitizers_ut.cpp index 5de096e14b..e6fd50c9a2 100644 --- a/util/system/sanitizers_ut.cpp +++ b/util/system/sanitizers_ut.cpp @@ -1,7 +1,7 @@ #include "sanitizers.h" #include "sys_alloc.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(Sanitizers) { Y_UNIT_TEST(MarkAsIntentionallyLeaked) { diff --git a/util/system/shellcommand.cpp b/util/system/shellcommand.cpp index b1989b5c8c..ffe294a2d6 100644 --- a/util/system/shellcommand.cpp +++ b/util/system/shellcommand.cpp @@ -717,7 +717,7 @@ void TShellCommand::TImpl::OnFork(TPipes& pipes, sigset_t oldmask, char* const* } if (WorkDir.size()) { - NFs::SetCurrentWorkingDirectory(WorkDir); + NFs::SetCurrentWorkingDirectory(WorkDir); } if (CloseAllFdsOnExec) { diff --git a/util/system/shellcommand_ut.cpp b/util/system/shellcommand_ut.cpp index 9d849279d2..982cf4438c 100644 --- a/util/system/shellcommand_ut.cpp +++ b/util/system/shellcommand_ut.cpp @@ -6,8 +6,8 @@ #include "sigset.h" #include "spinlock.h" -#include <library/cpp/testing/unittest/env.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/env.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/dirut.h> #include <util/random/random.h> @@ -315,7 +315,7 @@ Y_UNIT_TEST_SUITE(TShellCommandTest) { UNIT_ASSERT(cmd.GetExitCode().Defined() && -15 == cmd.GetExitCode()); } sleep(1); - UNIT_ASSERT(!NFs::Exists(tmpfile)); + UNIT_ASSERT(!NFs::Exists(tmpfile)); } // this ut is unix-only (win has no signal mask) Y_UNIT_TEST(TestSignalMask) { @@ -346,7 +346,7 @@ Y_UNIT_TEST_SUITE(TShellCommandTest) { UNIT_ASSERT(TShellCommand::SHELL_ERROR == cmd.GetStatus() || TShellCommand::SHELL_FINISHED == cmd.GetStatus()); } sleep(1); - UNIT_ASSERT(!NFs::Exists(tmpfile)); + UNIT_ASSERT(!NFs::Exists(tmpfile)); // child proc should receive SIGTERM options.SetClearSignalMask(true); @@ -362,7 +362,7 @@ Y_UNIT_TEST_SUITE(TShellCommandTest) { UNIT_ASSERT(TShellCommand::SHELL_ERROR == cmd.GetStatus()); } sleep(1); - UNIT_ASSERT(!NFs::Exists(tmpfile)); + UNIT_ASSERT(!NFs::Exists(tmpfile)); // restore signal mask rc = SigProcMask(SIG_SETMASK, &oldmask, nullptr); diff --git a/util/system/shmat_ut.cpp b/util/system/shmat_ut.cpp index 9d92243ae7..f465593e5f 100644 --- a/util/system/shmat_ut.cpp +++ b/util/system/shmat_ut.cpp @@ -1,6 +1,6 @@ #include "shmat.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TTestSharedMemory) { Y_UNIT_TEST(TestInProc) { diff --git a/util/system/spinlock_ut.cpp b/util/system/spinlock_ut.cpp index e8639a6404..c24bf92d45 100644 --- a/util/system/spinlock_ut.cpp +++ b/util/system/spinlock_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "spinlock.h" diff --git a/util/system/src_location_ut.cpp b/util/system/src_location_ut.cpp index 5b86cb86ef..26036c2eb4 100644 --- a/util/system/src_location_ut.cpp +++ b/util/system/src_location_ut.cpp @@ -2,7 +2,7 @@ #include <util/string/builder.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static inline TString GenLoc() { return TStringBuilder() << __LOCATION__; diff --git a/util/system/src_root_ut.cpp b/util/system/src_root_ut.cpp index e9a675eb9a..d232aa8b71 100644 --- a/util/system/src_root_ut.cpp +++ b/util/system/src_root_ut.cpp @@ -1,13 +1,13 @@ #include "src_root.h" #include <util/folder/pathsplit.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestSourceRoot) { Y_UNIT_TEST(TestStrip) { // Reconstruct() converts "\" -> "/" on Windows const TString path = TPathSplit(__SOURCE_FILE_IMPL__.As<TStringBuf>()).Reconstruct(); - UNIT_ASSERT_EQUAL(path, "util" LOCSLASH_S "system" LOCSLASH_S "src_root_ut.cpp"); + UNIT_ASSERT_EQUAL(path, "util" LOCSLASH_S "system" LOCSLASH_S "src_root_ut.cpp"); } Y_UNIT_TEST(TestPrivateChopPrefixRoutine) { diff --git a/util/system/tempfile_ut.cpp b/util/system/tempfile_ut.cpp index e4a0923d0b..aba7268060 100644 --- a/util/system/tempfile_ut.cpp +++ b/util/system/tempfile_ut.cpp @@ -1,6 +1,6 @@ #include "tempfile.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/dirut.h> #include <util/generic/yexception.h> @@ -18,7 +18,7 @@ Y_UNIT_TEST_SUITE(TTempFileHandle) { tmp.FlushData(); UNIT_ASSERT_STRINGS_EQUAL(TUnbufferedFileInput(tmp.Name()).ReadAll(), "hello world\n"); } - UNIT_ASSERT(!NFs::Exists(path)); + UNIT_ASSERT(!NFs::Exists(path)); } Y_UNIT_TEST(InCurrentDir) { diff --git a/util/system/thread_ut.cpp b/util/system/thread_ut.cpp index d820898fd5..3d5c0ac15e 100644 --- a/util/system/thread_ut.cpp +++ b/util/system/thread_ut.cpp @@ -1,6 +1,6 @@ #include "thread.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <atomic> diff --git a/util/system/tls.h b/util/system/tls.h index 3c4f56dbeb..6742d2dba6 100644 --- a/util/system/tls.h +++ b/util/system/tls.h @@ -269,7 +269,7 @@ namespace NTls { THolder<void> mem(::operator new(sizeof(T))); THolder<T> newval(Constructor_->Construct(mem.Get())); - Y_UNUSED(mem.Release()); + Y_UNUSED(mem.Release()); Key_.Set((void*)newval.Get()); val = newval.Release(); } diff --git a/util/system/tls_ut.cpp b/util/system/tls_ut.cpp index e84d34b42a..c2d87b3a35 100644 --- a/util/system/tls_ut.cpp +++ b/util/system/tls_ut.cpp @@ -1,7 +1,7 @@ #include "tls.h" #include "thread.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TTestTLS) { struct X { diff --git a/util/system/type_name_ut.cpp b/util/system/type_name_ut.cpp index 86597f4232..deff6c5268 100644 --- a/util/system/type_name_ut.cpp +++ b/util/system/type_name_ut.cpp @@ -1,6 +1,6 @@ #include "type_name.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/yexception.h> #include <util/generic/fwd.h> diff --git a/util/system/types_ut.cpp b/util/system/types_ut.cpp index 19e40cef46..0412c0c678 100644 --- a/util/system/types_ut.cpp +++ b/util/system/types_ut.cpp @@ -1,6 +1,6 @@ #include "types.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestTypes) { Y_UNIT_TEST(TestScanf) { diff --git a/util/system/unaligned_mem_ut.cpp b/util/system/unaligned_mem_ut.cpp index 9de3f3e931..48c547dc5c 100644 --- a/util/system/unaligned_mem_ut.cpp +++ b/util/system/unaligned_mem_ut.cpp @@ -1,7 +1,7 @@ #include "unaligned_mem.h" -#include <library/cpp/testing/benchmark/bench.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/compiler.h> diff --git a/util/system/user_ut.cpp b/util/system/user_ut.cpp index 4f8a5ce2ef..ec86c2b490 100644 --- a/util/system/user_ut.cpp +++ b/util/system/user_ut.cpp @@ -1,6 +1,6 @@ #include "user.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TestUser) { Y_UNIT_TEST(TestNotEmpty) { diff --git a/util/system/ut/ya.make b/util/system/ut/ya.make index 127e7c261e..4b6dd01cdf 100644 --- a/util/system/ut/ya.make +++ b/util/system/ut/ya.make @@ -20,7 +20,7 @@ IF (OS_DARWIN) ENDIF() PEERDIR( - library/cpp/testing/benchmark + library/cpp/testing/benchmark ) SRCS( diff --git a/util/system/yassert.h b/util/system/yassert.h index 529823440c..831fbbd3d5 100644 --- a/util/system/yassert.h +++ b/util/system/yassert.h @@ -2,7 +2,7 @@ #include "defaults.h" #include "src_root.h" -#include "backtrace.h" +#include "backtrace.h" #if defined(_MSC_VER) #include <new> @@ -55,7 +55,7 @@ inline void YaDebugBreak() { } #undef Y_ASSERT - + #if !defined(NDEBUG) && !defined(__GCCXML__) #define Y_ASSERT(a) \ do { \ diff --git a/util/system/yassert_ut.cpp b/util/system/yassert_ut.cpp index ddd392666c..6c1da535a4 100644 --- a/util/system/yassert_ut.cpp +++ b/util/system/yassert_ut.cpp @@ -2,7 +2,7 @@ // yassert.h must be included before all headers #include "yassert.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(YassertTest) { Y_UNIT_TEST(TestAcsLikeFunctionCall) { diff --git a/util/thread/factory_ut.cpp b/util/thread/factory_ut.cpp index 647d96c901..d9a38c5e0e 100644 --- a/util/thread/factory_ut.cpp +++ b/util/thread/factory_ut.cpp @@ -1,7 +1,7 @@ #include "factory.h" #include "pool.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TThrPoolTest: public TTestBase { UNIT_TEST_SUITE(TThrPoolTest); diff --git a/util/thread/lfqueue.h b/util/thread/lfqueue.h index ab523631e4..8d7e6aaa4b 100644 --- a/util/thread/lfqueue.h +++ b/util/thread/lfqueue.h @@ -385,12 +385,12 @@ public: inline void Enqueue(TRef& t) { Queue.Enqueue(t.Get()); - Y_UNUSED(t.Release()); + Y_UNUSED(t.Release()); } inline void Enqueue(TRef&& t) { Queue.Enqueue(t.Get()); - Y_UNUSED(t.Release()); + Y_UNUSED(t.Release()); } inline bool IsEmpty() { diff --git a/util/thread/lfqueue_ut.cpp b/util/thread/lfqueue_ut.cpp index 83bca100cf..57ad8b4c34 100644 --- a/util/thread/lfqueue_ut.cpp +++ b/util/thread/lfqueue_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/threading/future/future.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/threading/future/future.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/generic/vector.h> diff --git a/util/thread/lfstack_ut.cpp b/util/thread/lfstack_ut.cpp index e20a838f95..b392648ec6 100644 --- a/util/thread/lfstack_ut.cpp +++ b/util/thread/lfstack_ut.cpp @@ -2,9 +2,9 @@ #include <util/system/atomic.h> #include <util/system/event.h> #include <util/generic/deque.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "lfstack.h" diff --git a/util/thread/pool.cpp b/util/thread/pool.cpp index 05fad02e9b..b5343e85be 100644 --- a/util/thread/pool.cpp +++ b/util/thread/pool.cpp @@ -671,7 +671,7 @@ bool IThreadPool::AddAndOwn(THolder<IObjectInQueue> obj) { auto owner = MakeHolder<TOwnedObjectInQueue>(std::move(obj)); bool added = Add(owner.Get()); if (added) { - Y_UNUSED(owner.Release()); + Y_UNUSED(owner.Release()); } return added; } diff --git a/util/thread/pool_ut.cpp b/util/thread/pool_ut.cpp index 893770d0c4..5b16095a58 100644 --- a/util/thread/pool_ut.cpp +++ b/util/thread/pool_ut.cpp @@ -1,6 +1,6 @@ #include "pool.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> #include <util/random/fast.h> diff --git a/util/thread/singleton_ut.cpp b/util/thread/singleton_ut.cpp index 164b1cc184..8740bca949 100644 --- a/util/thread/singleton_ut.cpp +++ b/util/thread/singleton_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "singleton.h" diff --git a/util/ysaveload_ut.cpp b/util/ysaveload_ut.cpp index 723c68f391..22016b9db3 100644 --- a/util/ysaveload_ut.cpp +++ b/util/ysaveload_ut.cpp @@ -1,6 +1,6 @@ #include "ysaveload.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/memory/pool.h> #include <util/stream/buffer.h> diff --git a/ydb/core/actorlib_impl/actor_bootstrapped_ut.cpp b/ydb/core/actorlib_impl/actor_bootstrapped_ut.cpp index 990330b321..364c12784e 100644 --- a/ydb/core/actorlib_impl/actor_bootstrapped_ut.cpp +++ b/ydb/core/actorlib_impl/actor_bootstrapped_ut.cpp @@ -1,5 +1,5 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/basics/appdata.h> diff --git a/ydb/core/actorlib_impl/actor_tracker_ut.cpp b/ydb/core/actorlib_impl/actor_tracker_ut.cpp index d804e3b924..ec5925bab3 100644 --- a/ydb/core/actorlib_impl/actor_tracker_ut.cpp +++ b/ydb/core/actorlib_impl/actor_tracker_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/basics/appdata.h> #include <library/cpp/actors/core/actor_bootstrapped.h> diff --git a/ydb/core/actorlib_impl/test_interconnect_ut.cpp b/ydb/core/actorlib_impl/test_interconnect_ut.cpp index 0d9d3535ef..ec154061bf 100644 --- a/ydb/core/actorlib_impl/test_interconnect_ut.cpp +++ b/ydb/core/actorlib_impl/test_interconnect_ut.cpp @@ -10,7 +10,7 @@ #include <library/cpp/http/io/headers.h> #include <library/cpp/json/json_reader.h> #include <library/cpp/json/json_value.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> #include <util/thread/factory.h> diff --git a/ydb/core/actorlib_impl/test_protocols_ut.cpp b/ydb/core/actorlib_impl/test_protocols_ut.cpp index 2e622406a0..e3501aae1b 100644 --- a/ydb/core/actorlib_impl/test_protocols_ut.cpp +++ b/ydb/core/actorlib_impl/test_protocols_ut.cpp @@ -4,8 +4,8 @@ #include <library/cpp/http/server/http_ex.h> #include <library/cpp/json/json_reader.h> #include <library/cpp/json/json_value.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <library/cpp/actors/core/actor_bootstrapped.h> #include <util/stream/null.h> #include <util/system/event.h> diff --git a/ydb/core/actorlib_impl/ut/ya.make b/ydb/core/actorlib_impl/ut/ya.make index f76d57807a..7cc27301c7 100644 --- a/ydb/core/actorlib_impl/ut/ya.make +++ b/ydb/core/actorlib_impl/ut/ya.make @@ -21,7 +21,7 @@ ENDIF() PEERDIR( library/cpp/actors/core library/cpp/actors/interconnect - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/testlib/actors ydb/core/testlib/basics diff --git a/ydb/core/actorlib_impl/ya.make b/ydb/core/actorlib_impl/ya.make index ba63f39617..fbccc50a5c 100644 --- a/ydb/core/actorlib_impl/ya.make +++ b/ydb/core/actorlib_impl/ya.make @@ -40,7 +40,7 @@ PEERDIR( library/cpp/actors/core library/cpp/actors/dnscachelib library/cpp/actors/protos - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/digest/crc32c library/cpp/html/pcdata library/cpp/lwtrace diff --git a/ydb/core/base/blobstorage_grouptype.h b/ydb/core/base/blobstorage_grouptype.h index cd38dfcfa8..3bd60dc627 100644 --- a/ydb/core/base/blobstorage_grouptype.h +++ b/ydb/core/base/blobstorage_grouptype.h @@ -8,7 +8,7 @@ #include <util/generic/list.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { diff --git a/ydb/core/base/blobstorage_grouptype_ut.cpp b/ydb/core/base/blobstorage_grouptype_ut.cpp index 1907b8e127..4a47513515 100644 --- a/ydb/core/base/blobstorage_grouptype_ut.cpp +++ b/ydb/core/base/blobstorage_grouptype_ut.cpp @@ -2,7 +2,7 @@ #include "blobstorage_grouptype.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/printf.h> #include <util/stream/null.h> diff --git a/ydb/core/base/localdb_ut.cpp b/ydb/core/base/localdb_ut.cpp index 9710d04ccf..dd989634b0 100644 --- a/ydb/core/base/localdb_ut.cpp +++ b/ydb/core/base/localdb_ut.cpp @@ -1,5 +1,5 @@ #include "localdb.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NLocalDb { diff --git a/ydb/core/base/logoblob_ut.cpp b/ydb/core/base/logoblob_ut.cpp index 75d9d2b833..619b6a4d9f 100644 --- a/ydb/core/base/logoblob_ut.cpp +++ b/ydb/core/base/logoblob_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" #include "logoblob.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> namespace NKikimr { diff --git a/ydb/core/base/shared_data_ut.cpp b/ydb/core/base/shared_data_ut.cpp index bf94a88f7e..53a337156e 100644 --- a/ydb/core/base/shared_data_ut.cpp +++ b/ydb/core/base/shared_data_ut.cpp @@ -1,6 +1,6 @@ #include "shared_data.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash.h> #include <util/generic/deque.h> diff --git a/ydb/core/base/statestorage_guardian_impl_ut.cpp b/ydb/core/base/statestorage_guardian_impl_ut.cpp index 00638ab480..df69bd0f4a 100644 --- a/ydb/core/base/statestorage_guardian_impl_ut.cpp +++ b/ydb/core/base/statestorage_guardian_impl_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" #include "statestorage_guardian_impl.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> namespace NKikimr { diff --git a/ydb/core/base/statestorage_ut.cpp b/ydb/core/base/statestorage_ut.cpp index 94a49082db..506edef6f9 100644 --- a/ydb/core/base/statestorage_ut.cpp +++ b/ydb/core/base/statestorage_ut.cpp @@ -1,7 +1,7 @@ #include "statestorage.h" #include <util/generic/xrange.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/base/ticket_parser.h b/ydb/core/base/ticket_parser.h index 62004b3a89..0c9b07f0f9 100644 --- a/ydb/core/base/ticket_parser.h +++ b/ydb/core/base/ticket_parser.h @@ -1,5 +1,5 @@ #pragma once -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <ydb/core/base/defs.h> #include <ydb/core/base/events.h> #include <ydb/core/protos/config.pb.h> diff --git a/ydb/core/base/tracing.h b/ydb/core/base/tracing.h index 40420e4541..be528ddd56 100644 --- a/ydb/core/base/tracing.h +++ b/ydb/core/base/tracing.h @@ -2,7 +2,7 @@ #include "defs.h" #include "traceid.h" #include <library/cpp/monlib/dynamic_counters/counters.h> -#include <library/cpp/threading/light_rw_lock/lightrwlock.h> +#include <library/cpp/threading/light_rw_lock/lightrwlock.h> namespace NKikimr { namespace NTracing { diff --git a/ydb/core/base/ut/ya.make b/ydb/core/base/ut/ya.make index 7d6b2f3546..ff0b8a5bb3 100644 --- a/ydb/core/base/ut/ya.make +++ b/ydb/core/base/ut/ya.make @@ -7,7 +7,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ) diff --git a/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp b/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp index af14a13f2d..56dc8e02d1 100644 --- a/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp +++ b/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp @@ -1,5 +1,5 @@ #include "queue_backpressure_client.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/monlib/dynamic_counters/counters.h> #include <library/cpp/actors/core/actorsystem.h> #include <library/cpp/actors/core/executor_pool_basic.h> diff --git a/ydb/core/blobstorage/backpressure/queue_backpressure_server_ut.cpp b/ydb/core/blobstorage/backpressure/queue_backpressure_server_ut.cpp index 4c6e357de6..dc7f985a61 100644 --- a/ydb/core/blobstorage/backpressure/queue_backpressure_server_ut.cpp +++ b/ydb/core/blobstorage/backpressure/queue_backpressure_server_ut.cpp @@ -1,5 +1,5 @@ #include "queue_backpressure_server.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/backpressure/ut/ya.make b/ydb/core/blobstorage/backpressure/ut/ya.make index ed318404ab..a71c71947f 100644 --- a/ydb/core/blobstorage/backpressure/ut/ya.make +++ b/ydb/core/blobstorage/backpressure/ut/ya.make @@ -14,7 +14,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage diff --git a/ydb/core/blobstorage/backpressure/ut_client/defs.h b/ydb/core/blobstorage/backpressure/ut_client/defs.h index 993165271b..49421eb39d 100644 --- a/ydb/core/blobstorage/backpressure/ut_client/defs.h +++ b/ydb/core/blobstorage/backpressure/ut_client/defs.h @@ -7,4 +7,4 @@ #include <ydb/core/blobstorage/backpressure/queue_backpressure_client.h> #include <ydb/core/testlib/basics/appdata.h> #include <ydb/core/testlib/basics/runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> diff --git a/ydb/core/blobstorage/base/batched_vec_ut.cpp b/ydb/core/blobstorage/base/batched_vec_ut.cpp index 2cbcd98a66..70b2a12cac 100644 --- a/ydb/core/blobstorage/base/batched_vec_ut.cpp +++ b/ydb/core/blobstorage/base/batched_vec_ut.cpp @@ -1,6 +1,6 @@ #include "batched_vec.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/base/bufferwithgaps_ut.cpp b/ydb/core/blobstorage/base/bufferwithgaps_ut.cpp index 71e1e1a5eb..8d72faf2e6 100644 --- a/ydb/core/blobstorage/base/bufferwithgaps_ut.cpp +++ b/ydb/core/blobstorage/base/bufferwithgaps_ut.cpp @@ -1,5 +1,5 @@ #include "bufferwithgaps.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using NKikimr::TBufferWithGaps; diff --git a/ydb/core/blobstorage/base/ptr_ut.cpp b/ydb/core/blobstorage/base/ptr_ut.cpp index 5554167ab2..8aacf5a953 100644 --- a/ydb/core/blobstorage/base/ptr_ut.cpp +++ b/ydb/core/blobstorage/base/ptr_ut.cpp @@ -1,6 +1,6 @@ #include "ptr.h" #include <util/system/atomic.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/base/ut/ya.make b/ydb/core/blobstorage/base/ut/ya.make index 3e223c0bfd..bc466695fa 100644 --- a/ydb/core/blobstorage/base/ut/ya.make +++ b/ydb/core/blobstorage/base/ut/ya.make @@ -14,7 +14,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/erasure ydb/core/protos diff --git a/ydb/core/blobstorage/crypto/crypto_ut.cpp b/ydb/core/blobstorage/crypto/crypto_ut.cpp index 98a83ab9c5..e1049afef8 100644 --- a/ydb/core/blobstorage/crypto/crypto_ut.cpp +++ b/ydb/core/blobstorage/crypto/crypto_ut.cpp @@ -1,5 +1,5 @@ #include <ydb/core/blobstorage/crypto/crypto.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/datetime/cputimer.h> #include <util/generic/buffer.h> #include <util/generic/string.h> diff --git a/ydb/core/blobstorage/crypto/poly1305_vec.cpp b/ydb/core/blobstorage/crypto/poly1305_vec.cpp index 25f8308f79..89c0114d03 100644 --- a/ydb/core/blobstorage/crypto/poly1305_vec.cpp +++ b/ydb/core/blobstorage/crypto/poly1305_vec.cpp @@ -16,7 +16,7 @@ * block size */ -#include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support +#include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support #include <stdint.h> #define INLINE inline diff --git a/ydb/core/blobstorage/crypto/ut/ut_helpers.h b/ydb/core/blobstorage/crypto/ut/ut_helpers.h index e9695541df..3810c4d715 100644 --- a/ydb/core/blobstorage/crypto/ut/ut_helpers.h +++ b/ydb/core/blobstorage/crypto/ut/ut_helpers.h @@ -1,7 +1,7 @@ #pragma once #include <library/cpp/actors/util/rope.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/align.h> #include <utility> diff --git a/ydb/core/blobstorage/crypto/ya.make b/ydb/core/blobstorage/crypto/ya.make index 4540b3e837..adf63a0af8 100644 --- a/ydb/core/blobstorage/crypto/ya.make +++ b/ydb/core/blobstorage/crypto/ya.make @@ -24,7 +24,7 @@ ENDIF() PEERDIR( contrib/libs/t1ha - library/cpp/sse + library/cpp/sse ) END() diff --git a/ydb/core/blobstorage/dsproxy/dsproxy.h b/ydb/core/blobstorage/dsproxy/dsproxy.h index 27592e971f..28ea15efd1 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy.h +++ b/ydb/core/blobstorage/dsproxy/dsproxy.h @@ -18,7 +18,7 @@ #include <library/cpp/actors/core/interconnect.h> #include <ydb/core/base/appdata.h> #include <ydb/core/base/group_stat.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/hash_set.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_blackboard.h b/ydb/core/blobstorage/dsproxy/dsproxy_blackboard.h index fe926648a8..166b8e9014 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_blackboard.h +++ b/ydb/core/blobstorage/dsproxy/dsproxy_blackboard.h @@ -7,7 +7,7 @@ #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h> #include <ydb/core/util/fragmented_buffer.h> #include <ydb/core/util/interval_set.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_get.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_get.cpp index 9b08b41861..24412102ea 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_get.cpp +++ b/ydb/core/blobstorage/dsproxy/dsproxy_get.cpp @@ -4,7 +4,7 @@ #include <ydb/core/blobstorage/vdisk/common/vdisk_events.h> #include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h> #include <ydb/core/blobstorage/base/wilson_events.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/digest/crc32c/crc32c.h> #include <util/generic/set.h> #include <util/system/datetime.h> diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_base.h b/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_base.h index c4b5c76f39..2ecd78a3e3 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_base.h +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_base.h @@ -4,7 +4,7 @@ #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_sets.h> #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_partlayout.h> #include <library/cpp/actors/core/actor_coroutine.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_get_ut.cpp b/ydb/core/blobstorage/dsproxy/ut/dsproxy_get_ut.cpp index 85e16c2aef..4bcbd62fab 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_get_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_get_ut.cpp @@ -8,8 +8,8 @@ #include <ydb/core/blobstorage/dsproxy/dsproxy_get_impl.h> #include <ydb/core/blobstorage/dsproxy/dsproxy_put_impl.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/shuffle.h> #include <util/stream/str.h> diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp b/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp index d2d39a3550..426d550737 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp @@ -8,7 +8,7 @@ #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/actor_helpers.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_quorum_tracker_ut.cpp b/ydb/core/blobstorage/dsproxy/ut/dsproxy_quorum_tracker_ut.cpp index dcdd375c18..756c542ef0 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_quorum_tracker_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_quorum_tracker_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/blobstorage/dsproxy/dsproxy_quorum_tracker.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_sequence_ut.cpp b/ydb/core/blobstorage/dsproxy/ut/dsproxy_sequence_ut.cpp index fdd7a92ea3..4c3deefab6 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_sequence_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_sequence_ut.cpp @@ -14,7 +14,7 @@ #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/basics/appdata.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NBlobStorageProxySequenceTest { diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_vdisk_mock_ut.h b/ydb/core/blobstorage/dsproxy/ut/dsproxy_vdisk_mock_ut.h index 0a17c046e7..bb71797670 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_vdisk_mock_ut.h +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_vdisk_mock_ut.h @@ -10,7 +10,7 @@ #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/actor_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/dsproxy/ut/ya.make b/ydb/core/blobstorage/dsproxy/ut/ya.make index 76825e572b..3f2a98e28c 100644 --- a/ydb/core/blobstorage/dsproxy/ut/ya.make +++ b/ydb/core/blobstorage/dsproxy/ut/ya.make @@ -21,7 +21,7 @@ ENDIF() PEERDIR( library/cpp/actors/core - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/base diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp b/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp index 13b1bec356..4193c599e3 100644 --- a/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp @@ -36,8 +36,8 @@ #include <library/cpp/actors/protos/services_common.pb.h> #include <library/cpp/actors/util/affinity.h> #include <library/cpp/svnversion/svnversion.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/folder/dirut.h> #include <util/folder/tempdir.h> diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/ya.make b/ydb/core/blobstorage/dsproxy/ut_fat/ya.make index 6544b16ff1..88b0c2d610 100644 --- a/ydb/core/blobstorage/dsproxy/ut_fat/ya.make +++ b/ydb/core/blobstorage/dsproxy/ut_fat/ya.make @@ -22,7 +22,7 @@ ENDIF() PEERDIR( library/cpp/actors/protos library/cpp/actors/util - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/base diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_blobmap_ut.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_blobmap_ut.cpp index 9147c6a871..1705ab18f8 100644 --- a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_blobmap_ut.cpp +++ b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_blobmap_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> #include "blobstorage_groupinfo_blobmap.h" #include "blobstorage_groupinfo_iter.h" diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_iter_ut.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_iter_ut.cpp index 3810d6ef98..efc473e013 100644 --- a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_iter_ut.cpp +++ b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_iter_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "blobstorage_groupinfo_iter.h" using namespace NKikimr; diff --git a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_ut.cpp b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_ut.cpp index e93d36aaa2..eecaf2fd9c 100644 --- a/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_ut.cpp +++ b/ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_ut.cpp @@ -3,7 +3,7 @@ #include "blobstorage_groupinfo_sets.h" #include "blobstorage_groupinfo_partlayout.h" #include <ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/groupinfo/ut/ya.make b/ydb/core/blobstorage/groupinfo/ut/ya.make index 78d020c48b..91602a75a2 100644 --- a/ydb/core/blobstorage/groupinfo/ut/ya.make +++ b/ydb/core/blobstorage/groupinfo/ut/ya.make @@ -14,7 +14,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/base diff --git a/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp b/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp index 59d3cb999c..6251a78efa 100644 --- a/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp +++ b/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk.h> #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.h> #include <library/cpp/actors/protos/services_common.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> #include <util/folder/tempdir.h> #include <util/folder/path.h> diff --git a/ydb/core/blobstorage/incrhuge/ut/incrhuge_id_dict_ut.cpp b/ydb/core/blobstorage/incrhuge/ut/incrhuge_id_dict_ut.cpp index 0d66d7f13a..185f49fc4c 100644 --- a/ydb/core/blobstorage/incrhuge/ut/incrhuge_id_dict_ut.cpp +++ b/ydb/core/blobstorage/incrhuge/ut/incrhuge_id_dict_ut.cpp @@ -1,5 +1,5 @@ #include <ydb/core/blobstorage/incrhuge/incrhuge_id_dict.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr::NIncrHuge; diff --git a/ydb/core/blobstorage/incrhuge/ut/incrhuge_log_merger_ut.cpp b/ydb/core/blobstorage/incrhuge/ut/incrhuge_log_merger_ut.cpp index 617f7f68a3..598e8a75a2 100644 --- a/ydb/core/blobstorage/incrhuge/ut/incrhuge_log_merger_ut.cpp +++ b/ydb/core/blobstorage/incrhuge/ut/incrhuge_log_merger_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/blobstorage/incrhuge/incrhuge_keeper_log.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp b/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp index e3c74cce7b..bad71037aa 100644 --- a/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp +++ b/ydb/core/blobstorage/nodewarden/blobstorage_node_warden_ut.cpp @@ -24,7 +24,7 @@ #include <util/stream/file.h> #include <google/protobuf/text_format.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> const bool STRAND_PDISK = true; #ifndef NDEBUG diff --git a/ydb/core/blobstorage/nodewarden/ut_sequence/dsproxy_config_retrieval.cpp b/ydb/core/blobstorage/nodewarden/ut_sequence/dsproxy_config_retrieval.cpp index 040411e06c..b6b7c7141c 100644 --- a/ydb/core/blobstorage/nodewarden/ut_sequence/dsproxy_config_retrieval.cpp +++ b/ydb/core/blobstorage/nodewarden/ut_sequence/dsproxy_config_retrieval.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/blobstorage/base/blobstorage_events.h> #include <ydb/core/blobstorage/crypto/default.h> #include <ydb/core/blobstorage/nodewarden/node_warden_impl.h> diff --git a/ydb/core/blobstorage/other/mon_blob_range_page.cpp b/ydb/core/blobstorage/other/mon_blob_range_page.cpp index f4797d62e2..4568ab214f 100644 --- a/ydb/core/blobstorage/other/mon_blob_range_page.cpp +++ b/ydb/core/blobstorage/other/mon_blob_range_page.cpp @@ -3,7 +3,7 @@ #include <library/cpp/json/writer/json.h> #include <library/cpp/json/writer/json_value.h> #include <library/cpp/monlib/service/pages/templates.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/other/mon_get_blob_page.cpp b/ydb/core/blobstorage/other/mon_get_blob_page.cpp index 95308879a3..3e95455230 100644 --- a/ydb/core/blobstorage/other/mon_get_blob_page.cpp +++ b/ydb/core/blobstorage/other/mon_get_blob_page.cpp @@ -1,7 +1,7 @@ #include "mon_get_blob_page.h" #include <ydb/core/base/blobstorage.h> #include <library/cpp/monlib/service/pages/templates.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/other/mon_vdisk_stream.cpp b/ydb/core/blobstorage/other/mon_vdisk_stream.cpp index 90b95b4926..4003bfb530 100644 --- a/ydb/core/blobstorage/other/mon_vdisk_stream.cpp +++ b/ydb/core/blobstorage/other/mon_vdisk_stream.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/blobstorage.h> #include <ydb/core/blobstorage/base/blobstorage_events.h> #include <library/cpp/monlib/service/pages/templates.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/other/ya.make b/ydb/core/blobstorage/other/ya.make index 650c118dad..071fb997eb 100644 --- a/ydb/core/blobstorage/other/ya.make +++ b/ydb/core/blobstorage/other/ya.make @@ -8,7 +8,7 @@ OWNER( PEERDIR( library/cpp/json/writer library/cpp/monlib/service/pages - library/cpp/threading/future + library/cpp/threading/future ydb/core/base ydb/core/blobstorage/base ) diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp index 90816f5a22..b4848b2b69 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp @@ -8,7 +8,7 @@ #include <ydb/core/control/immediate_control_board_wrapper.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/dirut.h> #include <util/folder/tempdir.h> #include <util/system/atomic.h> @@ -130,7 +130,7 @@ TString CreateFile(const char *baseDir, ui32 dataSize) { file.Resize(dataSize); file.Close(); } - UNIT_ASSERT_EQUAL_C(NFs::Exists(path), true, "File " << path << " does not exist."); + UNIT_ASSERT_EQUAL_C(NFs::Exists(path), true, "File " << path << " does not exist."); return path; } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h index 2baba160c5..fa0becc6ae 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h @@ -8,7 +8,7 @@ #include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { namespace NPDisk { diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_crypto_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_crypto_ut.cpp index 1ca02078cf..f3a1ac2359 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_crypto_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_crypto_ut.cpp @@ -1,7 +1,7 @@ #include "defs.h" #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_crypto.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/printf.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h index 6bf5c0695d..2ae44ce9aa 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.h @@ -34,8 +34,8 @@ #include <library/cpp/actors/protos/services_common.pb.h> #include <library/cpp/actors/util/affinity.h> #include <library/cpp/svnversion/svnversion.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/folder/dirut.h> #include <util/generic/hash.h> diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_countedqueuemanyone.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_countedqueuemanyone.h index a0ac88b250..12a552a819 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_countedqueuemanyone.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_countedqueuemanyone.h @@ -2,8 +2,8 @@ #include "defs.h" #include <ydb/core/util/queue_oneone_inplace.h> #include <util/system/condvar.h> -#include <library/cpp/threading/queue/mpsc_vinfarr_obstructive.h> -#include <library/cpp/threading/queue/mpsc_read_as_filled.h> +#include <library/cpp/threading/queue/mpsc_vinfarr_obstructive.h> +#include <library/cpp/threading/queue/mpsc_read_as_filled.h> namespace NKikimr { namespace NPDisk { diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp index 97938cfcdc..817dcbfd53 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp @@ -16,7 +16,7 @@ #include <ydb/core/blobstorage/crypto/default.h> #include <ydb/library/pdisk_io/aio.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #include <util/system/tempfile.h> #include <cstring> diff --git a/ydb/core/blobstorage/pdisk/ut/ya.make b/ydb/core/blobstorage/pdisk/ut/ya.make index 9eab049637..82bd4681fe 100644 --- a/ydb/core/blobstorage/pdisk/ut/ya.make +++ b/ydb/core/blobstorage/pdisk/ut/ya.make @@ -24,7 +24,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/blobstorage/lwtrace_probes ydb/core/testlib/actors diff --git a/ydb/core/blobstorage/pdisk/ya.make b/ydb/core/blobstorage/pdisk/ya.make index 464191b8c0..e78bd62b3d 100644 --- a/ydb/core/blobstorage/pdisk/ya.make +++ b/ydb/core/blobstorage/pdisk/ya.make @@ -11,7 +11,7 @@ PEERDIR( library/cpp/actors/core library/cpp/actors/protos library/cpp/actors/util - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/lwtrace library/cpp/monlib/dynamic_counters/percentile library/cpp/monlib/service/pages diff --git a/ydb/core/blobstorage/storagepoolmon/ut/storagepoolmon_ut.cpp b/ydb/core/blobstorage/storagepoolmon/ut/storagepoolmon_ut.cpp index 2af551d8f7..cd769c5b26 100644 --- a/ydb/core/blobstorage/storagepoolmon/ut/storagepoolmon_ut.cpp +++ b/ydb/core/blobstorage/storagepoolmon/ut/storagepoolmon_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/blobstorage/storagepoolmon/storagepool_counters.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NBlobStorageStoragePoolMonTest { diff --git a/ydb/core/blobstorage/storagepoolmon/ut/ya.make b/ydb/core/blobstorage/storagepoolmon/ut/ya.make index 7f062b3da0..6a9753dcc6 100644 --- a/ydb/core/blobstorage/storagepoolmon/ut/ya.make +++ b/ydb/core/blobstorage/storagepoolmon/ut/ya.make @@ -20,7 +20,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/blobstorage/storagepoolmon ydb/core/testlib diff --git a/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h b/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h index 7e0bfa05e0..6074e47620 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h +++ b/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h @@ -14,7 +14,7 @@ #include <library/cpp/lwtrace/all.h> #include <library/cpp/monlib/dynamic_counters/counters.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/tempdir.h> #include <util/system/atomic.h> diff --git a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/pdiskfit.cpp b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/pdiskfit.cpp index cb4ec086f9..60e149bd4a 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/pdiskfit.cpp +++ b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/pdiskfit.cpp @@ -1,7 +1,7 @@ #include <ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h> #include <ydb/core/blobstorage/ut_pdiskfit/lib/basic_test.h> -#include <library/cpp/getopt/last_getopt.h> -#include <library/cpp/string_utils/parse_size/parse_size.h> +#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/string_utils/parse_size/parse_size.h> using namespace NLastGetopt; diff --git a/ydb/core/blobstorage/ut_pdiskfit/ut/main.cpp b/ydb/core/blobstorage/ut_pdiskfit/ut/main.cpp index 011d7cf839..419fed8f82 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/ut/main.cpp +++ b/ydb/core/blobstorage/ut_pdiskfit/ut/main.cpp @@ -1,6 +1,6 @@ #include <ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h> #include <ydb/core/blobstorage/ut_pdiskfit/lib/basic_test.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> diff --git a/ydb/core/blobstorage/ut_vdisk/huge_migration_ut.cpp b/ydb/core/blobstorage/ut_vdisk/huge_migration_ut.cpp index db1731d569..0719c2d6be 100644 --- a/ydb/core/blobstorage/ut_vdisk/huge_migration_ut.cpp +++ b/ydb/core/blobstorage/ut_vdisk/huge_migration_ut.cpp @@ -1,6 +1,6 @@ #include "defaults.h" #include "gen_restarts.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> /////////////////////////////////////////////////////////////////////////////////////////////////////// // Test Suite for checking migration of HugeBlobMap, i.e. we change diapason of huge blobs and diff --git a/ydb/core/blobstorage/ut_vdisk/lib/astest.h b/ydb/core/blobstorage/ut_vdisk/lib/astest.h index 2cf254eff2..7614179e1d 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/astest.h +++ b/ydb/core/blobstorage/ut_vdisk/lib/astest.h @@ -1,8 +1,8 @@ #pragma once #include "defs.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <library/cpp/actors/core/executor_pool_basic.h> #include <library/cpp/actors/core/executor_pool_io.h> #include <library/cpp/actors/core/scheduler_basic.h> diff --git a/ydb/core/blobstorage/ut_vdisk/lib/http_client.cpp b/ydb/core/blobstorage/ut_vdisk/lib/http_client.cpp index abde48cedf..280ebea590 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/http_client.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/http_client.cpp @@ -4,7 +4,7 @@ #include <util/network/socket.h> #include <util/stream/output.h> #include <util/string/cast.h> -#include <library/cpp/string_utils/url/url.h> +#include <library/cpp/string_utils/url/url.h> #include <util/string/join.h> #include <util/string/split.h> diff --git a/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp b/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp index b2c020c3d2..9c336f3f34 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp @@ -13,7 +13,7 @@ #include <library/cpp/actors/core/scheduler_basic.h> #include <library/cpp/actors/interconnect/interconnect.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/folder/dirut.h> diff --git a/ydb/core/blobstorage/ut_vdisk/lib/prepare.h b/ydb/core/blobstorage/ut_vdisk/lib/prepare.h index fc5da8d342..55988c33ae 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/prepare.h +++ b/ydb/core/blobstorage/ut_vdisk/lib/prepare.h @@ -2,7 +2,7 @@ #include "defs.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/event.h> #include <util/system/condvar.h> diff --git a/ydb/core/blobstorage/ut_vdisk/lib/test_brokendevice.cpp b/ydb/core/blobstorage/ut_vdisk/lib/test_brokendevice.cpp index 74bfddbcab..6d4643cd07 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/test_brokendevice.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/test_brokendevice.cpp @@ -2,7 +2,7 @@ #include "helpers.h" #include <ydb/core/blobstorage/vdisk/common/vdisk_pdiskctx.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/ut_vdisk/lib/test_load.cpp b/ydb/core/blobstorage/ut_vdisk/lib/test_load.cpp index 4222ef4d85..864689a747 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/test_load.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/test_load.cpp @@ -1,7 +1,7 @@ #include "test_load.h" #include "helpers.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/ut_vdisk/lib/test_outofspace.cpp b/ydb/core/blobstorage/ut_vdisk/lib/test_outofspace.cpp index 43c0a68e4b..d3e9091928 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/test_outofspace.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/test_outofspace.cpp @@ -1,7 +1,7 @@ #include "test_outofspace.h" #include "helpers.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/ut_vdisk/lib/ya.make b/ydb/core/blobstorage/ut_vdisk/lib/ya.make index c704427fd6..d64cebb868 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/ya.make +++ b/ydb/core/blobstorage/ut_vdisk/lib/ya.make @@ -52,8 +52,8 @@ PEERDIR( library/cpp/actors/protos library/cpp/http/io library/cpp/openssl/io - library/cpp/string_utils/url - library/cpp/testing/unittest + library/cpp/string_utils/url + library/cpp/testing/unittest ydb/core/base ydb/core/blobstorage ydb/core/blobstorage/backpressure diff --git a/ydb/core/blobstorage/ut_vdisk/mon_reregister_ut.cpp b/ydb/core/blobstorage/ut_vdisk/mon_reregister_ut.cpp index 36a2eca81f..a6c451b78f 100644 --- a/ydb/core/blobstorage/ut_vdisk/mon_reregister_ut.cpp +++ b/ydb/core/blobstorage/ut_vdisk/mon_reregister_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <library/cpp/actors/core/executor_pool_basic.h> #include <library/cpp/actors/core/executor_pool_io.h> #include <library/cpp/actors/core/scheduler_basic.h> diff --git a/ydb/core/blobstorage/ut_vdisk/vdisk_test.cpp b/ydb/core/blobstorage/ut_vdisk/vdisk_test.cpp index 694828c9f8..ca240b17a0 100644 --- a/ydb/core/blobstorage/ut_vdisk/vdisk_test.cpp +++ b/ydb/core/blobstorage/ut_vdisk/vdisk_test.cpp @@ -13,7 +13,7 @@ #include <ydb/core/blobstorage/ut_vdisk/lib/test_simplebs.h> #include <ydb/core/blobstorage/ut_vdisk/lib/test_synclog.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/valgrind.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_algo_ut.cpp b/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_algo_ut.cpp index 9cbe02a2e9..61e12afe25 100644 --- a/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_algo_ut.cpp +++ b/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_algo_ut.cpp @@ -2,7 +2,7 @@ #include "blobstorage_anubis_algo.h" #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h> #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_sets.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/ya.make b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/ya.make index c9f15ece4a..5364828223 100644 --- a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ) diff --git a/ydb/core/blobstorage/vdisk/common/circlebuf_ut.cpp b/ydb/core/blobstorage/vdisk/common/circlebuf_ut.cpp index 2623c6fc64..b6ef0c70d3 100644 --- a/ydb/core/blobstorage/vdisk/common/circlebuf_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/circlebuf_ut.cpp @@ -1,5 +1,5 @@ #include "circlebuf.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> diff --git a/ydb/core/blobstorage/vdisk/common/circlebufstream_ut.cpp b/ydb/core/blobstorage/vdisk/common/circlebufstream_ut.cpp index cfb9335a8d..bb7ab330f3 100644 --- a/ydb/core/blobstorage/vdisk/common/circlebufstream_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/circlebufstream_ut.cpp @@ -1,5 +1,5 @@ #include "circlebufstream.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp b/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp index 79022e4ab3..77bbd0a453 100644 --- a/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp @@ -1,5 +1,5 @@ #include "memusage.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; diff --git a/ydb/core/blobstorage/vdisk/common/ut/ya.make b/ydb/core/blobstorage/vdisk/common/ut/ya.make index 52db6aa8c4..50f6635a9b 100644 --- a/ydb/core/blobstorage/vdisk/common/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/common/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/groupinfo diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_config_ut.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_config_ut.cpp index 941df64a10..00a89c9a95 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_config_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_config_ut.cpp @@ -1,5 +1,5 @@ #include "vdisk_config.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_events.h b/ydb/core/blobstorage/vdisk/common/vdisk_events.h index 47fbd959c9..556ac7b667 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_events.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_events.h @@ -17,7 +17,7 @@ #include <ydb/core/util/pb.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/digest/multi.h> #include <util/generic/maybe.h> diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_lsnmngr_ut.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_lsnmngr_ut.cpp index b581b758bc..a96e0a67ca 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_lsnmngr_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_lsnmngr_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" #include "vdisk_lsnmngr.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> #include <util/stream/null.h> #include <util/system/thread.h> diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_outofspace_ut.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_outofspace_ut.cpp index e59a7c607a..b20b4a8070 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_outofspace_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_outofspace_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" #include "vdisk_outofspace.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> #include <util/stream/null.h> #include <util/system/thread.h> diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_pdisk_error_ut.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_pdisk_error_ut.cpp index 3b6103cfa3..a0b7963bb2 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_pdisk_error_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_pdisk_error_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" #include "vdisk_pdisk_error.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #define STR Cerr diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_syncneighbors_ut.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_syncneighbors_ut.cpp index e03e6a461c..796c6334db 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_syncneighbors_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_syncneighbors_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "vdisk_syncneighbors.h" using namespace NKikimr; diff --git a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp index ed64a07678..64db457309 100644 --- a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp +++ b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_hullhuge.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ctx_ut.cpp b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ctx_ut.cpp index c6b0ff7a88..63afd78528 100644 --- a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ctx_ut.cpp +++ b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ctx_ut.cpp @@ -2,7 +2,7 @@ #include "blobstorage_hullhugerecovery.h" #include "blobstorage_hullhugeheap.h" #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #include <util/generic/ptr.h> diff --git a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ut.cpp b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ut.cpp index 638269fdfd..4c3f0e3301 100644 --- a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ut.cpp +++ b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_hullhugeheap.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugerecovery_ut.cpp b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugerecovery_ut.cpp index 809f9e5ca2..e0d6253c92 100644 --- a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugerecovery_ut.cpp +++ b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugerecovery_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_hullhugerecovery.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/huge/top_ut.cpp b/ydb/core/blobstorage/vdisk/huge/top_ut.cpp index b3a45696f6..f78645456d 100644 --- a/ydb/core/blobstorage/vdisk/huge/top_ut.cpp +++ b/ydb/core/blobstorage/vdisk/huge/top_ut.cpp @@ -1,5 +1,5 @@ #include "top.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/huge/ut/ya.make b/ydb/core/blobstorage/vdisk/huge/ut/ya.make index 2a638ac565..8682c9d5a8 100644 --- a/ydb/core/blobstorage/vdisk/huge/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/huge/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/barriers_tree_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/barriers/barriers_tree_ut.cpp index ab99707ac8..a3742c4ed8 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/barriers/barriers_tree_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/barriers_tree_ut.cpp @@ -1,6 +1,6 @@ #include "barriers_tree.h" #include <util/random/fast.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/ya.make b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/ya.make index 26c55d2346..4987817532 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/vdisk/common diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob_ut.cpp index 5774a53a39..3a5a9bf394 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_blob.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullsatisfactionrank_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullsatisfactionrank_ut.cpp index 2af22dc6f5..cda31a6e41 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullsatisfactionrank_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullsatisfactionrank_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_hullsatisfactionrank.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullstorageratio_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullstorageratio_ut.cpp index 8c5ce32eb5..01cc49e57c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullstorageratio_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullstorageratio_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_hullstorageratio.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/hullbase_barrier_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/base/hullbase_barrier_ut.cpp index 644c9290a8..37acd75d16 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/hullbase_barrier_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/base/hullbase_barrier_ut.cpp @@ -1,5 +1,5 @@ #include "hullbase_barrier.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/hullds_generic_it_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/base/hullds_generic_it_ut.cpp index 34739e8ee4..aa69f1a677 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/hullds_generic_it_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/base/hullds_generic_it_ut.cpp @@ -1,6 +1,6 @@ #include "hullds_generic_it.h" #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/ut/ya.make b/ydb/core/blobstorage/vdisk/hulldb/base/ut/ya.make index 5c7e85bf6c..b8a6c8c9fd 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/hulldb/base/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/vdisk/common diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp index 144cc818c6..c0841ba956 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp @@ -1,6 +1,6 @@ #include "fresh_appendix.h" #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp index 061f2b71ed..9d6ca017fd 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/hullbase_logoblob.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_datasnap.h b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_datasnap.h index fd9028f936..f31e2c8be7 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_datasnap.h +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_datasnap.h @@ -2,7 +2,7 @@ #include "defs.h" #include "fresh_segment.h" -#include <library/cpp/threading/skip_list/skiplist.h> +#include <library/cpp/threading/skip_list/skiplist.h> #include <util/system/align.h> #include <util/generic/set.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h index 3ebf8e8bea..78345be31a 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h @@ -7,7 +7,7 @@ #include <ydb/core/blobstorage/base/utility.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/hullbase_logoblob.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob.h> -#include <library/cpp/threading/skip_list/skiplist.h> +#include <library/cpp/threading/skip_list/skiplist.h> #include <library/cpp/monlib/service/pages/templates.h> #include <util/system/align.h> #include <util/generic/set.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp index d634bfd707..be1396a046 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_settings.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_blob.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/hullbase_logoblob.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/snap_vec_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/snap_vec_ut.cpp index d4cac3ca5b..9da191f94d 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/snap_vec_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/snap_vec_ut.cpp @@ -1,6 +1,6 @@ #include "snap_vec.h" #include <ydb/core/blobstorage/base/utility.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> // change to Cerr if you want logging diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/ya.make b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/ya.make index 52b4282cb3..e637bd2455 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/vdisk/common diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/blobstorage_hullwritesst_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/generic/blobstorage_hullwritesst_ut.cpp index 2bd6de3d43..3cb5925f49 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/generic/blobstorage_hullwritesst_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/generic/blobstorage_hullwritesst_ut.cpp @@ -4,7 +4,7 @@ #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/hullbase_logoblob.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/hullbase_block.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst_it_all_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst_it_all_ut.cpp index f965e75f61..b44fc08418 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst_it_all_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst_it_all_ut.cpp @@ -1,7 +1,7 @@ #include "hullds_sstvec_it.h" #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h> #include <ydb/core/blobstorage/vdisk/hulldb/base/hullbase_logoblob.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/ya.make b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/ya.make index ed64d664b2..d41f7dbbbf 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/vdisk/common diff --git a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp index 1af113c2aa..aab0f4fe5e 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp @@ -1,5 +1,5 @@ #include "hullds_cache_block.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hulldb/ut/ya.make b/ydb/core/blobstorage/vdisk/hulldb/ut/ya.make index a4a6c7f7c1..c3fc788668 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/hulldb/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage diff --git a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullcompactdeferredqueue_ut.cpp b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullcompactdeferredqueue_ut.cpp index 682e9f21c1..3c5854a4fd 100644 --- a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullcompactdeferredqueue_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hullcompactdeferredqueue_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/blobstorage/vdisk/hulldb/base/hullds_arena.h> #include <util/random/shuffle.h> #include <util/random/fast.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> diff --git a/ydb/core/blobstorage/vdisk/hullop/blobstorage_readbatch_ut.cpp b/ydb/core/blobstorage/vdisk/hullop/blobstorage_readbatch_ut.cpp index 2ec3c228f0..cfc3bfaf16 100644 --- a/ydb/core/blobstorage/vdisk/hullop/blobstorage_readbatch_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hullop/blobstorage_readbatch_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_readbatch.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> #include <util/generic/bitmap.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp_ut.cpp b/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp_ut.cpp index f95ace015a..51e537ff43 100644 --- a/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hullop/hullop_delayedresp_ut.cpp @@ -1,5 +1,5 @@ #include "hullop_delayedresp.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #define STR Cnull diff --git a/ydb/core/blobstorage/vdisk/hullop/ut/ya.make b/ydb/core/blobstorage/vdisk/hullop/ut/ya.make index c6a5556163..e6013f9095 100644 --- a/ydb/core/blobstorage/vdisk/hullop/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/hullop/ut/ya.make @@ -22,7 +22,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/blobstorage/pdisk ) diff --git a/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_matrix_ut.cpp b/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_matrix_ut.cpp index e3373f054c..0585dbe96c 100644 --- a/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_matrix_ut.cpp +++ b/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_matrix_ut.cpp @@ -1,7 +1,7 @@ #include "blobstorage_ingress_matrix.h" #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #define STR Cnull diff --git a/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_ut.cpp b/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_ut.cpp index 82cf659f5a..984ce2c272 100644 --- a/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_ut.cpp +++ b/ydb/core/blobstorage/vdisk/ingress/blobstorage_ingress_ut.cpp @@ -1,6 +1,6 @@ #include "blobstorage_ingress.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/ingress/ut/ya.make b/ydb/core/blobstorage/vdisk/ingress/ut/ya.make index c9be2d9d4a..31ba39a08d 100644 --- a/ydb/core/blobstorage/vdisk/ingress/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/ingress/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage/base diff --git a/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp b/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp index 8f5b39bab8..2c9d70042f 100644 --- a/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp +++ b/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/protos/base.pb.h> #include <ydb/core/protos/blobstorage.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { @@ -177,7 +177,7 @@ namespace NKikimr { *result.MutableTimestamps() = GetMaxTTimestamps(); for (ui64 idx = 0; idx < defaultQueryCount; ++idx) { - Y_PROTOBUF_SUPPRESS_NODISCARD result.ParseFromString(result.SerializeAsString()); + Y_PROTOBUF_SUPPRESS_NODISCARD result.ParseFromString(result.SerializeAsString()); *result.AddResult() = GetMaxTQueryResult(); } *result.AddResult() = GetMaxTQueryResult(lastDataSize); @@ -185,7 +185,7 @@ namespace NKikimr { NKikimrBlobStorage::TEvVGetResult desResult; TArrayHolder<char> buffer(new char[protobufSize]); - Y_PROTOBUF_SUPPRESS_NODISCARD result.SerializeToArray(buffer.Get(), protobufSize); + Y_PROTOBUF_SUPPRESS_NODISCARD result.SerializeToArray(buffer.Get(), protobufSize); UNIT_ASSERT(desResult.ParseFromArray(buffer.Get(), protobufSize)); } diff --git a/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp b/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp index 3ff7efb53e..383bceb9b2 100644 --- a/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp +++ b/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo.h> #include <ydb/core/blobstorage/groupinfo/blobstorage_groupinfo_iter.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/vdisk/repl/ut/ya.make b/ydb/core/blobstorage/vdisk/repl/ut/ya.make index 186f4213dc..92eb082419 100644 --- a/ydb/core/blobstorage/vdisk/repl/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/repl/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp index 96b813d317..b8a762cb5c 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp @@ -775,7 +775,7 @@ namespace NKikimr { NKikimrBlobStorage::THandoffDelLogoBlob dump; dump.SetIngress(msg->Ingress.Raw()); LogoBlobIDFromLogoBlobID(msg->Id, dump.MutableBlobID()); - Y_PROTOBUF_SUPPRESS_NODISCARD dump.SerializeToString(&serializedLogRecord); + Y_PROTOBUF_SUPPRESS_NODISCARD dump.SerializeToString(&serializedLogRecord); std::unique_ptr<NSyncLog::TEvSyncLogPut> syncLogMsg( new NSyncLog::TEvSyncLogPut(Db->GType, seg.Point(), msg->Id, msg->Ingress)); diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_oos_logic_ut.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_oos_logic_ut.cpp index 03b60bb1a3..f7fe1d4cc1 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_oos_logic_ut.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_oos_logic_ut.cpp @@ -1,6 +1,6 @@ #include "skeleton_oos_logic.h" #include <ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/skeleton/ut/ya.make b/ydb/core/blobstorage/vdisk/skeleton/ut/ya.make index 67d78277da..6e220ea59b 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/skeleton/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/blobstorage ydb/core/blobstorage/vdisk/common diff --git a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_data_ut.cpp b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_data_ut.cpp index 0da0c427ee..2343f39804 100644 --- a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_data_ut.cpp +++ b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_data_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "blobstorage_syncer_data.h" #include "blobstorage_syncer_dataserdes.h" diff --git a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncquorum_ut.cpp b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncquorum_ut.cpp index 78e25633ab..12c456e0e7 100644 --- a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncquorum_ut.cpp +++ b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncquorum_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_syncquorum.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/shuffle.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/syncer/ut/ya.make b/ydb/core/blobstorage/vdisk/syncer/ut/ya.make index b5be2b2603..2ad4ba4c6c 100644 --- a/ydb/core/blobstorage/vdisk/syncer/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/syncer/ut/ya.make @@ -9,7 +9,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/blobstorage diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp index 5a5024382a..e6bdd137f5 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp @@ -1,6 +1,6 @@ #include "blobstorage_synclogdata.h" #include <ydb/core/blobstorage/vdisk/common/memusage.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdsk_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdsk_ut.cpp index 59d02b15f5..7e89f91925 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdsk_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdsk_ut.cpp @@ -1,6 +1,6 @@ #include "blobstorage_synclogdsk.h" #include "blobstorage_synclogdata.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp index 44808438be..09c64d30fd 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp @@ -1,6 +1,6 @@ #include "blobstorage_synclogkeeper_state.h" #include "blobstorage_synclogreader.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmem_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmem_ut.cpp index 995a2156a6..3f5f8a7fe7 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmem_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmem_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_synclogmem.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgimpl_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgimpl_ut.cpp index 344377c9a3..1fafb74415 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgimpl_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgimpl_ut.cpp @@ -1,6 +1,6 @@ #include "blobstorage_synclogmsgimpl.h" #include "codecs.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/shuffle.h> #include <util/random/random.h> diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgwriter_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgwriter_ut.cpp index 9699c12a44..4403c9d7f8 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgwriter_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogmsgwriter_ut.cpp @@ -1,5 +1,5 @@ #include "blobstorage_synclogmsgwriter.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; using namespace NKikimr::NSyncLog; diff --git a/ydb/core/blobstorage/vdisk/synclog/codecs_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/codecs_ut.cpp index 94b29b860b..1374f055fd 100644 --- a/ydb/core/blobstorage/vdisk/synclog/codecs_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/codecs_ut.cpp @@ -1,6 +1,6 @@ #include "codecs.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/stream/null.h> diff --git a/ydb/core/blobstorage/vdisk/synclog/ut/ya.make b/ydb/core/blobstorage/vdisk/synclog/ut/ya.make index 10e7e6886d..d37f43ca67 100644 --- a/ydb/core/blobstorage/vdisk/synclog/ut/ya.make +++ b/ydb/core/blobstorage/vdisk/synclog/ut/ya.make @@ -9,9 +9,9 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/base ydb/core/blobstorage ) diff --git a/ydb/core/client/cancel_tx_ut.cpp b/ydb/core/client/cancel_tx_ut.cpp index 4544a3154f..0a25c139bf 100644 --- a/ydb/core/client/cancel_tx_ut.cpp +++ b/ydb/core/client/cancel_tx_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/core/tx/datashard/datashard_failpoints.h> #include <ydb/core/engine/mkql_engine_flat.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> namespace NKikimr { diff --git a/ydb/core/client/client_ut.cpp b/ydb/core/client/client_ut.cpp index b94c722588..04bdf1aa77 100644 --- a/ydb/core/client/client_ut.cpp +++ b/ydb/core/client/client_ut.cpp @@ -9,9 +9,9 @@ #include <ydb/public/lib/deprecated/kicli/kicli.h> #include <library/cpp/actors/interconnect/interconnect_impl.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/diff/diff.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/diff/diff.h> #include <ydb/library/yql/ast/yql_ast.h> #include <ydb/library/yql/ast/yql_expr.h> diff --git a/ydb/core/client/flat_ut.cpp b/ydb/core/client/flat_ut.cpp index 362c052aa1..27e66d1d81 100644 --- a/ydb/core/client/flat_ut.cpp +++ b/ydb/core/client/flat_ut.cpp @@ -11,8 +11,8 @@ #include <library/cpp/http/io/stream.h> #include <library/cpp/http/server/http_ex.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> #include <util/generic/xrange.h> #include <util/random/mersenne.h> diff --git a/ydb/core/client/flat_ut_client.h b/ydb/core/client/flat_ut_client.h index 07f5b30cc6..30a398e793 100644 --- a/ydb/core/client/flat_ut_client.h +++ b/ydb/core/client/flat_ut_client.h @@ -5,7 +5,7 @@ #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/public/lib/deprecated/kicli/kicli.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> namespace NKikimr { diff --git a/ydb/core/client/locks_ut.cpp b/ydb/core/client/locks_ut.cpp index 47b7c3dfdd..2ffc1347a0 100644 --- a/ydb/core/client/locks_ut.cpp +++ b/ydb/core/client/locks_ut.cpp @@ -5,8 +5,8 @@ #include <ydb/core/tx/datashard/datashard_locks.h> #include <ydb/public/lib/deprecated/kicli/kicli.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> static const bool EnableLogs = false; diff --git a/ydb/core/client/metadata/functions_metadata.cpp b/ydb/core/client/metadata/functions_metadata.cpp index 6f8a042374..c92ee3ba27 100644 --- a/ydb/core/client/metadata/functions_metadata.cpp +++ b/ydb/core/client/metadata/functions_metadata.cpp @@ -23,7 +23,7 @@ void SerializeMetadata(const IBuiltinFunctionRegistry& funcRegistry, TString* ou } } - Y_PROTOBUF_SUPPRESS_NODISCARD metadata.SerializeToString(out); + Y_PROTOBUF_SUPPRESS_NODISCARD metadata.SerializeToString(out); } void DeserializeMetadata(TStringBuf buffer, IBuiltinFunctionRegistry& funcRegistry) diff --git a/ydb/core/client/metadata/types_metadata.cpp b/ydb/core/client/metadata/types_metadata.cpp index c1c2265734..99eb851dc8 100644 --- a/ydb/core/client/metadata/types_metadata.cpp +++ b/ydb/core/client/metadata/types_metadata.cpp @@ -15,7 +15,7 @@ void SerializeMetadata(const NScheme::TTypeMetadataRegistry& typesRegistry, TStr protoType->SetId(type.second->GetTypeId()); protoType->SetName(type.second->GetName()); } - Y_PROTOBUF_SUPPRESS_NODISCARD metadata.SerializeToString(out); + Y_PROTOBUF_SUPPRESS_NODISCARD metadata.SerializeToString(out); } void DeserializeMetadata(TStringBuf buffer, NScheme::TTypeMetadataRegistry* registry) diff --git a/ydb/core/client/metadata/ut/functions_metadata_ut.cpp b/ydb/core/client/metadata/ut/functions_metadata_ut.cpp index 0713c33e8d..57d6abcb8b 100644 --- a/ydb/core/client/metadata/ut/functions_metadata_ut.cpp +++ b/ydb/core/client/metadata/ut/functions_metadata_ut.cpp @@ -4,7 +4,7 @@ #include <ydb/public/lib/scheme_types/scheme_type_id.h> #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; diff --git a/ydb/core/client/minikql_compile/db_key_resolver.h b/ydb/core/client/minikql_compile/db_key_resolver.h index e748525fa8..7758f94401 100644 --- a/ydb/core/client/minikql_compile/db_key_resolver.h +++ b/ydb/core/client/minikql_compile/db_key_resolver.h @@ -12,7 +12,7 @@ #include <util/generic/string.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NYql { diff --git a/ydb/core/client/minikql_compile/yql_expr_minikql.cpp b/ydb/core/client/minikql_compile/yql_expr_minikql.cpp index 76f38bf35c..49be766aef 100644 --- a/ydb/core/client/minikql_compile/yql_expr_minikql.cpp +++ b/ydb/core/client/minikql_compile/yql_expr_minikql.cpp @@ -30,7 +30,7 @@ #include <ydb/library/yql/providers/common/mkql/yql_type_mkql.h> #include <ydb/library/yql/providers/common/mkql/yql_provider_mkql.h> -#include <library/cpp/threading/future/async.h> +#include <library/cpp/threading/future/async.h> #include <util/generic/algorithm.h> #include <util/generic/bt_exception.h> diff --git a/ydb/core/client/minikql_compile/yql_expr_minikql.h b/ydb/core/client/minikql_compile/yql_expr_minikql.h index ab6011c105..35b2b3d0dd 100644 --- a/ydb/core/client/minikql_compile/yql_expr_minikql.h +++ b/ydb/core/client/minikql_compile/yql_expr_minikql.h @@ -8,7 +8,7 @@ #include <library/cpp/actors/core/events.h> #include <ydb/library/yql/ast/yql_expr.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/bt_exception.h> diff --git a/ydb/core/client/minikql_compile/yql_expr_minikql_compile_ut.cpp b/ydb/core/client/minikql_compile/yql_expr_minikql_compile_ut.cpp index 4fcdf735ba..42fdbb1b12 100644 --- a/ydb/core/client/minikql_compile/yql_expr_minikql_compile_ut.cpp +++ b/ydb/core/client/minikql_compile/yql_expr_minikql_compile_ut.cpp @@ -4,7 +4,7 @@ #include <ydb/core/engine/mkql_keys.h> #include <ydb/core/testlib/minikql_compile.h> #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { diff --git a/ydb/core/client/minikql_result_lib/converter_ut.cpp b/ydb/core/client/minikql_result_lib/converter_ut.cpp index 0fb5eff621..6d9deb9077 100644 --- a/ydb/core/client/minikql_result_lib/converter_ut.cpp +++ b/ydb/core/client/minikql_result_lib/converter_ut.cpp @@ -2,8 +2,8 @@ #include <ydb/core/testlib/test_client.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/client/minikql_result_lib/objects_ut.cpp b/ydb/core/client/minikql_result_lib/objects_ut.cpp index 49b3d300dc..556fc7ebda 100644 --- a/ydb/core/client/minikql_result_lib/objects_ut.cpp +++ b/ydb/core/client/minikql_result_lib/objects_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/scheme/scheme_type_id.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/client/minikql_result_lib/ut/ya.make b/ydb/core/client/minikql_result_lib/ut/ya.make index 977bac4c9a..8175b30b2a 100644 --- a/ydb/core/client/minikql_result_lib/ut/ya.make +++ b/ydb/core/client/minikql_result_lib/ut/ya.make @@ -14,7 +14,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ) diff --git a/ydb/core/client/query_stats_ut.cpp b/ydb/core/client/query_stats_ut.cpp index 2832399386..b03d853f64 100644 --- a/ydb/core/client/query_stats_ut.cpp +++ b/ydb/core/client/query_stats_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/core/tx/datashard/datashard_failpoints.h> #include <ydb/core/engine/mkql_engine_flat.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> namespace NKikimr { diff --git a/ydb/core/client/s3_listing_ut.cpp b/ydb/core/client/s3_listing_ut.cpp index 919c45dc46..edc1e208e0 100644 --- a/ydb/core/client/s3_listing_ut.cpp +++ b/ydb/core/client/s3_listing_ut.cpp @@ -1,6 +1,6 @@ #include "flat_ut_client.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NFlatTests { diff --git a/ydb/core/client/scheme_cache_lib/ya.make b/ydb/core/client/scheme_cache_lib/ya.make index 3140bad5a2..6b9e3308db 100644 --- a/ydb/core/client/scheme_cache_lib/ya.make +++ b/ydb/core/client/scheme_cache_lib/ya.make @@ -11,7 +11,7 @@ PEERDIR( contrib/libs/protobuf library/cpp/actors/core library/cpp/grpc/client - library/cpp/threading/future + library/cpp/threading/future ydb/core/base ydb/core/client/minikql_compile ydb/core/protos diff --git a/ydb/core/client/server/msgbus_server.cpp b/ydb/core/client/server/msgbus_server.cpp index 8a4d8a3bbd..993752b72f 100644 --- a/ydb/core/client/server/msgbus_server.cpp +++ b/ydb/core/client/server/msgbus_server.cpp @@ -461,7 +461,7 @@ void TMessageBusServer::InitSession(TActorSystem *actorSystem, const TActorId &p } void TMessageBusServer::ShutdownSession() { - HttpServer.Reset(); + HttpServer.Reset(); if (Session) { Session->Shutdown(); } diff --git a/ydb/core/client/server/msgbus_server_pq_metarequest_ut.cpp b/ydb/core/client/server/msgbus_server_pq_metarequest_ut.cpp index 237bba147b..bbfab7b85f 100644 --- a/ydb/core/client/server/msgbus_server_pq_metarequest_ut.cpp +++ b/ydb/core/client/server/msgbus_server_pq_metarequest_ut.cpp @@ -12,7 +12,7 @@ #include <ydb/core/testlib/mock_pq_metacache.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/is_in.h> #include <util/string/join.h> diff --git a/ydb/core/client/server/ya.make b/ydb/core/client/server/ya.make index 8cbeec21b7..56ea4d27ad 100644 --- a/ydb/core/client/server/ya.make +++ b/ydb/core/client/server/ya.make @@ -72,7 +72,7 @@ PEERDIR( library/cpp/monlib/messagebus library/cpp/protobuf/json library/cpp/protobuf/util - library/cpp/threading/future + library/cpp/threading/future ydb/core/actorlib_impl ydb/core/base ydb/core/blobstorage/base diff --git a/ydb/core/cms/cluster_info_ut.cpp b/ydb/core/cms/cluster_info_ut.cpp index 8b9d3b3d65..6c10054283 100644 --- a/ydb/core/cms/cluster_info_ut.cpp +++ b/ydb/core/cms/cluster_info_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/actors/interconnect/interconnect.h> #include <ydb/core/node_whiteboard/node_whiteboard.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/hostname.h> diff --git a/ydb/core/cms/cms_tenants_ut.cpp b/ydb/core/cms/cms_tenants_ut.cpp index e14fe4dd57..6bb5381e4c 100644 --- a/ydb/core/cms/cms_tenants_ut.cpp +++ b/ydb/core/cms/cms_tenants_ut.cpp @@ -7,7 +7,7 @@ #include <ydb/core/testlib/test_client.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/hostname.h> diff --git a/ydb/core/cms/cms_ut.cpp b/ydb/core/cms/cms_ut.cpp index 9842fb7156..e357bf3ce7 100644 --- a/ydb/core/cms/cms_ut.cpp +++ b/ydb/core/cms/cms_ut.cpp @@ -9,7 +9,7 @@ #include <ydb/core/testlib/tablet_helpers.h> #include <library/cpp/svnversion/svnversion.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/hostname.h> diff --git a/ydb/core/cms/cms_ut_common.cpp b/ydb/core/cms/cms_ut_common.cpp index b458fe672c..6bc2760bdf 100644 --- a/ydb/core/cms/cms_ut_common.cpp +++ b/ydb/core/cms/cms_ut_common.cpp @@ -13,7 +13,7 @@ #include <google/protobuf/text_format.h> #include <library/cpp/malloc/api/malloc.h> #include <library/cpp/svnversion/svnversion.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/subst.h> diff --git a/ydb/core/cms/console/configs_dispatcher.cpp b/ydb/core/cms/console/configs_dispatcher.cpp index 8e50754239..868b27dd12 100644 --- a/ydb/core/cms/console/configs_dispatcher.cpp +++ b/ydb/core/cms/console/configs_dispatcher.cpp @@ -328,8 +328,8 @@ void TConfigsDispatcher::ReplaceConfigItems(const NKikimrConfig::TAppConfig &fro bool TConfigsDispatcher::CompareConfigs(const NKikimrConfig::TAppConfig &lhs, const NKikimrConfig::TAppConfig &rhs) { TString str1, str2; - Y_PROTOBUF_SUPPRESS_NODISCARD lhs.SerializeToString(&str1); - Y_PROTOBUF_SUPPRESS_NODISCARD rhs.SerializeToString(&str2); + Y_PROTOBUF_SUPPRESS_NODISCARD lhs.SerializeToString(&str1); + Y_PROTOBUF_SUPPRESS_NODISCARD rhs.SerializeToString(&str2); return (str1 == str2); } diff --git a/ydb/core/cms/console/console__load_state.cpp b/ydb/core/cms/console/console__load_state.cpp index 05c0591006..38a59e5b5a 100644 --- a/ydb/core/cms/console/console__load_state.cpp +++ b/ydb/core/cms/console/console__load_state.cpp @@ -42,7 +42,7 @@ public: if (configRow.IsValid()) { auto configString = configRow.GetValue<Schema::Config::Value>(); NKikimrConsole::TConfig config; - Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configString.data(), configString.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configString.data(), configString.size()); Self->LoadConfigFromProto(config); LOG_DEBUG_S(ctx, NKikimrServices::CMS, diff --git a/ydb/core/cms/console/console__set_config.cpp b/ydb/core/cms/console/console__set_config.cpp index 8cea3abba2..133e85211c 100644 --- a/ydb/core/cms/console/console__set_config.cpp +++ b/ydb/core/cms/console/console__set_config.cpp @@ -60,7 +60,7 @@ public: // Modify state. NIceDb::TNiceDb db(txc.DB); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD NewConfig.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD NewConfig.SerializeToString(&config); db.Table<Schema::Config>().Key(ConfigKeyConfig) .Update(NIceDb::TUpdate<Schema::Config::Value>(config)); diff --git a/ydb/core/cms/console/console_configs_manager.cpp b/ydb/core/cms/console/console_configs_manager.cpp index a0415de947..201034a1a4 100644 --- a/ydb/core/cms/console/console_configs_manager.cpp +++ b/ydb/core/cms/console/console_configs_manager.cpp @@ -353,7 +353,7 @@ bool TConfigsManager::DbLoadState(TTransactionContext &txc, item->UsageScope.NodeType = nodeType; item->UsageScope.Order = order; item->MergeStrategy = merge; - Y_PROTOBUF_SUPPRESS_NODISCARD item->Config.ParseFromArray(config.data(), config.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD item->Config.ParseFromArray(config.data(), config.size()); item->Cookie = cookie; ConfigIndex.AddItem(item); @@ -443,7 +443,7 @@ void TConfigsManager::DbUpdateItem(TConfigItem::TPtr item, << (ConfigIndex.GetItem(item->Id) ? "updating " : "adding ") << item->ToString()); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD item->Config.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD item->Config.SerializeToString(&config); NIceDb::TNiceDb db(txc.DB); db.Table<Schema::ConfigItems>().Key(item->Id) .Update(NIceDb::TUpdate<Schema::ConfigItems::Generation>(item->Generation)) diff --git a/ydb/core/cms/console/console_tenants_manager.cpp b/ydb/core/cms/console/console_tenants_manager.cpp index 0db3f5dced..7e5bdbd861 100644 --- a/ydb/core/cms/console/console_tenants_manager.cpp +++ b/ydb/core/cms/console/console_tenants_manager.cpp @@ -2304,7 +2304,7 @@ void TTenantsManager::DbAddTenant(TTenant::TPtr tenant, << " state=" << pool.State); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD pool.Config.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD pool.Config.SerializeToString(&config); db.Table<Schema::TenantPools>().Key(tenant->Path, pool.Kind) .Update(NIceDb::TUpdate<Schema::TenantPools::Config>(config), NIceDb::TUpdate<Schema::TenantPools::AllocatedNumGroups>(pool.AllocatedNumGroups), @@ -2458,7 +2458,7 @@ bool TTenantsManager::DbLoadState(TTransactionContext &txc, const TActorContext TStoragePool::EState state = static_cast<TStoragePool::EState>(stateVal); NKikimrBlobStorage::TDefineStoragePool config; - Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configVal.data(), configVal.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configVal.data(), configVal.size()); TStoragePool::TPtr pool = new TStoragePool(type, config); pool->AllocatedNumGroups = allocated; @@ -2653,7 +2653,7 @@ void TTenantsManager::DbUpdatePool(TTenant::TPtr tenant, << " state=" << pool->State); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD pool->Config.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD pool->Config.SerializeToString(&config); NIceDb::TNiceDb db(txc.DB); db.Table<Schema::TenantPools>().Key(tenant->Path, pool->Kind) .Update(NIceDb::TUpdate<Schema::TenantPools::Config>(config), @@ -2671,7 +2671,7 @@ void TTenantsManager::DbUpdatePoolConfig(TTenant::TPtr tenant, << " config=" << config.ShortDebugString()); TString val; - Y_PROTOBUF_SUPPRESS_NODISCARD config.SerializeToString(&val); + Y_PROTOBUF_SUPPRESS_NODISCARD config.SerializeToString(&val); NIceDb::TNiceDb db(txc.DB); db.Table<Schema::TenantPools>().Key(tenant->Path, pool->Kind) .Update<Schema::TenantPools::Config>(val); diff --git a/ydb/core/cms/console/console_ut_configs.cpp b/ydb/core/cms/console/console_ut_configs.cpp index 0cb1655281..ca46d34f76 100644 --- a/ydb/core/cms/console/console_ut_configs.cpp +++ b/ydb/core/cms/console/console_ut_configs.cpp @@ -13,7 +13,7 @@ #include <library/cpp/actors/interconnect/interconnect_impl.h> #include <ydb/core/testlib/tenant_runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/hostname.h> diff --git a/ydb/core/cms/console/console_ut_tenants.cpp b/ydb/core/cms/console/console_ut_tenants.cpp index 57e4820af7..14af52b94a 100644 --- a/ydb/core/cms/console/console_ut_tenants.cpp +++ b/ydb/core/cms/console/console_ut_tenants.cpp @@ -12,7 +12,7 @@ #include <ydb/core/testlib/tenant_runtime.h> #include <ydb/core/tx/schemeshard/schemeshard.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> diff --git a/ydb/core/cms/console/modifications_validator_ut.cpp b/ydb/core/cms/console/modifications_validator_ut.cpp index c29d8c563e..8d6bd9eb77 100644 --- a/ydb/core/cms/console/modifications_validator_ut.cpp +++ b/ydb/core/cms/console/modifications_validator_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/cms/console/validators/registry.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NConsole { diff --git a/ydb/core/cms/console/net_classifier_updater.cpp b/ydb/core/cms/console/net_classifier_updater.cpp index 121a65efc3..ca19f28d0e 100644 --- a/ydb/core/cms/console/net_classifier_updater.cpp +++ b/ydb/core/cms/console/net_classifier_updater.cpp @@ -304,7 +304,7 @@ private: TString PackAcquiredSubnets(const NKikimrNetClassifier::TNetData& netData) const { TString serializedProto; - Y_PROTOBUF_SUPPRESS_NODISCARD netData.SerializeToString(&serializedProto); + Y_PROTOBUF_SUPPRESS_NODISCARD netData.SerializeToString(&serializedProto); return PackNetData(serializedProto); } diff --git a/ydb/core/cms/console/net_classifier_updater_ut.cpp b/ydb/core/cms/console/net_classifier_updater_ut.cpp index da41ee51f2..48a6478e7e 100644 --- a/ydb/core/cms/console/net_classifier_updater_ut.cpp +++ b/ydb/core/cms/console/net_classifier_updater_ut.cpp @@ -8,8 +8,8 @@ #include <library/cpp/protobuf/util/is_equal.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/json/json_writer.h> #include <util/string/builder.h> diff --git a/ydb/core/cms/console/ut/ya.make b/ydb/core/cms/console/ut/ya.make index 9f42e18427..bd943f2e32 100644 --- a/ydb/core/cms/console/ut/ya.make +++ b/ydb/core/cms/console/ut/ya.make @@ -17,7 +17,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/protobuf/util library/cpp/regex/pcre library/cpp/svnversion diff --git a/ydb/core/cms/console/ut_helpers.h b/ydb/core/cms/console/ut_helpers.h index 9faf6468fa..eeae935341 100644 --- a/ydb/core/cms/console/ut_helpers.h +++ b/ydb/core/cms/console/ut_helpers.h @@ -9,7 +9,7 @@ #include <ydb/core/testlib/tenant_runtime.h> #include <ydb/core/testlib/tenant_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NConsole { diff --git a/ydb/core/cms/console/validators/registry_ut.cpp b/ydb/core/cms/console/validators/registry_ut.cpp index dade37b722..4122358c1b 100644 --- a/ydb/core/cms/console/validators/registry_ut.cpp +++ b/ydb/core/cms/console/validators/registry_ut.cpp @@ -1,6 +1,6 @@ #include "registry.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NConsole { diff --git a/ydb/core/cms/console/validators/ut/ya.make b/ydb/core/cms/console/validators/ut/ya.make index dfc239e3e5..0243196fa8 100644 --- a/ydb/core/cms/console/validators/ut/ya.make +++ b/ydb/core/cms/console/validators/ut/ya.make @@ -8,7 +8,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ) SRCS( diff --git a/ydb/core/cms/console/validators/validator_nameservice_ut.cpp b/ydb/core/cms/console/validators/validator_nameservice_ut.cpp index 939e3fe7f3..665d41fd7b 100644 --- a/ydb/core/cms/console/validators/validator_nameservice_ut.cpp +++ b/ydb/core/cms/console/validators/validator_nameservice_ut.cpp @@ -1,7 +1,7 @@ #include "validator_nameservice.h" #include "validator_ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NConsole { diff --git a/ydb/core/cms/console/validators/validator_ut_common.h b/ydb/core/cms/console/validators/validator_ut_common.h index 416b6f8dff..dce2116cfe 100644 --- a/ydb/core/cms/console/validators/validator_ut_common.h +++ b/ydb/core/cms/console/validators/validator_ut_common.h @@ -4,7 +4,7 @@ #include <ydb/core/base/localdb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NConsole { diff --git a/ydb/core/cms/downtime_ut.cpp b/ydb/core/cms/downtime_ut.cpp index 12a5bdbdde..e12ccb0bd9 100644 --- a/ydb/core/cms/downtime_ut.cpp +++ b/ydb/core/cms/downtime_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/core/blobstorage/base/blobstorage_events.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NCmsTest { diff --git a/ydb/core/cms/sentinel_ut.cpp b/ydb/core/cms/sentinel_ut.cpp index 62c0fdf309..042761751d 100644 --- a/ydb/core/cms/sentinel_ut.cpp +++ b/ydb/core/cms/sentinel_ut.cpp @@ -2,7 +2,7 @@ #include "sentinel.h" #include "sentinel_impl.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> #include <util/generic/vector.h> diff --git a/ydb/core/cms/ut/ya.make b/ydb/core/cms/ut/ya.make index 91fb1cd823..493ff8810e 100644 --- a/ydb/core/cms/ut/ya.make +++ b/ydb/core/cms/ut/ya.make @@ -14,7 +14,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/testlib ) diff --git a/ydb/core/cms/ut_sentinel/ya.make b/ydb/core/cms/ut_sentinel/ya.make index 773d06889a..0cfab689fe 100644 --- a/ydb/core/cms/ut_sentinel/ya.make +++ b/ydb/core/cms/ut_sentinel/ya.make @@ -10,7 +10,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/testlib ) diff --git a/ydb/core/control/immediate_control_board_actor_ut.cpp b/ydb/core/control/immediate_control_board_actor_ut.cpp index 2753077d93..d5d91a77b4 100644 --- a/ydb/core/control/immediate_control_board_actor_ut.cpp +++ b/ydb/core/control/immediate_control_board_actor_ut.cpp @@ -14,8 +14,8 @@ #include <library/cpp/actors/core/log.h> #include <library/cpp/actors/core/mon.h> #include <library/cpp/actors/core/scheduler_basic.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/generic/string.h> #include <util/generic/yexception.h> diff --git a/ydb/core/control/immediate_control_board_ut.cpp b/ydb/core/control/immediate_control_board_ut.cpp index dba6280ab5..dce290fec2 100644 --- a/ydb/core/control/immediate_control_board_ut.cpp +++ b/ydb/core/control/immediate_control_board_ut.cpp @@ -1,6 +1,6 @@ #include "immediate_control_board_impl.h" #include "immediate_control_board_wrapper.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/mersenne64.h> #include <util/random/entropy.h> #include <util/string/printf.h> diff --git a/ydb/core/control/ut/ya.make b/ydb/core/control/ut/ya.make index 18a4c9dc3b..5b34fa7fba 100644 --- a/ydb/core/control/ut/ya.make +++ b/ydb/core/control/ut/ya.make @@ -14,7 +14,7 @@ SIZE(MEDIUM) PEERDIR( library/cpp/actors/core library/cpp/actors/interconnect - library/cpp/testing/unittest + library/cpp/testing/unittest util ydb/core/base ydb/core/mind diff --git a/ydb/core/driver_lib/base_utils/base_utils.h b/ydb/core/driver_lib/base_utils/base_utils.h index 4809f2824d..97a25a3910 100644 --- a/ydb/core/driver_lib/base_utils/base_utils.h +++ b/ydb/core/driver_lib/base_utils/base_utils.h @@ -10,8 +10,8 @@ #include <util/stream/format.h> #include <util/system/hostname.h> -#include <library/cpp/getopt/last_getopt.h> -#include <library/cpp/string_utils/parse_size/parse_size.h> +#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/string_utils/parse_size/parse_size.h> #include <library/cpp/svnversion/svnversion.h> namespace NKikimr { diff --git a/ydb/core/driver_lib/cli_utils/cli.h b/ydb/core/driver_lib/cli_utils/cli.h index 099664792e..6b2b86b0b8 100644 --- a/ydb/core/driver_lib/cli_utils/cli.h +++ b/ydb/core/driver_lib/cli_utils/cli.h @@ -13,8 +13,8 @@ #include <util/stream/format.h> #include <util/system/hostname.h> -#include <library/cpp/getopt/last_getopt.h> -#include <library/cpp/string_utils/parse_size/parse_size.h> +#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/string_utils/parse_size/parse_size.h> #include <library/cpp/svnversion/svnversion.h> #include <google/protobuf/text_format.h> diff --git a/ydb/core/driver_lib/cli_utils/cli_cmd_config.cpp b/ydb/core/driver_lib/cli_utils/cli_cmd_config.cpp index fcc9305996..55100d0d6f 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmd_config.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmd_config.cpp @@ -1,7 +1,7 @@ #include <ydb/core/driver_lib/cli_config_base/config_base.h> #include "cli_cmd_config.h" #include <ydb/public/lib/deprecated/client/msgbus_client.h> -#include <util/system/env.h> +#include <util/system/env.h> namespace NKikimr { namespace NDriverClient { @@ -19,7 +19,7 @@ namespace NDriverClient { void TCliCmdConfig::ConfigureMsgBusLastGetopt(const NLastGetopt::TOptsParseResult& res, int argc, char** argv) { if (Address.empty()) { - TString kikimrServer = GetEnv("KIKIMR_SERVER"); + TString kikimrServer = GetEnv("KIKIMR_SERVER"); if (kikimrServer != nullptr) { Address = kikimrServer; } diff --git a/ydb/core/driver_lib/cli_utils/cli_cmds_root.cpp b/ydb/core/driver_lib/cli_utils/cli_cmds_root.cpp index ec049fab11..b475da7c4b 100644 --- a/ydb/core/driver_lib/cli_utils/cli_cmds_root.cpp +++ b/ydb/core/driver_lib/cli_utils/cli_cmds_root.cpp @@ -4,7 +4,7 @@ #include <util/folder/path.h> #include <util/folder/dirut.h> #include <util/string/strip.h> -#include <util/system/env.h> +#include <util/system/env.h> namespace NKikimr { namespace NDriverClient { diff --git a/ydb/core/driver_lib/run/config_parser.cpp b/ydb/core/driver_lib/run/config_parser.cpp index bb68656291..0f42d7073c 100644 --- a/ydb/core/driver_lib/run/config_parser.cpp +++ b/ydb/core/driver_lib/run/config_parser.cpp @@ -10,7 +10,7 @@ #include <util/system/hostname.h> #include <util/string/printf.h> -#include <library/cpp/string_utils/parse_size/parse_size.h> +#include <library/cpp/string_utils/parse_size/parse_size.h> #include <google/protobuf/text_format.h> diff --git a/ydb/core/driver_lib/run/config_parser.h b/ydb/core/driver_lib/run/config_parser.h index 5825ec6c49..be3b52a3b8 100644 --- a/ydb/core/driver_lib/run/config_parser.h +++ b/ydb/core/driver_lib/run/config_parser.h @@ -4,7 +4,7 @@ #include <ydb/core/protos/config.pb.h> #include <ydb/core/driver_lib/cli_config_base/config_base.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <library/cpp/messagebus/session_config.h> #include <library/cpp/messagebus/queue_config.h> diff --git a/ydb/core/driver_lib/run/driver.h b/ydb/core/driver_lib/run/driver.h index 7ad96718d1..0ba2a9f7df 100644 --- a/ydb/core/driver_lib/run/driver.h +++ b/ydb/core/driver_lib/run/driver.h @@ -6,8 +6,8 @@ #include <util/stream/file.h> #include <util/stream/format.h> -#include <library/cpp/getopt/last_getopt.h> -#include <library/cpp/string_utils/parse_size/parse_size.h> +#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/string_utils/parse_size/parse_size.h> #include <library/cpp/svnversion/svnversion.h> diff --git a/ydb/core/driver_lib/run/version_ut.cpp b/ydb/core/driver_lib/run/version_ut.cpp index 319f7e5266..1091d25ee1 100644 --- a/ydb/core/driver_lib/run/version_ut.cpp +++ b/ydb/core/driver_lib/run/version_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "version.h" Y_UNIT_TEST_SUITE(VersionParser) { diff --git a/ydb/core/driver_lib/run/ya.make b/ydb/core/driver_lib/run/ya.make index f410ef42f2..f818247d55 100644 --- a/ydb/core/driver_lib/run/ya.make +++ b/ydb/core/driver_lib/run/ya.make @@ -50,7 +50,7 @@ PEERDIR( library/cpp/actors/prof library/cpp/actors/protos library/cpp/actors/util - library/cpp/getopt/small + library/cpp/getopt/small library/cpp/grpc/client library/cpp/grpc/server library/cpp/grpc/server/actors @@ -60,7 +60,7 @@ PEERDIR( library/cpp/monlib/dynamic_counters library/cpp/monlib/messagebus library/cpp/sighandler - library/cpp/string_utils/parse_size + library/cpp/string_utils/parse_size library/cpp/svnversion ydb/core/actorlib_impl ydb/core/base diff --git a/ydb/core/engine/kikimr_program_builder_ut.cpp b/ydb/core/engine/kikimr_program_builder_ut.cpp index efa073ae2f..e989dcdc26 100644 --- a/ydb/core/engine/kikimr_program_builder_ut.cpp +++ b/ydb/core/engine/kikimr_program_builder_ut.cpp @@ -12,7 +12,7 @@ #include <ydb/core/engine/mkql_keys.h> #include <ydb/core/scheme_types/scheme_types_defs.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/core/engine/minikql/minikql_engine_host.cpp b/ydb/core/engine/minikql/minikql_engine_host.cpp index 36c35f32cc..297b92f58d 100644 --- a/ydb/core/engine/minikql/minikql_engine_host.cpp +++ b/ydb/core/engine/minikql/minikql_engine_host.cpp @@ -7,7 +7,7 @@ #include <ydb/library/yql/minikql/mkql_string_util.h> #include <ydb/core/tx/datashard/sys_tables.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/core/engine/mkql_engine_flat_host_ut.cpp b/ydb/core/engine/mkql_engine_flat_host_ut.cpp index 68679f168d..5532bc3292 100644 --- a/ydb/core/engine/mkql_engine_flat_host_ut.cpp +++ b/ydb/core/engine/mkql_engine_flat_host_ut.cpp @@ -5,7 +5,7 @@ #include <ydb/core/scheme_types/scheme_type_registry.h> #include <ydb/core/scheme_types/scheme_types_defs.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/tablet_flat/test/libs/table/test_dummy.h> diff --git a/ydb/core/engine/mkql_engine_flat_ut.cpp b/ydb/core/engine/mkql_engine_flat_ut.cpp index e2b12e2d7a..057b6fe5fc 100644 --- a/ydb/core/engine/mkql_engine_flat_ut.cpp +++ b/ydb/core/engine/mkql_engine_flat_ut.cpp @@ -9,7 +9,7 @@ #include <ydb/core/engine/minikql/minikql_engine_host.h> #include <ydb/core/kqp/ut/common/kqp_ut_common.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/core/engine/mkql_proto_ut.cpp b/ydb/core/engine/mkql_proto_ut.cpp index c6e00e947c..4543833306 100644 --- a/ydb/core/engine/mkql_proto_ut.cpp +++ b/ydb/core/engine/mkql_proto_ut.cpp @@ -9,7 +9,7 @@ #include <ydb/core/scheme_types/scheme_types_defs.h> #include <google/protobuf/text_format.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace std::string_view_literals; diff --git a/ydb/core/engine/ya.make b/ydb/core/engine/ya.make index df644f17dc..3344d501a9 100644 --- a/ydb/core/engine/ya.make +++ b/ydb/core/engine/ya.make @@ -17,7 +17,7 @@ SRCS( ) PEERDIR( - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/deprecated/enum_codegen library/cpp/random_provider library/cpp/time_provider diff --git a/ydb/core/erasure/erasure.cpp b/ydb/core/erasure/erasure.cpp index a41b027932..a91709560d 100644 --- a/ydb/core/erasure/erasure.cpp +++ b/ydb/core/erasure/erasure.cpp @@ -2,7 +2,7 @@ #include <util/generic/yexception.h> #include <util/system/unaligned_mem.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/digest/crc32c/crc32c.h> #define MAX_TOTAL_PARTS 8 diff --git a/ydb/core/erasure/erasure.h b/ydb/core/erasure/erasure.h index 35bd68c2d2..f23b6d5597 100644 --- a/ydb/core/erasure/erasure.h +++ b/ydb/core/erasure/erasure.h @@ -11,7 +11,7 @@ #include <util/string/builder.h> #include <util/generic/list.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { diff --git a/ydb/core/erasure/erasure_perf_test.cpp b/ydb/core/erasure/erasure_perf_test.cpp index 2aaee89334..f2258f164b 100644 --- a/ydb/core/erasure/erasure_perf_test.cpp +++ b/ydb/core/erasure/erasure_perf_test.cpp @@ -1,7 +1,7 @@ #include "erasure.h" #include "erasure_rope.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ymath.h> #include <util/random/entropy.h> #include <util/random/mersenne64.h> diff --git a/ydb/core/erasure/erasure_rope.cpp b/ydb/core/erasure/erasure_rope.cpp index b1de833d93..5c2f03b4a1 100644 --- a/ydb/core/erasure/erasure_rope.cpp +++ b/ydb/core/erasure/erasure_rope.cpp @@ -2,7 +2,7 @@ #include <util/generic/yexception.h> #include <util/system/unaligned_mem.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #define MAX_TOTAL_PARTS 8 #define MAX_LINES_IN_BLOCK 8 diff --git a/ydb/core/erasure/erasure_rope.h b/ydb/core/erasure/erasure_rope.h index a4835ce834..df12adbe94 100644 --- a/ydb/core/erasure/erasure_rope.h +++ b/ydb/core/erasure/erasure_rope.h @@ -10,7 +10,7 @@ #include <util/string/builder.h> #include <util/generic/list.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/actors/util/rope.h> #include <library/cpp/digest/crc32c/crc32c.h> diff --git a/ydb/core/erasure/ya.make b/ydb/core/erasure/ya.make index 63483c1b96..36599144cb 100644 --- a/ydb/core/erasure/ya.make +++ b/ydb/core/erasure/ya.make @@ -18,7 +18,7 @@ SRCS( PEERDIR( library/cpp/actors/util - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/digest/crc32c library/cpp/digest/old_crc ydb/core/debug diff --git a/ydb/core/grpc_services/grpc_mon.cpp b/ydb/core/grpc_services/grpc_mon.cpp index cd15157b05..644f0ae2f0 100644 --- a/ydb/core/grpc_services/grpc_mon.cpp +++ b/ydb/core/grpc_services/grpc_mon.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/events.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <library/cpp/monlib/service/pages/templates.h> #include <library/cpp/actors/core/mon.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/grpc_services/rpc_calls_ut.cpp b/ydb/core/grpc_services/rpc_calls_ut.cpp index 514be6ffee..9a99db3e1d 100644 --- a/ydb/core/grpc_services/rpc_calls_ut.cpp +++ b/ydb/core/grpc_services/rpc_calls_ut.cpp @@ -1,6 +1,6 @@ #include "rpc_calls.h" -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/grpc_services/rpc_discovery.cpp b/ydb/core/grpc_services/rpc_discovery.cpp index 75550f92ac..ba5a99b03e 100644 --- a/ydb/core/grpc_services/rpc_discovery.cpp +++ b/ydb/core/grpc_services/rpc_discovery.cpp @@ -336,7 +336,7 @@ public: NKikimrStateStorage::TEndpointBoardEntry entry; for (const TString *xpayload : entries) { - Y_PROTOBUF_SUPPRESS_NODISCARD entry.ParseFromString(*xpayload); + Y_PROTOBUF_SUPPRESS_NODISCARD entry.ParseFromString(*xpayload); if (!CheckServices(services, entry)) continue; diff --git a/ydb/core/grpc_services/rpc_read_table.cpp b/ydb/core/grpc_services/rpc_read_table.cpp index bbb8790728..1c6cd278f6 100644 --- a/ydb/core/grpc_services/rpc_read_table.cpp +++ b/ydb/core/grpc_services/rpc_read_table.cpp @@ -42,14 +42,14 @@ static void NullSerializeReadTableResponse(const TString& input, Ydb::StatusIds: readTableResponse.set_status(status); readTableResponse.mutable_result()->set_result_set(input.Data(), input.Size()); - Y_PROTOBUF_SUPPRESS_NODISCARD readTableResponse.SerializeToString(output); + Y_PROTOBUF_SUPPRESS_NODISCARD readTableResponse.SerializeToString(output); } static void NullSerializeReadTableResponse(const google::protobuf::RepeatedPtrField<TYdbIssueMessageType>& message, Ydb::StatusIds::StatusCode status, TString* output) { Ydb::Impl::ReadTableResponse readTableResponse; readTableResponse.set_status(status); readTableResponse.mutable_issues()->CopyFrom(message); - Y_PROTOBUF_SUPPRESS_NODISCARD readTableResponse.SerializeToString(output); + Y_PROTOBUF_SUPPRESS_NODISCARD readTableResponse.SerializeToString(output); } static NKikimrMiniKQL::TParams ConvertKey(const Ydb::TypedValue& key) { diff --git a/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp b/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp index 5f95f263c6..d81ad0bfbf 100644 --- a/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp +++ b/ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp @@ -407,7 +407,7 @@ private: response.mutable_result()->mutable_query_stats()->set_query_ast(kqpResponse.GetQueryAst()); } - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); Request_->SendSerializedResult(std::move(out), record.GetYdbStatus()); } } else { @@ -422,7 +422,7 @@ private: response.mutable_result()->set_query_plan(kqpResponse.GetQueryPlan()); } - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); Request_->SendSerializedResult(std::move(out), record.GetYdbStatus()); } } @@ -457,7 +457,7 @@ private: response.mutable_result()->mutable_result_set()->Swap(ev->Get()->Record.MutableResultSet()); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); GRpcResponsesSizeQueue_.push(out.size()); GRpcResponsesSize_ += out.size(); @@ -586,7 +586,7 @@ private: TResponse response; response.set_status(status); response.mutable_issues()->CopyFrom(message); - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); Request_->SendSerializedResult(std::move(out), status); } else { for (auto& profile : ExecutionProfiles_) { @@ -596,7 +596,7 @@ private: } TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); Request_->SendSerializedResult(std::move(out), status); } } diff --git a/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp b/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp index aa936e7b6e..2176abbdea 100644 --- a/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp +++ b/ydb/core/grpc_services/rpc_stream_execute_yql_script.cpp @@ -216,7 +216,7 @@ private: result->set_result_set_index(ResultsReceived_ - 1); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); GRpcResponsesSizeQueue_.push(out.size()); GRpcResponsesSize_ += out.size(); @@ -267,7 +267,7 @@ private: result->set_result_set_index(ResultsReceived_ - 1); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); GRpcResponsesSizeQueue_.push(out.size()); GRpcResponsesSize_ += out.size(); @@ -363,7 +363,7 @@ private: response.mutable_result()->mutable_query_stats()->set_query_plan(kqpResponse.GetQueryPlan()); } - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); RequestPtr()->SendSerializedResult(std::move(out), record.GetYdbStatus()); } @@ -480,7 +480,7 @@ private: Ydb::Scripting::ExecuteYqlPartialResponse response; response.set_status(status); response.mutable_issues()->CopyFrom(message); - Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out); return out; } diff --git a/ydb/core/grpc_services/ut/ya.make b/ydb/core/grpc_services/ut/ya.make index b1888784b2..69461deee0 100644 --- a/ydb/core/grpc_services/ut/ya.make +++ b/ydb/core/grpc_services/ut/ya.make @@ -17,7 +17,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/client/scheme_cache_lib diff --git a/ydb/core/grpc_services/validation/ut.cpp b/ydb/core/grpc_services/validation/ut.cpp index ca414df810..8036ff8be0 100644 --- a/ydb/core/grpc_services/validation/ut.cpp +++ b/ydb/core/grpc_services/validation/ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/grpc_services/validation/ut/protos/validation_test.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(ValidationTests) { using namespace Ydb::ValidationTest; diff --git a/ydb/core/grpc_services/validation/ut/ya.make b/ydb/core/grpc_services/validation/ut/ya.make index a3eb118780..365268e370 100644 --- a/ydb/core/grpc_services/validation/ut/ya.make +++ b/ydb/core/grpc_services/validation/ut/ya.make @@ -12,7 +12,7 @@ IF (SANITIZER_TYPE OR WITH_VALGRIND) ENDIF() PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/grpc_services/validation/ut/protos ) diff --git a/ydb/core/grpc_services/ya.make b/ydb/core/grpc_services/ya.make index 05b156bf04..48e8c4af46 100644 --- a/ydb/core/grpc_services/ya.make +++ b/ydb/core/grpc_services/ya.make @@ -77,7 +77,7 @@ SRCS( PEERDIR( contrib/libs/xxhash - library/cpp/cgiparam + library/cpp/cgiparam library/cpp/digest/old_crc ydb/core/actorlib_impl ydb/core/base diff --git a/ydb/core/grpc_streaming/grpc_streaming_ut.cpp b/ydb/core/grpc_streaming/grpc_streaming_ut.cpp index fe0b6aec6a..363e3459c8 100644 --- a/ydb/core/grpc_streaming/grpc_streaming_ut.cpp +++ b/ydb/core/grpc_streaming/grpc_streaming_ut.cpp @@ -4,7 +4,7 @@ #include <ydb/core/grpc_services/grpc_helper.h> #include <ydb/core/testlib/test_client.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NGRpcServer { diff --git a/ydb/core/kesus/proxy/ut_helpers.h b/ydb/core/kesus/proxy/ut_helpers.h index 20bcbac73f..eee3ec12a0 100644 --- a/ydb/core/kesus/proxy/ut_helpers.h +++ b/ydb/core/kesus/proxy/ut_helpers.h @@ -11,7 +11,7 @@ #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NKesus { diff --git a/ydb/core/kesus/tablet/quoter_performance_test/options.h b/ydb/core/kesus/tablet/quoter_performance_test/options.h index 5f12305ed7..99d1ad4cea 100644 --- a/ydb/core/kesus/tablet/quoter_performance_test/options.h +++ b/ydb/core/kesus/tablet/quoter_performance_test/options.h @@ -1,5 +1,5 @@ #pragma once -#include <library/cpp/getopt/opt.h> +#include <library/cpp/getopt/opt.h> #include <util/datetime/base.h> #include <util/generic/string.h> diff --git a/ydb/core/kesus/tablet/quoter_performance_test/ya.make b/ydb/core/kesus/tablet/quoter_performance_test/ya.make index c256ff5875..143447e5e8 100644 --- a/ydb/core/kesus/tablet/quoter_performance_test/ya.make +++ b/ydb/core/kesus/tablet/quoter_performance_test/ya.make @@ -8,8 +8,8 @@ OWNER( SRCDIR(ydb/core/kesus/tablet) PEERDIR( - library/cpp/getopt - library/cpp/testing/unittest + library/cpp/getopt + library/cpp/testing/unittest ADDINCL ydb/core/kesus/tablet ydb/core/testlib ) diff --git a/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp b/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp index b280b4b29b..b06b6bb4d4 100644 --- a/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp +++ b/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp @@ -1,7 +1,7 @@ #include "quoter_resource_tree.h" #include <library/cpp/testing/gmock_in_unittest/gmock.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NKesus { diff --git a/ydb/core/kesus/tablet/ut_helpers.h b/ydb/core/kesus/tablet/ut_helpers.h index 8f487a3033..37562902c2 100644 --- a/ydb/core/kesus/tablet/ut_helpers.h +++ b/ydb/core/kesus/tablet/ut_helpers.h @@ -7,7 +7,7 @@ #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NKesus { diff --git a/ydb/core/keyvalue/keyvalue_collector_ut.cpp b/ydb/core/keyvalue/keyvalue_collector_ut.cpp index 4456a82380..67660804fb 100644 --- a/ydb/core/keyvalue/keyvalue_collector_ut.cpp +++ b/ydb/core/keyvalue/keyvalue_collector_ut.cpp @@ -1,6 +1,6 @@ #include "defs.h" #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/keyvalue/keyvalue_collect_operation.h> #include <ydb/core/keyvalue/keyvalue_collector.h> #include <ydb/core/keyvalue/keyvalue_state.h> diff --git a/ydb/core/keyvalue/keyvalue_ut.cpp b/ydb/core/keyvalue/keyvalue_ut.cpp index 4ae1fcf56a..7a31e26c8f 100644 --- a/ydb/core/keyvalue/keyvalue_ut.cpp +++ b/ydb/core/keyvalue/keyvalue_ut.cpp @@ -3,7 +3,7 @@ #include "keyvalue_state.h" #include <ydb/public/lib/base/msgbus.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/fast.h> const bool ENABLE_DETAILED_KV_LOG = false; diff --git a/ydb/core/keyvalue/ut/ya.make b/ydb/core/keyvalue/ut/ya.make index 7124f2ccf8..16626efb36 100644 --- a/ydb/core/keyvalue/ut/ya.make +++ b/ydb/core/keyvalue/ut/ya.make @@ -19,7 +19,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/testlib diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp index 44af6d1168..f53509b7e3 100644 --- a/ydb/core/kqp/host/kqp_host.cpp +++ b/ydb/core/kqp/host/kqp_host.cpp @@ -15,7 +15,7 @@ #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> #include <ydb/library/yql/sql/sql.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <library/cpp/random_provider/random_provider.h> #include <library/cpp/time_provider/time_provider.h> diff --git a/ydb/core/kqp/provider/yql_kikimr_exec.cpp b/ydb/core/kqp/provider/yql_kikimr_exec.cpp index ad360fcaeb..95d7b75a00 100644 --- a/ydb/core/kqp/provider/yql_kikimr_exec.cpp +++ b/ydb/core/kqp/provider/yql_kikimr_exec.cpp @@ -350,7 +350,7 @@ private: YQL_ENSURE(fillSettings.FormatDetails == KikimrMkqlProtoFormat); TVector<char> buffer(protoValue->ByteSize()); - Y_PROTOBUF_SUPPRESS_NODISCARD protoValue->SerializeToArray(buffer.data(), buffer.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD protoValue->SerializeToArray(buffer.data(), buffer.size()); resultNode = ctx.NewAtom(node.Pos(), TStringBuf(buffer.data(), buffer.size())); } diff --git a/ydb/core/kqp/provider/yql_kikimr_gateway.h b/ydb/core/kqp/provider/yql_kikimr_gateway.h index 7598494a2b..519ec3058f 100644 --- a/ydb/core/kqp/provider/yql_kikimr_gateway.h +++ b/ydb/core/kqp/provider/yql_kikimr_gateway.h @@ -14,7 +14,7 @@ #include <ydb/core/protos/flat_scheme_op.pb.h> #include <ydb/library/aclib/aclib.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/datetime/base.h> #include <util/generic/flags.h> diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.h b/ydb/core/kqp/provider/yql_kikimr_provider.h index 6903e6f193..1f0cf55fd1 100644 --- a/ydb/core/kqp/provider/yql_kikimr_provider.h +++ b/ydb/core/kqp/provider/yql_kikimr_provider.h @@ -9,7 +9,7 @@ #include <ydb/library/yql/minikql/mkql_function_registry.h> #include <library/cpp/actors/core/actor.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <util/generic/strbuf.h> #include <util/generic/flags.h> diff --git a/ydb/core/kqp/provider/yql_kikimr_results.cpp b/ydb/core/kqp/provider/yql_kikimr_results.cpp index 8ec93f416d..4bd03d2ca1 100644 --- a/ydb/core/kqp/provider/yql_kikimr_results.cpp +++ b/ydb/core/kqp/provider/yql_kikimr_results.cpp @@ -902,7 +902,7 @@ TMaybe<TString> GetTableListResult(const IKikimrGateway::TListPathResult& res, YQL_ENSURE(fillSettings.FormatDetails == KikimrMkqlProtoFormat); TVector<char> buffer(packedResult->ByteSize()); - Y_PROTOBUF_SUPPRESS_NODISCARD packedResult->SerializeToArray(buffer.data(), buffer.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD packedResult->SerializeToArray(buffer.data(), buffer.size()); return TString(buffer.data(), buffer.size()); } } @@ -939,7 +939,7 @@ TMaybe<TString> GetTableMetadataResult(const TKikimrTableDescription& table, YQL_ENSURE(fillSettings.FormatDetails == KikimrMkqlProtoFormat); TVector<char> buffer(packedResult->ByteSize()); - Y_PROTOBUF_SUPPRESS_NODISCARD packedResult->SerializeToArray(buffer.data(), buffer.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD packedResult->SerializeToArray(buffer.data(), buffer.size()); return TString(buffer.data(), buffer.size()); } } diff --git a/ydb/core/kqp/proxy/kqp_proxy_service.cpp b/ydb/core/kqp/proxy/kqp_proxy_service.cpp index decd2cb301..770eebd149 100644 --- a/ydb/core/kqp/proxy/kqp_proxy_service.cpp +++ b/ydb/core/kqp/proxy/kqp_proxy_service.cpp @@ -735,7 +735,7 @@ public: PeerProxyNodeResources.resize(boardInfo->InfoEntries.size()); size_t idx = 0; for(auto& [ownerId, entry] : boardInfo->InfoEntries) { - Y_PROTOBUF_SUPPRESS_NODISCARD PeerProxyNodeResources[idx].ParseFromString(entry.Payload); + Y_PROTOBUF_SUPPRESS_NODISCARD PeerProxyNodeResources[idx].ParseFromString(entry.Payload); ++idx; } diff --git a/ydb/core/kqp/rm/kqp_rm.cpp b/ydb/core/kqp/rm/kqp_rm.cpp index 30fc08ff5f..b170280284 100644 --- a/ydb/core/kqp/rm/kqp_rm.cpp +++ b/ydb/core/kqp/rm/kqp_rm.cpp @@ -138,7 +138,7 @@ public: int i = 0; for (auto& [_, entry] : event->InfoEntries) { - Y_PROTOBUF_SUPPRESS_NODISCARD resources[i].ParseFromString(entry.Payload); + Y_PROTOBUF_SUPPRESS_NODISCARD resources[i].ParseFromString(entry.Payload); LOG_D("WhiteBoard [" << i << "]: " << resources[i].ShortDebugString()); i++; } diff --git a/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp b/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp index c3efc85cbc..5bcff85d80 100644 --- a/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp +++ b/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp @@ -5,7 +5,7 @@ #include <ydb/core/testlib/basics/appdata.h> #include <ydb/core/testlib/basics/runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/fs.h> diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.h b/ydb/core/kqp/ut/common/kqp_ut_common.h index c1d64b65c3..50052731a3 100644 --- a/ydb/core/kqp/ut/common/kqp_ut_common.h +++ b/ydb/core/kqp/ut/common/kqp_ut_common.h @@ -13,8 +13,8 @@ #include <ydb/library/yql/core/issue/yql_issue.h> #include <library/cpp/json/json_reader.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/yson/writer.h> #define Y_UNIT_TEST_TWIN(N, OPT) \ diff --git a/ydb/core/kqp/ut/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/kqp_scheme_ut.cpp index ca7ffa42a4..5cdc0b9531 100644 --- a/ydb/core/kqp/ut/kqp_scheme_ut.cpp +++ b/ydb/core/kqp/ut/kqp_scheme_ut.cpp @@ -1,7 +1,7 @@ #include <ydb/core/kqp/ut/common/kqp_ut_common.h> #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h> -#include <library/cpp/threading/local_executor/local_executor.h> +#include <library/cpp/threading/local_executor/local_executor.h> #include <util/string/printf.h> diff --git a/ydb/core/kqp/ut/kqp_service_ut.cpp b/ydb/core/kqp/ut/kqp_service_ut.cpp index 37e178c810..a4e67b3c44 100644 --- a/ydb/core/kqp/ut/kqp_service_ut.cpp +++ b/ydb/core/kqp/ut/kqp_service_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/kqp/ut/common/kqp_ut_common.h> -#include <library/cpp/threading/local_executor/local_executor.h> +#include <library/cpp/threading/local_executor/local_executor.h> namespace NKikimr { namespace NKqp { diff --git a/ydb/core/kqp/ut/ya.make b/ydb/core/kqp/ut/ya.make index 609ec3237f..2bb3715690 100644 --- a/ydb/core/kqp/ut/ya.make +++ b/ydb/core/kqp/ut/ya.make @@ -59,7 +59,7 @@ SRCS( ) PEERDIR( - library/cpp/threading/local_executor + library/cpp/threading/local_executor ydb/core/client/minikql_compile ydb/core/kqp ydb/core/kqp/counters diff --git a/ydb/core/mind/address_classification/net_classifier_ut.cpp b/ydb/core/mind/address_classification/net_classifier_ut.cpp index 088d25b9c7..d629ae21f6 100644 --- a/ydb/core/mind/address_classification/net_classifier_ut.cpp +++ b/ydb/core/mind/address_classification/net_classifier_ut.cpp @@ -7,8 +7,8 @@ #include <ydb/core/testlib/test_client.h> #include <library/cpp/actors/http/http_proxy.cpp> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> #include <util/system/tempfile.h> diff --git a/ydb/core/mind/bscontroller/config_cmd.cpp b/ydb/core/mind/bscontroller/config_cmd.cpp index 2fc925a9cd..1552d84c22 100644 --- a/ydb/core/mind/bscontroller/config_cmd.cpp +++ b/ydb/core/mind/bscontroller/config_cmd.cpp @@ -269,8 +269,8 @@ namespace NKikimr::NBsController { // update operation log for write transaction NIceDb::TNiceDb db(txc.DB); TString requestBuffer, responseBuffer; - Y_PROTOBUF_SUPPRESS_NODISCARD Cmd.SerializeToString(&requestBuffer); - Y_PROTOBUF_SUPPRESS_NODISCARD Response->SerializeToString(&responseBuffer); + Y_PROTOBUF_SUPPRESS_NODISCARD Cmd.SerializeToString(&requestBuffer); + Y_PROTOBUF_SUPPRESS_NODISCARD Response->SerializeToString(&responseBuffer); db.Table<Schema::OperationLog>().Key(Self->NextOperationLogIndex).Update( NIceDb::TUpdate<Schema::OperationLog::Timestamp>(TActivationContext::Now()), NIceDb::TUpdate<Schema::OperationLog::Request>(requestBuffer), diff --git a/ydb/core/mind/bscontroller/group_mapper_ut.cpp b/ydb/core/mind/bscontroller/group_mapper_ut.cpp index 0dcb5be086..25676caff4 100644 --- a/ydb/core/mind/bscontroller/group_mapper_ut.cpp +++ b/ydb/core/mind/bscontroller/group_mapper_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "group_geometry_info.h" #include "group_mapper.h" diff --git a/ydb/core/mind/bscontroller/grouper_ut.cpp b/ydb/core/mind/bscontroller/grouper_ut.cpp index a119ff665a..6d50afbd61 100644 --- a/ydb/core/mind/bscontroller/grouper_ut.cpp +++ b/ydb/core/mind/bscontroller/grouper_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/actors/util/affinity.h> #include <library/cpp/svnversion/svnversion.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "grouper.h" diff --git a/ydb/core/mind/bscontroller/migrate.cpp b/ydb/core/mind/bscontroller/migrate.cpp index 20d10f8b62..f96c40de4a 100644 --- a/ydb/core/mind/bscontroller/migrate.cpp +++ b/ydb/core/mind/bscontroller/migrate.cpp @@ -110,7 +110,7 @@ class TBlobStorageController::TTxMigrate : public TTransactionBase<TBlobStorageC return false; } else if (table.IsValid()) { TString pdiskConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD pdisk.GetPDiskConfig().SerializeToString(&pdiskConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD pdisk.GetPDiskConfig().SerializeToString(&pdiskConfig); updates.emplace_back(key.GetKey(), TUpdateItem(pdisk.GetPDiskCategory(), pdisk.GetPDiskGuid(), pdiskConfig)); } } diff --git a/ydb/core/mind/bscontroller/monitoring.cpp b/ydb/core/mind/bscontroller/monitoring.cpp index 245c782cea..14e68a3d1c 100644 --- a/ydb/core/mind/bscontroller/monitoring.cpp +++ b/ydb/core/mind/bscontroller/monitoring.cpp @@ -128,8 +128,8 @@ public: const auto &entry = Logs[id]; NKikimrBlobStorage::TConfigRequest request; NKikimrBlobStorage::TConfigResponse response; - Y_PROTOBUF_SUPPRESS_NODISCARD request.ParseFromString(entry.Request); - Y_PROTOBUF_SUPPRESS_NODISCARD response.ParseFromString(entry.Response); + Y_PROTOBUF_SUPPRESS_NODISCARD request.ParseFromString(entry.Request); + Y_PROTOBUF_SUPPRESS_NODISCARD response.ParseFromString(entry.Response); TABLED() { out << entry.Index; } TABLED() { out << entry.Timestamp.ToRfc822String(); } TABLED() { diff --git a/ydb/core/mind/bscontroller/mv_object_map_ut.cpp b/ydb/core/mind/bscontroller/mv_object_map_ut.cpp index 2d80013a1f..30028b5c1d 100644 --- a/ydb/core/mind/bscontroller/mv_object_map_ut.cpp +++ b/ydb/core/mind/bscontroller/mv_object_map_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "mv_object_map.h" #include "ut_helpers.h" diff --git a/ydb/core/mind/bscontroller/ut_selfheal/main.cpp b/ydb/core/mind/bscontroller/ut_selfheal/main.cpp index 79bba0a26a..4f2d5057b5 100644 --- a/ydb/core/mind/bscontroller/ut_selfheal/main.cpp +++ b/ydb/core/mind/bscontroller/ut_selfheal/main.cpp @@ -1,6 +1,6 @@ #include <ydb/core/mind/bscontroller/ut_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "env.h" diff --git a/ydb/core/mind/hive/hive_impl_ut.cpp b/ydb/core/mind/hive/hive_impl_ut.cpp index 077c3eab24..b3444ac420 100644 --- a/ydb/core/mind/hive/hive_impl_ut.cpp +++ b/ydb/core/mind/hive/hive_impl_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/null.h> #include "hive_impl.h" #include "balancer.h" diff --git a/ydb/core/mind/hive/hive_ut.cpp b/ydb/core/mind/hive/hive_ut.cpp index 0383d49a12..2510578f14 100644 --- a/ydb/core/mind/hive/hive_ut.cpp +++ b/ydb/core/mind/hive/hive_ut.cpp @@ -30,7 +30,7 @@ #include <util/system/sanitizers.h> #include <google/protobuf/text_format.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #ifdef NDEBUG #define Ctest Cnull diff --git a/ydb/core/mind/hive/sequencer_ut.cpp b/ydb/core/mind/hive/sequencer_ut.cpp index 513159c76f..e8f9a24423 100644 --- a/ydb/core/mind/hive/sequencer_ut.cpp +++ b/ydb/core/mind/hive/sequencer_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include "sequencer.h" using namespace NKikimr; diff --git a/ydb/core/mind/hive/storage_pool_info_ut.cpp b/ydb/core/mind/hive/storage_pool_info_ut.cpp index d0e21abc3f..6afaf3d0e4 100644 --- a/ydb/core/mind/hive/storage_pool_info_ut.cpp +++ b/ydb/core/mind/hive/storage_pool_info_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <ydb/core/protos/blobstorage.pb.h> #include "storage_pool_info.h" diff --git a/ydb/core/mind/hive/ut/ya.make b/ydb/core/mind/hive/ut/ya.make index e5f2423eaf..fa16c204a8 100644 --- a/ydb/core/mind/hive/ut/ya.make +++ b/ydb/core/mind/hive/ut/ya.make @@ -13,7 +13,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/base ydb/core/mind diff --git a/ydb/core/mind/node_broker.cpp b/ydb/core/mind/node_broker.cpp index a2ef938369..4463536f99 100644 --- a/ydb/core/mind/node_broker.cpp +++ b/ydb/core/mind/node_broker.cpp @@ -372,7 +372,7 @@ void TNodeBroker::PrepareEpochCache() for (auto &entry : ExpiredNodes) FillNodeInfo(entry.second, *info.AddExpiredNodes()); - Y_PROTOBUF_SUPPRESS_NODISCARD info.SerializeToString(&EpochCache); + Y_PROTOBUF_SUPPRESS_NODISCARD info.SerializeToString(&EpochCache); } void TNodeBroker::AddNodeToEpochCache(const TNodeInfo &node) @@ -384,7 +384,7 @@ void TNodeBroker::AddNodeToEpochCache(const TNodeInfo &node) FillNodeInfo(node, *info.AddNodes()); TString delta; - Y_PROTOBUF_SUPPRESS_NODISCARD info.SerializeToString(&delta); + Y_PROTOBUF_SUPPRESS_NODISCARD info.SerializeToString(&delta); EpochCache += delta; } @@ -528,7 +528,7 @@ bool TNodeBroker::DbLoadState(TTransactionContext &txc, if (configRow.IsValid()) { auto configString = configRow.GetValue<Schema::Config::Value>(); NKikimrNodeBroker::TConfig config; - Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configString.data(), configString.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configString.data(), configString.size()); LoadConfigFromProto(config); LOG_DEBUG_S(ctx, NKikimrServices::NODE_BROKER, @@ -679,7 +679,7 @@ void TNodeBroker::DbUpdateConfig(const NKikimrNodeBroker::TConfig &config, << " config=" << config.ShortDebugString()); TString value; - Y_PROTOBUF_SUPPRESS_NODISCARD config.SerializeToString(&value); + Y_PROTOBUF_SUPPRESS_NODISCARD config.SerializeToString(&value); NIceDb::TNiceDb db(txc.DB); db.Table<Schema::Config>().Key(ConfigKeyConfig) .Update<Schema::Config::Value>(value); diff --git a/ydb/core/mind/node_broker_ut.cpp b/ydb/core/mind/node_broker_ut.cpp index 0d9498ddcd..079db8c1aa 100644 --- a/ydb/core/mind/node_broker_ut.cpp +++ b/ydb/core/mind/node_broker_ut.cpp @@ -17,7 +17,7 @@ #include <google/protobuf/text_format.h> #include <library/cpp/malloc/api/malloc.h> #include <library/cpp/svnversion/svnversion.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/printf.h> #include <util/string/subst.h> diff --git a/ydb/core/mind/tenant_node_enumeration_ut.cpp b/ydb/core/mind/tenant_node_enumeration_ut.cpp index f8c7a505c2..3d4cae59bd 100644 --- a/ydb/core/mind/tenant_node_enumeration_ut.cpp +++ b/ydb/core/mind/tenant_node_enumeration_ut.cpp @@ -1,7 +1,7 @@ #include "tenant_node_enumeration.h" #include <ydb/core/testlib/tenant_runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/mind/tenant_slot_broker__load_state.cpp b/ydb/core/mind/tenant_slot_broker__load_state.cpp index 345b131ea3..561614285a 100644 --- a/ydb/core/mind/tenant_slot_broker__load_state.cpp +++ b/ydb/core/mind/tenant_slot_broker__load_state.cpp @@ -48,7 +48,7 @@ public: if (configRow.IsValid()) { auto configString = configRow.GetValue<Schema::Config::Value>(); NKikimrTenantSlotBroker::TConfig config; - Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configString.data(), configString.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD config.ParseFromArray(configString.data(), configString.size()); Self->LoadConfigFromProto(config); LOG_DEBUG_S(ctx, NKikimrServices::TENANT_SLOT_BROKER, diff --git a/ydb/core/mind/tenant_slot_broker__update_config.cpp b/ydb/core/mind/tenant_slot_broker__update_config.cpp index 360b28d9c1..3e918686d1 100644 --- a/ydb/core/mind/tenant_slot_broker__update_config.cpp +++ b/ydb/core/mind/tenant_slot_broker__update_config.cpp @@ -28,7 +28,7 @@ public: NIceDb::TNiceDb db(txc.DB); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD rec.GetConfig().GetTenantSlotBrokerConfig().SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD rec.GetConfig().GetTenantSlotBrokerConfig().SerializeToString(&config); db.Table<Schema::Config>().Key(ConfigKey_Config) .Update(NIceDb::TUpdate<Schema::Config::Value>(config)); diff --git a/ydb/core/mind/tenant_ut_broker.cpp b/ydb/core/mind/tenant_ut_broker.cpp index 4c124b3d83..35ae6309ae 100644 --- a/ydb/core/mind/tenant_ut_broker.cpp +++ b/ydb/core/mind/tenant_ut_broker.cpp @@ -9,7 +9,7 @@ #include <ydb/core/testlib/tablet_helpers.h> #include <ydb/core/testlib/tenant_runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> diff --git a/ydb/core/mind/tenant_ut_local.cpp b/ydb/core/mind/tenant_ut_local.cpp index 5aab98212d..1d4d024056 100644 --- a/ydb/core/mind/tenant_ut_local.cpp +++ b/ydb/core/mind/tenant_ut_local.cpp @@ -1,6 +1,6 @@ #include <ydb/core/testlib/tenant_runtime.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/mind/tenant_ut_pool.cpp b/ydb/core/mind/tenant_ut_pool.cpp index 9ac6b6843c..fb55dc4c92 100644 --- a/ydb/core/mind/tenant_ut_pool.cpp +++ b/ydb/core/mind/tenant_ut_pool.cpp @@ -2,7 +2,7 @@ #include <ydb/core/testlib/tenant_runtime.h> #include <ydb/core/testlib/tenant_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/mind/ut/ya.make b/ydb/core/mind/ut/ya.make index 26e6412fc7..f173f3cc43 100644 --- a/ydb/core/mind/ut/ya.make +++ b/ydb/core/mind/ut/ya.make @@ -28,7 +28,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/testlib diff --git a/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp b/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp index 011f03d93c..35c30588ab 100644 --- a/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp +++ b/ydb/core/mind/ut_fat/blobstorage_node_warden_ut_fat.cpp @@ -22,7 +22,7 @@ #include <util/string/subst.h> #include <google/protobuf/text_format.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> const bool STRAND_PDISK = true; #ifndef NDEBUG diff --git a/ydb/core/mind/ut_fat/ya.make b/ydb/core/mind/ut_fat/ya.make index 77d6d68dd0..b855249496 100644 --- a/ydb/core/mind/ut_fat/ya.make +++ b/ydb/core/mind/ut_fat/ya.make @@ -13,7 +13,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/base diff --git a/ydb/core/mon/mon.cpp b/ydb/core/mon/mon.cpp index d4722266f3..b9cb182bc2 100644 --- a/ydb/core/mon/mon.cpp +++ b/ydb/core/mon/mon.cpp @@ -10,8 +10,8 @@ #include <library/cpp/monlib/service/pages/mon_page.h> #include <library/cpp/monlib/dynamic_counters/counters.h> #include <library/cpp/monlib/dynamic_counters/page.h> -#include <library/cpp/threading/future/future.h> -#include <library/cpp/string_utils/url/url.h> +#include <library/cpp/threading/future/future.h> +#include <library/cpp/string_utils/url/url.h> #include <util/system/event.h> #include <ydb/core/base/appdata.h> #include <ydb/core/base/monitoring_provider.h> diff --git a/ydb/core/mon/ya.make b/ydb/core/mon/ya.make index c717b0f5b9..113c69c981 100644 --- a/ydb/core/mon/ya.make +++ b/ydb/core/mon/ya.make @@ -16,7 +16,7 @@ SRCS( PEERDIR( library/cpp/actors/core library/cpp/lwtrace/mon - library/cpp/string_utils/url + library/cpp/string_utils/url ydb/core/base ydb/library/aclib ) diff --git a/ydb/core/mon_alloc/monitor.cpp b/ydb/core/mon_alloc/monitor.cpp index 8afc7852c9..3e54f971b1 100644 --- a/ydb/core/mon_alloc/monitor.cpp +++ b/ydb/core/mon_alloc/monitor.cpp @@ -9,7 +9,7 @@ #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/prof/tag.h> #include <library/cpp/html/pcdata/pcdata.h> -#include <library/cpp/lfalloc/dbg_info/dbg_info.h> +#include <library/cpp/lfalloc/dbg_info/dbg_info.h> #include <library/cpp/malloc/api/malloc.h> #include <library/cpp/monlib/dynamic_counters/counters.h> #include <library/cpp/monlib/service/pages/templates.h> diff --git a/ydb/core/mon_alloc/profiler.cpp b/ydb/core/mon_alloc/profiler.cpp index bfff45c180..aaae0ff2cf 100644 --- a/ydb/core/mon_alloc/profiler.cpp +++ b/ydb/core/mon_alloc/profiler.cpp @@ -11,7 +11,7 @@ #include <library/cpp/monlib/service/pages/templates.h> #if defined(PROFILE_MEMORY_ALLOCATIONS) -#include <library/cpp/lfalloc/alloc_profiler/profiler.h> +#include <library/cpp/lfalloc/alloc_profiler/profiler.h> #include <library/cpp/ytalloc/api/ytalloc.h> #endif diff --git a/ydb/core/mon_alloc/stats.cpp b/ydb/core/mon_alloc/stats.cpp index 050822241c..538c2412a2 100644 --- a/ydb/core/mon_alloc/stats.cpp +++ b/ydb/core/mon_alloc/stats.cpp @@ -6,7 +6,7 @@ #include <library/cpp/actors/core/actor_bootstrapped.h> #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/process_stats.h> -#include <library/cpp/lfalloc/dbg_info/dbg_info.h> +#include <library/cpp/lfalloc/dbg_info/dbg_info.h> #include <library/cpp/malloc/api/malloc.h> #include <library/cpp/monlib/dynamic_counters/counters.h> #include <library/cpp/ytalloc/api/ytalloc.h> diff --git a/ydb/core/mon_alloc/ya.make b/ydb/core/mon_alloc/ya.make index 972ea082f3..158114344d 100644 --- a/ydb/core/mon_alloc/ya.make +++ b/ydb/core/mon_alloc/ya.make @@ -18,8 +18,8 @@ PEERDIR( library/cpp/actors/core library/cpp/actors/prof library/cpp/html/pcdata - library/cpp/lfalloc/alloc_profiler - library/cpp/lfalloc/dbg_info + library/cpp/lfalloc/alloc_profiler + library/cpp/lfalloc/dbg_info library/cpp/malloc/api library/cpp/monlib/service/pages library/cpp/ytalloc/api diff --git a/ydb/core/persqueue/internals_ut.cpp b/ydb/core/persqueue/internals_ut.cpp index d72ffe5e11..0ede040290 100644 --- a/ydb/core/persqueue/internals_ut.cpp +++ b/ydb/core/persqueue/internals_ut.cpp @@ -1,5 +1,5 @@ #include "blob.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NPQ { diff --git a/ydb/core/persqueue/partition.cpp b/ydb/core/persqueue/partition.cpp index cc8e2419cf..4945918874 100644 --- a/ydb/core/persqueue/partition.cpp +++ b/ydb/core/persqueue/partition.cpp @@ -1063,7 +1063,7 @@ void TPartition::AddMetaKey(TEvKeyValue::TEvRequest* request) { meta.SetEndOffset(Max(NewHead.GetNextOffset(), EndOffset)); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD meta.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD meta.SerializeToString(&out); write->SetKey(ikey.Data(), ikey.Size()); write->SetValue(out.c_str(), out.size()); @@ -3903,7 +3903,7 @@ void TPartition::WriteClientInfo(const ui64 cookie, TUserInfo& userInfo, const T userData.SetOffsetRewindSum(userInfo.ReadOffsetRewindSum); userData.SetReadRuleGeneration(readRuleGeneration); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD userData.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD userData.SerializeToString(&out); idata.Append(out.c_str(), out.size()); } diff --git a/ydb/core/persqueue/pq_l2_cache.h b/ydb/core/persqueue/pq_l2_cache.h index f9fcccbc8e..5f1e7a7d41 100644 --- a/ydb/core/persqueue/pq_l2_cache.h +++ b/ydb/core/persqueue/pq_l2_cache.h @@ -5,7 +5,7 @@ #include <ydb/core/protos/pqconfig.pb.h> #include <library/cpp/monlib/dynamic_counters/counters.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <util/generic/hash.h> diff --git a/ydb/core/persqueue/pq_ut.cpp b/ydb/core/persqueue/pq_ut.cpp index 13a6122910..33f284d694 100644 --- a/ydb/core/persqueue/pq_ut.cpp +++ b/ydb/core/persqueue/pq_ut.cpp @@ -14,7 +14,7 @@ #include <ydb/core/testlib/fake_scheme_shard.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> #include <util/system/valgrind.h> diff --git a/ydb/core/persqueue/pq_ut.h b/ydb/core/persqueue/pq_ut.h index 3db93bc104..6195102dbf 100644 --- a/ydb/core/persqueue/pq_ut.h +++ b/ydb/core/persqueue/pq_ut.h @@ -19,7 +19,7 @@ #include <ydb/core/testlib/fake_scheme_shard.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> #include <util/system/valgrind.h> @@ -1077,7 +1077,7 @@ void FillUserInfo(NKikimrClient::TKeyValueRequest_TCmdWrite* write, TString& cli userInfo.SetOffsetRewindSum(10); userInfo.SetReadRuleGeneration(1); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD userInfo.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD userInfo.SerializeToString(&out); TBuffer idata; idata.Append(out.c_str(), out.size()); diff --git a/ydb/core/persqueue/pq_ut_slow.cpp b/ydb/core/persqueue/pq_ut_slow.cpp index 51041c1045..d5ec3c478d 100644 --- a/ydb/core/persqueue/pq_ut_slow.cpp +++ b/ydb/core/persqueue/pq_ut_slow.cpp @@ -14,7 +14,7 @@ #include <ydb/core/testlib/fake_scheme_shard.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/sanitizers.h> #include <util/system/valgrind.h> diff --git a/ydb/core/persqueue/read_balancer.cpp b/ydb/core/persqueue/read_balancer.cpp index 4eb9c7206d..4e2388bb98 100644 --- a/ydb/core/persqueue/read_balancer.cpp +++ b/ydb/core/persqueue/read_balancer.cpp @@ -678,7 +678,7 @@ void TPersQueueReadBalancer::Handle(NSchemeShard::TEvSchemeShard::TEvDescribeSch const auto& record = ev->Get()->GetRecord(); if (record.GetStatus() == NKikimrScheme::EStatus::StatusSuccess) { ACL.Clear(); - Y_PROTOBUF_SUPPRESS_NODISCARD ACL.MutableACL()->ParseFromString(record.GetPathDescription().GetSelf().GetEffectiveACL()); + Y_PROTOBUF_SUPPRESS_NODISCARD ACL.MutableACL()->ParseFromString(record.GetPathDescription().GetSelf().GetEffectiveACL()); LastACLUpdate = ctx.Now(); ctx.Schedule(TDuration::Seconds(AppData(ctx)->PQConfig.GetBalancerMetadataRetryTimeoutSec()), new TEvPersQueue::TEvUpdateACL()); diff --git a/ydb/core/persqueue/type_codecs_ut.cpp b/ydb/core/persqueue/type_codecs_ut.cpp index d9f0b64755..cf3e876e5b 100644 --- a/ydb/core/persqueue/type_codecs_ut.cpp +++ b/ydb/core/persqueue/type_codecs_ut.cpp @@ -2,7 +2,7 @@ #include "type_codecs_defs.h" #include <ydb/core/scheme_types/scheme_types_defs.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/random/fast.h> diff --git a/ydb/core/persqueue/ut/ya.make b/ydb/core/persqueue/ut/ya.make index 7cbb0b9496..d498e51d09 100644 --- a/ydb/core/persqueue/ut/ya.make +++ b/ydb/core/persqueue/ut/ya.make @@ -20,7 +20,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/testlib diff --git a/ydb/core/persqueue/ut_slow/ya.make b/ydb/core/persqueue/ut_slow/ya.make index 9e018d205b..0ac79b0b5d 100644 --- a/ydb/core/persqueue/ut_slow/ya.make +++ b/ydb/core/persqueue/ut_slow/ya.make @@ -17,7 +17,7 @@ TAG(ya:fat) TIMEOUT(3600) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/testlib diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/options.h b/ydb/core/quoter/quoter_service_bandwidth_test/options.h index 6dd98ebaea..170d8f0037 100644 --- a/ydb/core/quoter/quoter_service_bandwidth_test/options.h +++ b/ydb/core/quoter/quoter_service_bandwidth_test/options.h @@ -1,5 +1,5 @@ #pragma once -#include <library/cpp/getopt/opt.h> +#include <library/cpp/getopt/opt.h> #include <library/cpp/colorizer/colors.h> #include <util/datetime/base.h> diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/ya.make b/ydb/core/quoter/quoter_service_bandwidth_test/ya.make index ddb00e5873..51b5205d61 100644 --- a/ydb/core/quoter/quoter_service_bandwidth_test/ya.make +++ b/ydb/core/quoter/quoter_service_bandwidth_test/ya.make @@ -7,7 +7,7 @@ OWNER( PEERDIR( library/cpp/colorizer - library/cpp/getopt + library/cpp/getopt ydb/core/base ydb/core/kesus/tablet ydb/core/quoter diff --git a/ydb/core/quoter/quoter_service_ut.cpp b/ydb/core/quoter/quoter_service_ut.cpp index 88c74ca3fb..dba740b572 100644 --- a/ydb/core/quoter/quoter_service_ut.cpp +++ b/ydb/core/quoter/quoter_service_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/core/testlib/tablet_helpers.h> #include <ydb/core/testlib/test_client.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/compiler.h> #include <util/system/valgrind.h> diff --git a/ydb/core/quoter/ut_helpers.h b/ydb/core/quoter/ut_helpers.h index ea76fdc0ae..29009bbbc8 100644 --- a/ydb/core/quoter/ut_helpers.h +++ b/ydb/core/quoter/ut_helpers.h @@ -14,7 +14,7 @@ #include <ydb/core/protos/kesus.pb.h> #include <library/cpp/testing/gmock_in_unittest/gmock.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash_set.h> diff --git a/ydb/core/scheme/scheme_borders_ut.cpp b/ydb/core/scheme/scheme_borders_ut.cpp index 59fefd3b0a..f1de53adf9 100644 --- a/ydb/core/scheme/scheme_borders_ut.cpp +++ b/ydb/core/scheme/scheme_borders_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/scheme_types/scheme_types.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> diff --git a/ydb/core/scheme/scheme_tablecell_ut.cpp b/ydb/core/scheme/scheme_tablecell_ut.cpp index 5bd4a27ab9..9c242501f8 100644 --- a/ydb/core/scheme/scheme_tablecell_ut.cpp +++ b/ydb/core/scheme/scheme_tablecell_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/scheme/scheme_tablecell.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> using namespace NActors; diff --git a/ydb/core/security/ticket_parser_ut.cpp b/ydb/core/security/ticket_parser_ut.cpp index 2b624efefe..7a08fa1500 100644 --- a/ydb/core/security/ticket_parser_ut.cpp +++ b/ydb/core/security/ticket_parser_ut.cpp @@ -1,8 +1,8 @@ #include <ydb/core/testlib/test_client.h> #include <ydb/public/sdk/cpp/client/ydb_driver/driver.h> #include <ydb/public/sdk/cpp/client/ydb_table/table.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <ydb/public/lib/deprecated/kicli/kicli.h> #include "ticket_parser.h" diff --git a/ydb/core/sys_view/partition_stats/partition_stats_ut.cpp b/ydb/core/sys_view/partition_stats/partition_stats_ut.cpp index c123012948..eaf5f6b6f7 100644 --- a/ydb/core/sys_view/partition_stats/partition_stats_ut.cpp +++ b/ydb/core/sys_view/partition_stats/partition_stats_ut.cpp @@ -4,7 +4,7 @@ #include <ydb/core/base/appdata.h> #include <ydb/core/sys_view/common/events.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NSysView { diff --git a/ydb/core/sys_view/partition_stats/ut/ya.make b/ydb/core/sys_view/partition_stats/ut/ya.make index 01f5bbd1c2..55ba78c504 100644 --- a/ydb/core/sys_view/partition_stats/ut/ya.make +++ b/ydb/core/sys_view/partition_stats/ut/ya.make @@ -12,7 +12,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ) diff --git a/ydb/core/sys_view/processor/processor_impl.cpp b/ydb/core/sys_view/processor/processor_impl.cpp index 86ddbfd423..21e16f118f 100644 --- a/ydb/core/sys_view/processor/processor_impl.cpp +++ b/ydb/core/sys_view/processor/processor_impl.cpp @@ -84,7 +84,7 @@ void TSysViewProcessor::PersistTopResults(NIceDb::TNiceDb& db, TString text; TString serialized; resultStats.MutableQueryText()->swap(text); - Y_PROTOBUF_SUPPRESS_NODISCARD resultStats.SerializeToString(&serialized); + Y_PROTOBUF_SUPPRESS_NODISCARD resultStats.SerializeToString(&serialized); db.Table<TSchema>().Key(key).Update( NIceDb::TUpdate<typename TSchema::Text>(text), NIceDb::TUpdate<typename TSchema::Data>(serialized)); @@ -119,7 +119,7 @@ void TSysViewProcessor::PersistResults(NIceDb::TNiceDb& db) { resultMetrics.Metrics = queryMetrics.Metrics; TString serialized; - Y_PROTOBUF_SUPPRESS_NODISCARD resultMetrics.Metrics.SerializeToString(&serialized); + Y_PROTOBUF_SUPPRESS_NODISCARD resultMetrics.Metrics.SerializeToString(&serialized); db.Table<Schema::MetricsOneMinute>().Key(key).Update( NIceDb::TUpdate<Schema::MetricsOneMinute::Text>(resultMetrics.Text), NIceDb::TUpdate<Schema::MetricsOneMinute::Data>(serialized)); diff --git a/ydb/core/sys_view/processor/tx_init.cpp b/ydb/core/sys_view/processor/tx_init.cpp index 89c7fd637f..9c62efacbb 100644 --- a/ydb/core/sys_view/processor/tx_init.cpp +++ b/ydb/core/sys_view/processor/tx_init.cpp @@ -30,11 +30,11 @@ struct TSysViewProcessor::TTxInit : public TTxBase { if constexpr (std::is_same<TEntry, TQueryToMetrics>::value) { result.Text = std::move(text); if (data) { - Y_PROTOBUF_SUPPRESS_NODISCARD result.Metrics.ParseFromString(data); + Y_PROTOBUF_SUPPRESS_NODISCARD result.Metrics.ParseFromString(data); } } else { if (data) { - Y_PROTOBUF_SUPPRESS_NODISCARD result.ParseFromString(data); + Y_PROTOBUF_SUPPRESS_NODISCARD result.ParseFromString(data); } result.SetQueryText(std::move(text)); } @@ -184,7 +184,7 @@ struct TSysViewProcessor::TTxInit : public TTxBase { auto& queryMetrics = Self->QueryMetrics[queryHash]; queryMetrics.Text = text; if (metrics) { - Y_PROTOBUF_SUPPRESS_NODISCARD queryMetrics.Metrics.ParseFromString(metrics); + Y_PROTOBUF_SUPPRESS_NODISCARD queryMetrics.Metrics.ParseFromString(metrics); } if (!rowset.Next()) { @@ -222,7 +222,7 @@ struct TSysViewProcessor::TTxInit : public TTxBase { TTopQuery query{queryHash, value, nodeId, {}}; if (stats) { query.Stats = MakeHolder<NKikimrSysView::TQueryStats>(); - Y_PROTOBUF_SUPPRESS_NODISCARD query.Stats->ParseFromString(stats); + Y_PROTOBUF_SUPPRESS_NODISCARD query.Stats->ParseFromString(stats); } switch ((NKikimrSysView::EStatsType)type) { diff --git a/ydb/core/sys_view/processor/tx_interval_metrics.cpp b/ydb/core/sys_view/processor/tx_interval_metrics.cpp index 4c6d992487..44b8c156fb 100644 --- a/ydb/core/sys_view/processor/tx_interval_metrics.cpp +++ b/ydb/core/sys_view/processor/tx_interval_metrics.cpp @@ -47,7 +47,7 @@ struct TSysViewProcessor::TTxIntervalMetrics : public TTxBase { } TString serialized; - Y_PROTOBUF_SUPPRESS_NODISCARD newMetrics.SerializeToString(&serialized); + Y_PROTOBUF_SUPPRESS_NODISCARD newMetrics.SerializeToString(&serialized); db.Table<Schema::IntervalMetrics>().Key(queryHash).Update( NIceDb::TUpdate<Schema::IntervalMetrics::Metrics>(serialized)); } @@ -63,7 +63,7 @@ struct TSysViewProcessor::TTxIntervalMetrics : public TTxBase { if (query.Hash == queryHash) { query.Stats = MakeHolder<NKikimrSysView::TQueryStats>(); query.Stats->CopyFrom(stats); - Y_PROTOBUF_SUPPRESS_NODISCARD query.Stats->SerializeToString(&serialized); + Y_PROTOBUF_SUPPRESS_NODISCARD query.Stats->SerializeToString(&serialized); db.Table<Schema::IntervalTops>().Key((ui32)minuteType, queryHash).Update( NIceDb::TUpdate<Schema::IntervalTops::Stats>(serialized)); break; diff --git a/ydb/core/sys_view/query_stats/query_stats_ut.cpp b/ydb/core/sys_view/query_stats/query_stats_ut.cpp index 4b8c5141cb..8e28e9bd82 100644 --- a/ydb/core/sys_view/query_stats/query_stats_ut.cpp +++ b/ydb/core/sys_view/query_stats/query_stats_ut.cpp @@ -1,6 +1,6 @@ #include "query_stats.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NSysView { diff --git a/ydb/core/sys_view/query_stats/ut/ya.make b/ydb/core/sys_view/query_stats/ut/ya.make index 89561102ce..0c66dd6d81 100644 --- a/ydb/core/sys_view/query_stats/ut/ya.make +++ b/ydb/core/sys_view/query_stats/ut/ya.make @@ -12,7 +12,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ) diff --git a/ydb/core/sys_view/service/query_history_ut.cpp b/ydb/core/sys_view/service/query_history_ut.cpp index 9c64e9a4f3..3a14b45e2b 100644 --- a/ydb/core/sys_view/service/query_history_ut.cpp +++ b/ydb/core/sys_view/service/query_history_ut.cpp @@ -1,6 +1,6 @@ #include "query_history.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/xrange.h> #include <util/digest/murmur.h> diff --git a/ydb/core/sys_view/service/ut/ya.make b/ydb/core/sys_view/service/ut/ya.make index 60f2fd4b7a..6cbd3fadb5 100644 --- a/ydb/core/sys_view/service/ut/ya.make +++ b/ydb/core/sys_view/service/ut/ya.make @@ -10,7 +10,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ) SRCS( diff --git a/ydb/core/sys_view/ut_common.h b/ydb/core/sys_view/ut_common.h index e142b96909..e4cde12b2e 100644 --- a/ydb/core/sys_view/ut_common.h +++ b/ydb/core/sys_view/ut_common.h @@ -5,7 +5,7 @@ #include <ydb/public/sdk/cpp/client/ydb_table/table.h> #include <ydb/public/sdk/cpp/client/ydb_scheme/scheme.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NSysView { diff --git a/ydb/core/sys_view/ut_kqp/ya.make b/ydb/core/sys_view/ut_kqp/ya.make index 3b75f4e6fe..1d8448cf4f 100644 --- a/ydb/core/sys_view/ut_kqp/ya.make +++ b/ydb/core/sys_view/ut_kqp/ya.make @@ -17,7 +17,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest library/cpp/yson/node ydb/core/kqp/ut/common ydb/core/testlib diff --git a/ydb/core/tablet/pipe_tracker_ut.cpp b/ydb/core/tablet/pipe_tracker_ut.cpp index 2a67c756d5..9088c077e2 100644 --- a/ydb/core/tablet/pipe_tracker_ut.cpp +++ b/ydb/core/tablet/pipe_tracker_ut.cpp @@ -1,5 +1,5 @@ #include "pipe_tracker.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tablet/resource_broker_ut.cpp b/ydb/core/tablet/resource_broker_ut.cpp index 5948509025..8a56ab7523 100644 --- a/ydb/core/tablet/resource_broker_ut.cpp +++ b/ydb/core/tablet/resource_broker_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #ifndef NDEBUG const bool ENABLE_DETAILED_RESOURCE_BROKER_LOG = true; diff --git a/ydb/core/tablet/tablet_counters_aggregator_ut.cpp b/ydb/core/tablet/tablet_counters_aggregator_ut.cpp index 707ffb977e..8015086cbb 100644 --- a/ydb/core/tablet/tablet_counters_aggregator_ut.cpp +++ b/ydb/core/tablet/tablet_counters_aggregator_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/actors/core/interconnect.h> #include <ydb/core/testlib/basics/runtime.h> #include <ydb/core/testlib/basics/appdata.h> diff --git a/ydb/core/tablet/tablet_metrics_ut.cpp b/ydb/core/tablet/tablet_metrics_ut.cpp index 57cab15a5d..a1421665c3 100644 --- a/ydb/core/tablet/tablet_metrics_ut.cpp +++ b/ydb/core/tablet/tablet_metrics_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/tablet_flat/flat_database.h> #include "tablet_metrics.h" diff --git a/ydb/core/tablet/tablet_pipe_ut.cpp b/ydb/core/tablet/tablet_pipe_ut.cpp index 2a528070fb..c7944a9f41 100644 --- a/ydb/core/tablet/tablet_pipe_ut.cpp +++ b/ydb/core/tablet/tablet_pipe_ut.cpp @@ -4,7 +4,7 @@ #include <library/cpp/actors/protos/services_common.pb.h> #include <ydb/core/base/tablet_resolver.h> #include <ydb/core/tx/tx.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/tablet_flat/tablet_flat_executed.h> #include <library/cpp/actors/core/hfunc.h> diff --git a/ydb/core/tablet/ut/ya.make b/ydb/core/tablet/ut/ya.make index 52440600e1..5c059f9c18 100644 --- a/ydb/core/tablet/ut/ya.make +++ b/ydb/core/tablet/ut/ya.make @@ -14,7 +14,7 @@ TIMEOUT(600) SPLIT_FACTOR(50) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/regex/pcre library/cpp/svnversion ydb/core/testlib diff --git a/ydb/core/tablet_flat/datetime_ut.cpp b/ydb/core/tablet_flat/datetime_ut.cpp index 67c77235a8..af81cdd78b 100644 --- a/ydb/core/tablet_flat/datetime_ut.cpp +++ b/ydb/core/tablet_flat/datetime_ut.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/exec/runner.h> #include <ydb/core/tablet_flat/ut/flat_database_ut_common.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTabletFlatExecutor { diff --git a/ydb/core/tablet_flat/decimal_ut.cpp b/ydb/core/tablet_flat/decimal_ut.cpp index 685215aa5a..acce51e492 100644 --- a/ydb/core/tablet_flat/decimal_ut.cpp +++ b/ydb/core/tablet_flat/decimal_ut.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/exec/runner.h> #include <ydb/core/tablet_flat/ut/flat_database_ut_common.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTabletFlatExecutor { diff --git a/ydb/core/tablet_flat/flat_bloom_hash.h b/ydb/core/tablet_flat/flat_bloom_hash.h index 93d7060a16..f9d37fafe9 100644 --- a/ydb/core/tablet_flat/flat_bloom_hash.h +++ b/ydb/core/tablet_flat/flat_bloom_hash.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <ydb/core/scheme/scheme_tablecell.h> #include <util/digest/murmur.h> diff --git a/ydb/core/tablet_flat/flat_comp_shard.cpp b/ydb/core/tablet_flat/flat_comp_shard.cpp index a3a58f923e..462752f2da 100644 --- a/ydb/core/tablet_flat/flat_comp_shard.cpp +++ b/ydb/core/tablet_flat/flat_comp_shard.cpp @@ -2644,7 +2644,7 @@ namespace NCompShard { for (auto& shard : Shards) { header.AddShards(shard.Id); } - Y_PROTOBUF_SUPPRESS_NODISCARD header.SerializeToString(out); + Y_PROTOBUF_SUPPRESS_NODISCARD header.SerializeToString(out); } } diff --git a/ydb/core/tablet_flat/flat_cxx_database.h b/ydb/core/tablet_flat/flat_cxx_database.h index 27a260bcb2..f611a4625a 100644 --- a/ydb/core/tablet_flat/flat_cxx_database.h +++ b/ydb/core/tablet_flat/flat_cxx_database.h @@ -6,7 +6,7 @@ #include <util/system/type_name.h> #include <util/system/unaligned_mem.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <utility> #include <cxxabi.h> diff --git a/ydb/core/tablet_flat/flat_cxx_database_ut.cpp b/ydb/core/tablet_flat/flat_cxx_database_ut.cpp index 0423d82e62..727df89da4 100644 --- a/ydb/core/tablet_flat/flat_cxx_database_ut.cpp +++ b/ydb/core/tablet_flat/flat_cxx_database_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/tablet_flat/test/libs/table/test_dummy.h> #include <ydb/library/mkql_proto/protos/minikql.pb.h> #include "flat_cxx_database.h" diff --git a/ydb/core/tablet_flat/flat_database.cpp b/ydb/core/tablet_flat/flat_database.cpp index c459119515..274aaa45ed 100644 --- a/ydb/core/tablet_flat/flat_database.cpp +++ b/ydb/core/tablet_flat/flat_database.cpp @@ -502,7 +502,7 @@ TDatabase::TProd TDatabase::Commit(TTxStamp stamp, bool commit, TCookieAllocator auto delta = Alter_->Flush(); if (DatabaseImpl->Apply(*delta, &prefix)) - Y_PROTOBUF_SUPPRESS_NODISCARD delta->SerializeToString(&Change->Scheme); + Y_PROTOBUF_SUPPRESS_NODISCARD delta->SerializeToString(&Change->Scheme); } for (auto &one: Change->Snapshots) { diff --git a/ydb/core/tablet_flat/flat_executor_database_ut.cpp b/ydb/core/tablet_flat/flat_executor_database_ut.cpp index 0168615c55..f38ea63d21 100644 --- a/ydb/core/tablet_flat/flat_executor_database_ut.cpp +++ b/ydb/core/tablet_flat/flat_executor_database_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/tablet_flat/test/libs/exec/dummy.h> #include <ydb/core/tablet_flat/test/libs/exec/nanny.h> #include <ydb/core/tablet_flat/test/libs/exec/fuzzy.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "flat_database.h" #include <util/system/sanitizers.h> diff --git a/ydb/core/tablet_flat/flat_executor_gclogic_ut.cpp b/ydb/core/tablet_flat/flat_executor_gclogic_ut.cpp index 8c0c5ac6f0..8bb625b33a 100644 --- a/ydb/core/tablet_flat/flat_executor_gclogic_ut.cpp +++ b/ydb/core/tablet_flat/flat_executor_gclogic_ut.cpp @@ -1,5 +1,5 @@ #include "flat_executor_gclogic.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTabletFlatExecutor { diff --git a/ydb/core/tablet_flat/flat_iterator.h b/ydb/core/tablet_flat/flat_iterator.h index 60195c17b4..63db239760 100644 --- a/ydb/core/tablet_flat/flat_iterator.h +++ b/ydb/core/tablet_flat/flat_iterator.h @@ -7,7 +7,7 @@ #include "flat_range_cache.h" #include "util_fmt_cell.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/draft/holder_vector.h> #include <util/generic/vector.h> diff --git a/ydb/core/tablet_flat/flat_mem_warm.h b/ydb/core/tablet_flat/flat_mem_warm.h index 96bb9d65fa..81ae9a7a4c 100644 --- a/ydb/core/tablet_flat/flat_mem_warm.h +++ b/ydb/core/tablet_flat/flat_mem_warm.h @@ -14,7 +14,7 @@ #include <ydb/core/util/btree_cow.h> #include <ydb/core/util/yverify_stream.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/vector.h> #include <util/memory/pool.h> diff --git a/ydb/core/tablet_flat/flat_part_overlay.cpp b/ydb/core/tablet_flat/flat_part_overlay.cpp index d0e635e807..e2e6e55e72 100644 --- a/ydb/core/tablet_flat/flat_part_overlay.cpp +++ b/ydb/core/tablet_flat/flat_part_overlay.cpp @@ -72,7 +72,7 @@ TString TOverlay::Encode() const noexcept } TString encoded; - Y_PROTOBUF_SUPPRESS_NODISCARD plain.SerializeToString(&encoded); + Y_PROTOBUF_SUPPRESS_NODISCARD plain.SerializeToString(&encoded); return encoded; } @@ -208,7 +208,7 @@ TString TOverlay::EncodeRemoveSlices(const TIntrusiveConstPtr<TSlices>& slices) SlicesToProto(*slices, plain.MutableRemovedSlices()); TString encoded; - Y_PROTOBUF_SUPPRESS_NODISCARD plain.SerializeToString(&encoded); + Y_PROTOBUF_SUPPRESS_NODISCARD plain.SerializeToString(&encoded); return encoded; } @@ -221,7 +221,7 @@ TString TOverlay::EncodeChangeSlices(TConstArrayRef<TSlice> slices) noexcept SlicesToProto(slices, plain.MutableChangedSlices()); TString encoded; - Y_PROTOBUF_SUPPRESS_NODISCARD plain.SerializeToString(&encoded); + Y_PROTOBUF_SUPPRESS_NODISCARD plain.SerializeToString(&encoded); return encoded; } diff --git a/ydb/core/tablet_flat/flat_part_writer.h b/ydb/core/tablet_flat/flat_part_writer.h index 4e04732cd9..16774b0f0d 100644 --- a/ydb/core/tablet_flat/flat_part_writer.h +++ b/ydb/core/tablet_flat/flat_part_writer.h @@ -650,7 +650,7 @@ namespace NTable { } TString blob; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&blob); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&blob); return blob; } diff --git a/ydb/core/tablet_flat/flat_range_cache_ut.cpp b/ydb/core/tablet_flat/flat_range_cache_ut.cpp index b5211519d9..9ea2c29d5f 100644 --- a/ydb/core/tablet_flat/flat_range_cache_ut.cpp +++ b/ydb/core/tablet_flat/flat_range_cache_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/tablet_flat/test/libs/table/test_dummy.h> #include <ydb/library/mkql_proto/protos/minikql.pb.h> #include "flat_cxx_database.h" diff --git a/ydb/core/tablet_flat/flat_row_nulls.h b/ydb/core/tablet_flat/flat_row_nulls.h index f4e664b7cc..2f5a64b65c 100644 --- a/ydb/core/tablet_flat/flat_row_nulls.h +++ b/ydb/core/tablet_flat/flat_row_nulls.h @@ -4,7 +4,7 @@ #include "util_basics.h" #include <ydb/core/scheme/scheme_tablecell.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/array_ref.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/flat_row_remap.h b/ydb/core/tablet_flat/flat_row_remap.h index 22f304131a..e8764d6326 100644 --- a/ydb/core/tablet_flat/flat_row_remap.h +++ b/ydb/core/tablet_flat/flat_row_remap.h @@ -4,7 +4,7 @@ #include "flat_row_scheme.h" #include <ydb/core/scheme/scheme_tablecell.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/vector.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/flat_row_state.h b/ydb/core/tablet_flat/flat_row_state.h index b51d732785..185275eeb2 100644 --- a/ydb/core/tablet_flat/flat_row_state.h +++ b/ydb/core/tablet_flat/flat_row_state.h @@ -2,7 +2,7 @@ #include "flat_row_eggs.h" #include <ydb/core/scheme/scheme_tablecell.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/flat_row_versions_ut.cpp b/ydb/core/tablet_flat/flat_row_versions_ut.cpp index ce25730e2a..bdde8350be 100644 --- a/ydb/core/tablet_flat/flat_row_versions_ut.cpp +++ b/ydb/core/tablet_flat/flat_row_versions_ut.cpp @@ -1,6 +1,6 @@ #include "flat_row_versions.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/flat_stat_part.h b/ydb/core/tablet_flat/flat_stat_part.h index 230f94f04c..46bc64f73a 100644 --- a/ydb/core/tablet_flat/flat_stat_part.h +++ b/ydb/core/tablet_flat/flat_stat_part.h @@ -5,7 +5,7 @@ #include "flat_page_frames.h" #include "util_basics.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/draft/holder_vector.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/flat_table.h b/ydb/core/tablet_flat/flat_table.h index a1fdeb9709..8f25413aec 100644 --- a/ydb/core/tablet_flat/flat_table.h +++ b/ydb/core/tablet_flat/flat_table.h @@ -17,7 +17,7 @@ #include "util_basics.h" #include <ydb/core/scheme/scheme_tablecell.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/deque.h> #include <util/generic/set.h> diff --git a/ydb/core/tablet_flat/flat_table_part.cpp b/ydb/core/tablet_flat/flat_table_part.cpp index 235229cc35..8591e0d702 100644 --- a/ydb/core/tablet_flat/flat_table_part.cpp +++ b/ydb/core/tablet_flat/flat_table_part.cpp @@ -5,7 +5,7 @@ #include <ydb/core/util/pb.h> #include <ydb/core/tablet_flat/protos/flat_table_part.pb.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/map.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/flat_table_part_ut.cpp b/ydb/core/tablet_flat/flat_table_part_ut.cpp index 185265a95e..75a0979f0d 100644 --- a/ydb/core/tablet_flat/flat_table_part_ut.cpp +++ b/ydb/core/tablet_flat/flat_table_part_ut.cpp @@ -7,7 +7,7 @@ #include "flat_stat_table.h" #include "flat_page_other.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/null.h> #include <util/random/mersenne.h> diff --git a/ydb/core/tablet_flat/logic_redo_batch.h b/ydb/core/tablet_flat/logic_redo_batch.h index 4ddf977ddb..a21f00e547 100644 --- a/ydb/core/tablet_flat/logic_redo_batch.h +++ b/ydb/core/tablet_flat/logic_redo_batch.h @@ -5,7 +5,7 @@ #include <util/generic/string.h> #include <util/generic/vector.h> #include <util/generic/hash_set.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { namespace NTabletFlatExecutor { diff --git a/ydb/core/tablet_flat/shared_handle_ut.cpp b/ydb/core/tablet_flat/shared_handle_ut.cpp index 847f3f97af..5fafcc9442 100644 --- a/ydb/core/tablet_flat/shared_handle_ut.cpp +++ b/ydb/core/tablet_flat/shared_handle_ut.cpp @@ -1,6 +1,6 @@ #include "shared_handle.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/shared_sausagecache.cpp b/ydb/core/tablet_flat/shared_sausagecache.cpp index c60c30202b..decbe85850 100644 --- a/ydb/core/tablet_flat/shared_sausagecache.cpp +++ b/ydb/core/tablet_flat/shared_sausagecache.cpp @@ -7,7 +7,7 @@ #include <ydb/core/util/page_map.h> #include <ydb/core/base/blobstorage.h> #include <library/cpp/actors/core/hfunc.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/set.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/test/libs/exec/owner.h b/ydb/core/tablet_flat/test/libs/exec/owner.h index f3e3d7363c..c581480019 100644 --- a/ydb/core/tablet_flat/test/libs/exec/owner.h +++ b/ydb/core/tablet_flat/test/libs/exec/owner.h @@ -11,7 +11,7 @@ #include <ydb/core/tablet/tablet_setup.h> #include <ydb/core/tablet_flat/util_fmt_logger.h> #include <ydb/core/tablet_flat/util_fmt_abort.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NFake { diff --git a/ydb/core/tablet_flat/test/libs/rows/tool.h b/ydb/core/tablet_flat/test/libs/rows/tool.h index b02aa443bf..b0658bb874 100644 --- a/ydb/core/tablet_flat/test/libs/rows/tool.h +++ b/ydb/core/tablet_flat/test/libs/rows/tool.h @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/flat_row_column.h> #include <ydb/core/tablet_flat/flat_row_celled.h> #include <ydb/core/tablet_flat/flat_update_op.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/vector.h> #include <util/generic/utility.h> diff --git a/ydb/core/tablet_flat/test/libs/table/test_iter.h b/ydb/core/tablet_flat/test/libs/table/test_iter.h index f4010ab2b6..a240c5affc 100644 --- a/ydb/core/tablet_flat/test/libs/table/test_iter.h +++ b/ydb/core/tablet_flat/test/libs/table/test_iter.h @@ -6,7 +6,7 @@ #include <ydb/core/tablet_flat/test/libs/rows/cook.h> #include <ydb/core/tablet_flat/test/libs/rows/tool.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/test/tool/perf/main.cpp b/ydb/core/tablet_flat/test/tool/perf/main.cpp index 326e18ac2b..eb95afa162 100644 --- a/ydb/core/tablet_flat/test/tool/perf/main.cpp +++ b/ydb/core/tablet_flat/test/tool/perf/main.cpp @@ -1,6 +1,6 @@ #include "app.h" -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <util/generic/yexception.h> int main(int argc, char* argv[]) diff --git a/ydb/core/tablet_flat/test/tool/surg/main.cpp b/ydb/core/tablet_flat/test/tool/surg/main.cpp index c196de6a7e..7972881e13 100644 --- a/ydb/core/tablet_flat/test/tool/surg/main.cpp +++ b/ydb/core/tablet_flat/test/tool/surg/main.cpp @@ -7,7 +7,7 @@ #include <ydb/core/protos/tablet.pb.h> #include <ydb/core/util/pb.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <library/cpp/blockcodecs/codecs.h> #include <util/generic/yexception.h> #include <util/stream/file.h> diff --git a/ydb/core/tablet_flat/test/tool/surg/ya.make b/ydb/core/tablet_flat/test/tool/surg/ya.make index 18495b00b9..69bca357f2 100644 --- a/ydb/core/tablet_flat/test/tool/surg/ya.make +++ b/ydb/core/tablet_flat/test/tool/surg/ya.make @@ -7,7 +7,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt ydb/core/tablet_flat ) diff --git a/ydb/core/tablet_flat/ut/flat_test_db.cpp b/ydb/core/tablet_flat/ut/flat_test_db.cpp index b65757d4bb..eef039f743 100644 --- a/ydb/core/tablet_flat/ut/flat_test_db.cpp +++ b/ydb/core/tablet_flat/ut/flat_test_db.cpp @@ -6,7 +6,7 @@ #include <ydb/core/scheme_types/scheme_types.h> #include <ydb/core/util/pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/flat_test_db.h b/ydb/core/tablet_flat/ut/flat_test_db.h index ed0af81c68..3977e7e569 100644 --- a/ydb/core/tablet_flat/ut/flat_test_db.h +++ b/ydb/core/tablet_flat/ut/flat_test_db.h @@ -5,7 +5,7 @@ #include <ydb/core/tablet_flat/flat_dbase_scheme.h> #include <ydb/core/tablet_flat/flat_update_op.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/flat_test_db_helpers.h b/ydb/core/tablet_flat/ut/flat_test_db_helpers.h index ffc9a36daa..ec948e6b9e 100644 --- a/ydb/core/tablet_flat/ut/flat_test_db_helpers.h +++ b/ydb/core/tablet_flat/ut/flat_test_db_helpers.h @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/flat_mem_warm.h> #include <ydb/core/scheme/scheme_type_id.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_bloom.cpp b/ydb/core/tablet_flat/ut/ut_bloom.cpp index 0ba3f5b662..f6b14405b2 100644 --- a/ydb/core/tablet_flat/ut/ut_bloom.cpp +++ b/ydb/core/tablet_flat/ut/ut_bloom.cpp @@ -5,7 +5,7 @@ #include <ydb/core/tablet_flat/test/libs/table/model/small.h> #include <ydb/core/tablet_flat/test/libs/table/test_dbase.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_charge.cpp b/ydb/core/tablet_flat/ut/ut_charge.cpp index 17717c26f1..6fc4f8f1dd 100644 --- a/ydb/core/tablet_flat/ut/ut_charge.cpp +++ b/ydb/core/tablet_flat/ut/ut_charge.cpp @@ -8,7 +8,7 @@ #include <ydb/core/tablet_flat/test/libs/table/wrap_part.h> #include <ydb/core/tablet_flat/test/libs/table/test_steps.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_comp_shard.cpp b/ydb/core/tablet_flat/ut/ut_comp_shard.cpp index 525063d30c..1e40f5a34c 100644 --- a/ydb/core/tablet_flat/ut/ut_comp_shard.cpp +++ b/ydb/core/tablet_flat/ut/ut_comp_shard.cpp @@ -16,7 +16,7 @@ #include <ydb/core/tablet_flat/flat_cxx_database.h> #include <ydb/core/util/pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/hash.h> #include <util/generic/hash_set.h> @@ -1416,7 +1416,7 @@ Y_UNIT_TEST_SUITE(TShardedCompactionScenarios) { header.SetLastShardId(2); header.AddShards(1); header.AddShards(2); - Y_PROTOBUF_SUPPRESS_NODISCARD header.SerializeToString(&initialState.StateSnapshot[0]); + Y_PROTOBUF_SUPPRESS_NODISCARD header.SerializeToString(&initialState.StateSnapshot[0]); } TShardedCompactionStrategy strategy(1, &backend, &broker, &logger, &time, "suffix"); diff --git a/ydb/core/tablet_flat/ut/ut_compaction.cpp b/ydb/core/tablet_flat/ut/ut_compaction.cpp index ef0d9bbf15..9e3c12215b 100644 --- a/ydb/core/tablet_flat/ut/ut_compaction.cpp +++ b/ydb/core/tablet_flat/ut/ut_compaction.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_envs.h> #include <ydb/core/tablet_flat/test/libs/table/test_wreck.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_compaction_multi.cpp b/ydb/core/tablet_flat/ut/ut_compaction_multi.cpp index 6687e80e4a..15a86ee878 100644 --- a/ydb/core/tablet_flat/ut/ut_compaction_multi.cpp +++ b/ydb/core/tablet_flat/ut/ut_compaction_multi.cpp @@ -6,7 +6,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_make.h> #include <ydb/core/tablet_flat/test/libs/table/test_envs.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_db_iface.cpp b/ydb/core/tablet_flat/ut/ut_db_iface.cpp index 9843e5a603..bb9eddadf4 100644 --- a/ydb/core/tablet_flat/ut/ut_db_iface.cpp +++ b/ydb/core/tablet_flat/ut/ut_db_iface.cpp @@ -2,7 +2,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_dbase.h> #include <ydb/core/tablet_flat/test/libs/rows/cook.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/file.h> namespace NKikimr { diff --git a/ydb/core/tablet_flat/ut/ut_db_scheme.cpp b/ydb/core/tablet_flat/ut/ut_db_scheme.cpp index ee12efa903..5c0ac47aa0 100644 --- a/ydb/core/tablet_flat/ut/ut_db_scheme.cpp +++ b/ydb/core/tablet_flat/ut/ut_db_scheme.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/scheme/scheme_types_defs.h> #include <ydb/core/tablet_flat/flat_dbase_apply.h> diff --git a/ydb/core/tablet_flat/ut/ut_forward.cpp b/ydb/core/tablet_flat/ut/ut_forward.cpp index 246d3c70b3..5697dfdbbb 100644 --- a/ydb/core/tablet_flat/ut/ut_forward.cpp +++ b/ydb/core/tablet_flat/ut/ut_forward.cpp @@ -5,7 +5,7 @@ #include <ydb/core/tablet_flat/flat_fwd_blobs.h> #include <ydb/core/tablet_flat/flat_fwd_sieve.h> #include <ydb/core/tablet_flat/test/libs/table/test_steps.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/shuffle.h> #include <util/random/mersenne.h> diff --git a/ydb/core/tablet_flat/ut/ut_memtable.cpp b/ydb/core/tablet_flat/ut/ut_memtable.cpp index d5b6c32864..6a3d697d2b 100644 --- a/ydb/core/tablet_flat/ut/ut_memtable.cpp +++ b/ydb/core/tablet_flat/ut/ut_memtable.cpp @@ -6,7 +6,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_cooker.h> #include <ydb/core/tablet_flat/test/libs/table/test_wreck.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_other.cpp b/ydb/core/tablet_flat/ut/ut_other.cpp index ea1c287283..e76112ac0f 100644 --- a/ydb/core/tablet_flat/ut/ut_other.cpp +++ b/ydb/core/tablet_flat/ut/ut_other.cpp @@ -4,7 +4,7 @@ #include <ydb/core/tablet_flat/flat_writer_bundle.h> #include <ydb/core/tablet_flat/flat_sausage_chop.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTabletFlatExecutor { diff --git a/ydb/core/tablet_flat/ut/ut_pages.cpp b/ydb/core/tablet_flat/ut/ut_pages.cpp index b9e417861a..dec7b65bec 100644 --- a/ydb/core/tablet_flat/ut/ut_pages.cpp +++ b/ydb/core/tablet_flat/ut/ut_pages.cpp @@ -5,7 +5,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_writer.h> #include <ydb/core/tablet_flat/test/libs/table/test_wreck.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/resource/resource.h> #include <util/generic/xrange.h> #include <util/stream/file.h> diff --git a/ydb/core/tablet_flat/ut/ut_part.cpp b/ydb/core/tablet_flat/ut/ut_part.cpp index 0c336e95ac..51d24ef7de 100644 --- a/ydb/core/tablet_flat/ut/ut_part.cpp +++ b/ydb/core/tablet_flat/ut/ut_part.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_wreck.h> #include <ydb/core/tablet_flat/test/libs/table/test_comp.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_part_multi.cpp b/ydb/core/tablet_flat/ut/ut_part_multi.cpp index cdc6714a55..c3af586974 100644 --- a/ydb/core/tablet_flat/ut/ut_part_multi.cpp +++ b/ydb/core/tablet_flat/ut/ut_part_multi.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_writer.h> #include <ydb/core/tablet_flat/test/libs/table/test_wreck.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_proto.cpp b/ydb/core/tablet_flat/ut/ut_proto.cpp index aa1dac4328..9b5b75093d 100644 --- a/ydb/core/tablet_flat/ut/ut_proto.cpp +++ b/ydb/core/tablet_flat/ut/ut_proto.cpp @@ -1,6 +1,6 @@ #include <ydb/core/tablet_flat/flat_sausage_solid.h> #include <ydb/core/tablet_flat/flat_store_solid.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTabletFlatExecutor { diff --git a/ydb/core/tablet_flat/ut/ut_redo.cpp b/ydb/core/tablet_flat/ut/ut_redo.cpp index 73271b4403..4ecab71d69 100644 --- a/ydb/core/tablet_flat/ut/ut_redo.cpp +++ b/ydb/core/tablet_flat/ut/ut_redo.cpp @@ -1,7 +1,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_dbase.h> #include <ydb/core/tablet_flat/test/libs/rows/cook.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/resource/resource.h> #include <util/stream/file.h> diff --git a/ydb/core/tablet_flat/ut/ut_sausage.cpp b/ydb/core/tablet_flat/ut/ut_sausage.cpp index 9fed2caacc..a0468f6234 100644 --- a/ydb/core/tablet_flat/ut/ut_sausage.cpp +++ b/ydb/core/tablet_flat/ut/ut_sausage.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/flat_sausage_grind.h> #include <ydb/core/tablet_flat/util_fmt_desc.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/xrange.h> #include <array> diff --git a/ydb/core/tablet_flat/ut/ut_screen.cpp b/ydb/core/tablet_flat/ut/ut_screen.cpp index b2d04bc6cf..47f54a7bf8 100644 --- a/ydb/core/tablet_flat/ut/ut_screen.cpp +++ b/ydb/core/tablet_flat/ut/ut_screen.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_curtain.h> #include <ydb/core/tablet_flat/test/libs/table/test_envs.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_self.cpp b/ydb/core/tablet_flat/ut/ut_self.cpp index 5cf8efb163..d053493d1c 100644 --- a/ydb/core/tablet_flat/ut/ut_self.cpp +++ b/ydb/core/tablet_flat/ut/ut_self.cpp @@ -2,7 +2,7 @@ #include <ydb/core/tablet_flat/test/libs/rows/cook.h> #include <ydb/core/tablet_flat/test/libs/rows/tool.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_slice.cpp b/ydb/core/tablet_flat/ut/ut_slice.cpp index 5833066aad..3947e5e616 100644 --- a/ydb/core/tablet_flat/ut/ut_slice.cpp +++ b/ydb/core/tablet_flat/ut/ut_slice.cpp @@ -2,7 +2,7 @@ #include <ydb/core/tablet_flat/flat_part_overlay.h> #include <ydb/core/tablet_flat/util_fmt_desc.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_slice_loader.cpp b/ydb/core/tablet_flat/ut/ut_slice_loader.cpp index 822319b533..c85eb016fc 100644 --- a/ydb/core/tablet_flat/ut/ut_slice_loader.cpp +++ b/ydb/core/tablet_flat/ut/ut_slice_loader.cpp @@ -11,7 +11,7 @@ #include <ydb/core/tablet_flat/util_fmt_desc.h> #include <ydb/core/tablet_flat/util_basics.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/tablet_flat/ut/ut_versions.cpp b/ydb/core/tablet_flat/ut/ut_versions.cpp index 848fc74703..817a3a619f 100644 --- a/ydb/core/tablet_flat/ut/ut_versions.cpp +++ b/ydb/core/tablet_flat/ut/ut_versions.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/test/libs/table/test_wreck.h> #include <ydb/core/tablet_flat/test/libs/table/wrap_iter.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NTable { diff --git a/ydb/core/testlib/actors/test_runtime_ut.cpp b/ydb/core/testlib/actors/test_runtime_ut.cpp index fce7f19293..75757fc514 100644 --- a/ydb/core/testlib/actors/test_runtime_ut.cpp +++ b/ydb/core/testlib/actors/test_runtime_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/base/appdata.h> #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/events.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/thread/factory.h> namespace NKikimr { diff --git a/ydb/core/testlib/actors/ut/ya.make b/ydb/core/testlib/actors/ut/ya.make index 85a31fe740..7b65630546 100644 --- a/ydb/core/testlib/actors/ut/ya.make +++ b/ydb/core/testlib/actors/ut/ya.make @@ -11,7 +11,7 @@ IF (SANITIZER_TYPE OR WITH_VALGRIND) ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion library/cpp/regex/pcre ) diff --git a/ydb/core/testlib/basics/ya.make b/ydb/core/testlib/basics/ya.make index 61f74922f4..e0c76b912b 100644 --- a/ydb/core/testlib/basics/ya.make +++ b/ydb/core/testlib/basics/ya.make @@ -12,7 +12,7 @@ SRCS( PEERDIR( library/cpp/actors/dnsresolver library/cpp/regex/pcre - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/base ydb/core/blobstorage ydb/core/blobstorage/crypto diff --git a/ydb/core/testlib/fake_scheme_shard.h b/ydb/core/testlib/fake_scheme_shard.h index 8c388d49dd..3568b7269c 100644 --- a/ydb/core/testlib/fake_scheme_shard.h +++ b/ydb/core/testlib/fake_scheme_shard.h @@ -9,7 +9,7 @@ #include <library/cpp/actors/core/actor.h> #include <library/cpp/actors/core/events.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> #include <util/stream/output.h> @@ -89,7 +89,7 @@ public: TAutoPtr<NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResultBuilder> response = new NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResultBuilder(); TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD State->ACL.GetACL().SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD State->ACL.GetACL().SerializeToString(&out); response->Record.MutablePathDescription()->MutableSelf()->SetACL(out); response->Record.MutablePathDescription()->MutableSelf()->SetEffectiveACL(out); //Fill response from State diff --git a/ydb/core/testlib/minikql_compile.h b/ydb/core/testlib/minikql_compile.h index 4d76ca8d73..50de8574d7 100644 --- a/ydb/core/testlib/minikql_compile.h +++ b/ydb/core/testlib/minikql_compile.h @@ -3,9 +3,9 @@ #include <ydb/core/scheme/scheme_tabledefs.h> #include <ydb/core/client/minikql_compile/db_key_resolver.h> #include <ydb/core/client/minikql_compile/yql_expr_minikql.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/thread/pool.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> class TMockDbSchemeResolver : public NYql::IDbSchemeResolver { public: diff --git a/ydb/core/testlib/mock_pq_metacache.h b/ydb/core/testlib/mock_pq_metacache.h index 1280f87779..add66a1e4a 100644 --- a/ydb/core/testlib/mock_pq_metacache.h +++ b/ydb/core/testlib/mock_pq_metacache.h @@ -3,7 +3,7 @@ #include <library/cpp/actors/core/actor.h> #include <library/cpp/testing/gmock_in_unittest/gmock.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> diff --git a/ydb/core/testlib/service_mocks/access_service_mock.h b/ydb/core/testlib/service_mocks/access_service_mock.h index f18ac92f0a..d4eab00250 100644 --- a/ydb/core/testlib/service_mocks/access_service_mock.h +++ b/ydb/core/testlib/service_mocks/access_service_mock.h @@ -2,7 +2,7 @@ #include <yandex/cloud/priv/servicecontrol/v1/access_service.grpc.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <iterator> diff --git a/ydb/core/testlib/tablet_helpers.cpp b/ydb/core/testlib/tablet_helpers.cpp index a853040b93..7a1d3eae3d 100644 --- a/ydb/core/testlib/tablet_helpers.cpp +++ b/ydb/core/testlib/tablet_helpers.cpp @@ -38,7 +38,7 @@ #include <util/system/sanitizers.h> #include <library/cpp/actors/interconnect/interconnect.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/kesus/tablet/tablet.h> #include <ydb/core/keyvalue/keyvalue.h> #include <ydb/core/persqueue/pq.h> diff --git a/ydb/core/testlib/tenant_helpers.h b/ydb/core/testlib/tenant_helpers.h index 209b73baa0..b08feb56b5 100644 --- a/ydb/core/testlib/tenant_helpers.h +++ b/ydb/core/testlib/tenant_helpers.h @@ -4,7 +4,7 @@ #include <ydb/core/cms/console/console.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/testlib/tenant_runtime.cpp b/ydb/core/testlib/tenant_runtime.cpp index 974cc166d0..a3aa78d9ac 100644 --- a/ydb/core/testlib/tenant_runtime.cpp +++ b/ydb/core/testlib/tenant_runtime.cpp @@ -26,7 +26,7 @@ #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/actors/interconnect/interconnect.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/dirut.h> diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index d4907c26f1..015b52e150 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -74,7 +74,7 @@ #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <ydb/core/engine/mkql_engine_flat.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/kesus/proxy/proxy.h> #include <ydb/core/kesus/tablet/tablet.h> #include <ydb/core/sys_view/processor/processor.h> @@ -95,7 +95,7 @@ #include <util/system/sanitizers.h> #include <util/system/valgrind.h> -#include <util/system/env.h> +#include <util/system/env.h> namespace NKikimr { @@ -975,7 +975,7 @@ namespace Tests { if (!supportsRedirect || !IsServerRedirected()) return ChangeStateStorage(schemeRoot, domain); - TString domainRedirect = GetEnv(DomainRedirectEnvVar); + TString domainRedirect = GetEnv(DomainRedirectEnvVar); if (!domainRedirect) ythrow TWithBackTrace<yexception>() << "Please set domain redirect, format: KIKIMR_TEST_DOMAIN=domain/RootShardTabletId"; @@ -2263,7 +2263,7 @@ namespace Tests { } bool IsServerRedirected() { - return !!GetEnv(ServerRedirectEnvVar); + return !!GetEnv(ServerRedirectEnvVar); } TServerSetup GetServerSetup() { @@ -2271,7 +2271,7 @@ namespace Tests { return TServerSetup("localhost", 0); } - TStringBuf str(GetEnv(ServerRedirectEnvVar)); + TStringBuf str(GetEnv(ServerRedirectEnvVar)); TStringBuf address; TStringBuf port; str.Split('/', address, port); diff --git a/ydb/core/testlib/test_pq_client.h b/ydb/core/testlib/test_pq_client.h index f059923250..737a925a32 100644 --- a/ydb/core/testlib/test_pq_client.h +++ b/ydb/core/testlib/test_pq_client.h @@ -12,7 +12,7 @@ #include <ydb/library/persqueue/topic_parser/topic_parser.h> #include <library/cpp/tvmauth/unittest.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/printf.h> #include <util/system/tempfile.h> diff --git a/ydb/core/testlib/ya.make b/ydb/core/testlib/ya.make index 137fa829f3..06eb6edfbc 100644 --- a/ydb/core/testlib/ya.make +++ b/ydb/core/testlib/ya.make @@ -39,7 +39,7 @@ PEERDIR( library/cpp/grpc/server/actors library/cpp/regex/pcre library/cpp/testing/gmock_in_unittest - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/base ydb/core/blobstorage/base ydb/core/blobstorage/pdisk diff --git a/ydb/core/tracing/signal.h b/ydb/core/tracing/signal.h index 7f317436e9..8609a2628f 100644 --- a/ydb/core/tracing/signal.h +++ b/ydb/core/tracing/signal.h @@ -77,7 +77,7 @@ public: } TTraceSignal(const TString& serializedSignal) { - Y_PROTOBUF_SUPPRESS_NODISCARD PbSignal.ParseFromString(serializedSignal); + Y_PROTOBUF_SUPPRESS_NODISCARD PbSignal.ParseFromString(serializedSignal); } bool SerializeToString(TString& str) const override { diff --git a/ydb/core/tracing/trace.cpp b/ydb/core/tracing/trace.cpp index e243c047d7..d647bd33b2 100644 --- a/ydb/core/tracing/trace.cpp +++ b/ydb/core/tracing/trace.cpp @@ -21,7 +21,7 @@ TTraceID GetPbTraceID(const NKikimrTracing::TTraceID& proto) { TTrace::TTrace(const TString& serializedTrace) { NKikimrTracing::TTraceSignal pbTraceSignal; - Y_PROTOBUF_SUPPRESS_NODISCARD pbTraceSignal.ParseFromString(serializedTrace); + Y_PROTOBUF_SUPPRESS_NODISCARD pbTraceSignal.ParseFromString(serializedTrace); Type = static_cast<ITrace::EType>(pbTraceSignal.GetType()); SelfID = GetPbTraceID(pbTraceSignal.GetSelfID()); ParentID = GetPbTraceID(pbTraceSignal.GetParentID()); diff --git a/ydb/core/tx/balance_coverage/balance_coverage_builder_ut.cpp b/ydb/core/tx/balance_coverage/balance_coverage_builder_ut.cpp index 89a3b011ff..dfc464b8f1 100644 --- a/ydb/core/tx/balance_coverage/balance_coverage_builder_ut.cpp +++ b/ydb/core/tx/balance_coverage/balance_coverage_builder_ut.cpp @@ -1,5 +1,5 @@ #include "balance_coverage_builder.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tx/balance_coverage/ut/ya.make b/ydb/core/tx/balance_coverage/ut/ya.make index 55dee93c04..e77c25c280 100644 --- a/ydb/core/tx/balance_coverage/ut/ya.make +++ b/ydb/core/tx/balance_coverage/ut/ya.make @@ -16,7 +16,7 @@ ELSE() ENDIF() PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ) diff --git a/ydb/core/tx/columnshard/columnshard_ut_common.h b/ydb/core/tx/columnshard/columnshard_ut_common.h index 139e83198a..5ceb47ede5 100644 --- a/ydb/core/tx/columnshard/columnshard_ut_common.h +++ b/ydb/core/tx/columnshard/columnshard_ut_common.h @@ -198,7 +198,7 @@ struct TTestSchema { } TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&out); return out; } @@ -227,7 +227,7 @@ struct TTestSchema { } TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&out); return out; } @@ -249,7 +249,7 @@ struct TTestSchema { } TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&txBody); return txBody; } @@ -262,7 +262,7 @@ struct TTestSchema { } TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&txBody); return txBody; } diff --git a/ydb/core/tx/columnshard/engines/portion_info.cpp b/ydb/core/tx/columnshard/engines/portion_info.cpp index e67ab39605..bc3f7f19e8 100644 --- a/ydb/core/tx/columnshard/engines/portion_info.cpp +++ b/ydb/core/tx/columnshard/engines/portion_info.cpp @@ -185,7 +185,7 @@ TString TPortionInfo::GetMetadata(const TColumnRecord& rec) const { } TString out; - Y_PROTOBUF_SUPPRESS_NODISCARD meta.SerializeToString(&out); + Y_PROTOBUF_SUPPRESS_NODISCARD meta.SerializeToString(&out); return out; } diff --git a/ydb/core/tx/coordinator/coordinator__configure.cpp b/ydb/core/tx/coordinator/coordinator__configure.cpp index 338432dbc3..d20dd91ff6 100644 --- a/ydb/core/tx/coordinator/coordinator__configure.cpp +++ b/ydb/core/tx/coordinator/coordinator__configure.cpp @@ -58,7 +58,7 @@ struct TTxCoordinator::TTxConfigure : public TTransactionBase<TTxCoordinator> { auto persistConfig = [&]() { TString encodedConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD Config.SerializeToString(&encodedConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD Config.SerializeToString(&encodedConfig); db.Table<Schema::DomainConfiguration>().Key(Version).Update( NIceDb::TUpdate<Schema::DomainConfiguration::Mediators>(Mediators), NIceDb::TUpdate<Schema::DomainConfiguration::Resolution>(Resolution), diff --git a/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp b/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp index 7f63253157..653357d344 100644 --- a/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp +++ b/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp @@ -117,7 +117,7 @@ EExecutionStatus TBuildSchemeTxOutRSUnit::Execute(TOperation::TPtr op, rsBody.reserve(SnapshotTransferReadSetMagic.size() + rs.ByteSizeLong()); rsBody.append(SnapshotTransferReadSetMagic); - Y_PROTOBUF_SUPPRESS_NODISCARD rs.AppendToString(&rsBody); + Y_PROTOBUF_SUPPRESS_NODISCARD rs.AppendToString(&rsBody); } else { // Legacy format, no additional protobuf layer rsBody = snapBody; diff --git a/ydb/core/tx/datashard/datashard_kqp.cpp b/ydb/core/tx/datashard/datashard_kqp.cpp index a262c98de5..ddf965942a 100644 --- a/ydb/core/tx/datashard/datashard_kqp.cpp +++ b/ydb/core/tx/datashard/datashard_kqp.cpp @@ -113,7 +113,7 @@ NDq::ERunStatus RunKqpTransactionInternal(const TActorContext& ctx, ui64 txId, for (auto& data : dataList) { NKikimrTxDataShard::TKqpReadset kqpReadset; - Y_PROTOBUF_SUPPRESS_NODISCARD kqpReadset.ParseFromString(data.Body); + Y_PROTOBUF_SUPPRESS_NODISCARD kqpReadset.ParseFromString(data.Body); for (int outputId = 0; outputId < kqpReadset.GetOutputs().size(); ++outputId) { auto* channelData = kqpReadset.MutableOutputs()->Mutable(outputId); @@ -465,7 +465,7 @@ THolder<TEvDataShard::TEvProposeTransactionResult> KqpCompleteTransaction(const TString replyStr; NKikimrTxDataShard::TKqpReply reply; - Y_PROTOBUF_SUPPRESS_NODISCARD reply.SerializeToString(&replyStr); + Y_PROTOBUF_SUPPRESS_NODISCARD reply.SerializeToString(&replyStr); result->SetTxResult(replyStr); return result; @@ -533,7 +533,7 @@ void KqpFillOutReadSets(TOutputOpData::TOutReadSets& outReadSets, const NKikimrT for (auto& [key, data] : readsetData) { TString bodyStr; - Y_PROTOBUF_SUPPRESS_NODISCARD data.SerializeToString(&bodyStr); + Y_PROTOBUF_SUPPRESS_NODISCARD data.SerializeToString(&bodyStr); outReadSets[key] = bodyStr; } @@ -571,7 +571,7 @@ bool KqpValidateLocks(ui64 origin, TActiveTransaction* tx, TSysLocks& sysLocks) for (auto& readSet : tx->InReadSets()) { for (auto& data : readSet.second) { NKikimrTxDataShard::TKqpReadset kqpReadset; - Y_PROTOBUF_SUPPRESS_NODISCARD kqpReadset.ParseFromString(data.Body); + Y_PROTOBUF_SUPPRESS_NODISCARD kqpReadset.ParseFromString(data.Body); if (kqpReadset.HasValidateLocksResult()) { auto& validateResult = kqpReadset.GetValidateLocksResult(); diff --git a/ydb/core/tx/datashard/datashard_locks.h b/ydb/core/tx/datashard/datashard_locks.h index 19c68c4d88..370206a03e 100644 --- a/ydb/core/tx/datashard/datashard_locks.h +++ b/ydb/core/tx/datashard/datashard_locks.h @@ -7,7 +7,7 @@ #include <ydb/core/protos/counters_datashard.pb.h> #include <ydb/core/tablet/tablet_counters.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <util/generic/queue.h> #include <util/generic/set.h> diff --git a/ydb/core/tx/datashard/datashard_split_src.cpp b/ydb/core/tx/datashard/datashard_split_src.cpp index a7349fc9cf..9f60d8d99d 100644 --- a/ydb/core/tx/datashard/datashard_split_src.cpp +++ b/ydb/core/tx/datashard/datashard_split_src.cpp @@ -357,7 +357,7 @@ public: // Persist snapshot data so that it can be sent if this datashard restarts TString snapshotMeta; - Y_PROTOBUF_SUPPRESS_NODISCARD snapshot->SerializeToString(&snapshotMeta); + Y_PROTOBUF_SUPPRESS_NODISCARD snapshot->SerializeToString(&snapshotMeta); db.Table<Schema::SplitSrcSnapshots>() .Key(dstTablet) .Update(NIceDb::TUpdate<Schema::SplitSrcSnapshots::SnapshotMeta>(snapshotMeta)); diff --git a/ydb/core/tx/datashard/datashard_user_table.cpp b/ydb/core/tx/datashard/datashard_user_table.cpp index 70bc940073..75a638567e 100644 --- a/ydb/core/tx/datashard/datashard_user_table.cpp +++ b/ydb/core/tx/datashard/datashard_user_table.cpp @@ -15,7 +15,7 @@ TUserTable::TUserTable(ui32 localTid, const NKikimrSchemeOp::TTableDescription& : LocalTid(localTid) , ShadowTid(shadowTid) { - Y_PROTOBUF_SUPPRESS_NODISCARD descr.SerializeToString(&Schema); + Y_PROTOBUF_SUPPRESS_NODISCARD descr.SerializeToString(&Schema); Name = descr.GetName(); Path = descr.GetPath(); ParseProto(descr); diff --git a/ydb/core/tx/datashard/datashard_user_table.h b/ydb/core/tx/datashard/datashard_user_table.h index 0dab30cb84..74d0249676 100644 --- a/ydb/core/tx/datashard/datashard_user_table.h +++ b/ydb/core/tx/datashard/datashard_user_table.h @@ -390,7 +390,7 @@ struct TUserTable : public TThrRefBase { void SetSchema(const NKikimrSchemeOp::TTableDescription& description) { Schema.clear(); - Y_PROTOBUF_SUPPRESS_NODISCARD description.SerializeToString(&Schema); + Y_PROTOBUF_SUPPRESS_NODISCARD description.SerializeToString(&Schema); } void SetPath(const TString &path); diff --git a/ydb/core/tx/datashard/datashard_ut_build_index.cpp b/ydb/core/tx/datashard/datashard_ut_build_index.cpp index 2b9e3f0a3f..2be7eed570 100644 --- a/ydb/core/tx/datashard/datashard_ut_build_index.cpp +++ b/ydb/core/tx/datashard/datashard_ut_build_index.cpp @@ -9,7 +9,7 @@ #include <ydb/library/yql/public/issue/yql_issue_message.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> template <> inline void Out<NKikimrTxDataShard::TEvBuildIndexProgressResponse::EStatus> diff --git a/ydb/core/tx/datashard/datashard_ut_change_collector.cpp b/ydb/core/tx/datashard/datashard_ut_change_collector.cpp index cdce49ecdb..c394cad403 100644 --- a/ydb/core/tx/datashard/datashard_ut_change_collector.cpp +++ b/ydb/core/tx/datashard/datashard_ut_change_collector.cpp @@ -228,7 +228,7 @@ struct TStructRecord { static TStructRecord Parse(const TString& serializedProto, const THashMap<NTable::TTag, TString>& tagToName) { NKikimrChangeExchange::TChangeRecord::TDataChange proto; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromArray(serializedProto.data(), serializedProto.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromArray(serializedProto.data(), serializedProto.size()); return Parse(proto, tagToName); } diff --git a/ydb/core/tx/datashard/datashard_ut_common.cpp b/ydb/core/tx/datashard/datashard_ut_common.cpp index d754f7ad0e..686ffd39fd 100644 --- a/ydb/core/tx/datashard/datashard_ut_common.cpp +++ b/ydb/core/tx/datashard/datashard_ut_common.cpp @@ -14,7 +14,7 @@ #include <ydb/library/yql/minikql/mkql_node_serialization.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> #include <util/system/valgrind.h> @@ -421,7 +421,7 @@ NKikimrMiniKQL::TResult TFakeProxyTx::GetResult() const { ui32 TFakeScanTx::SetProgram(TTester& tester) { NKikimrTxDataShard::TDataTransaction dataTransaction; - Y_PROTOBUF_SUPPRESS_NODISCARD dataTransaction.ParseFromArray(TxBody_.data(), TxBody_.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD dataTransaction.ParseFromArray(TxBody_.data(), TxBody_.size()); ActorIdToProto(tester.Sender, dataTransaction.MutableSink()); TxBody_ = dataTransaction.SerializeAsString(); diff --git a/ydb/core/tx/datashard/datashard_ut_common.h b/ydb/core/tx/datashard/datashard_ut_common.h index 4b5d7fe4ea..66f7b41e89 100644 --- a/ydb/core/tx/datashard/datashard_ut_common.h +++ b/ydb/core/tx/datashard/datashard_ut_common.h @@ -10,7 +10,7 @@ #include <ydb/core/testlib/tablet_helpers.h> #include <ydb/core/testlib/test_client.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tx/datashard/datashard_ut_init.cpp b/ydb/core/tx/datashard/datashard_ut_init.cpp index 818e30ab0c..44e9b2e359 100644 --- a/ydb/core/tx/datashard/datashard_ut_init.cpp +++ b/ydb/core/tx/datashard/datashard_ut_init.cpp @@ -43,7 +43,7 @@ TString GetTablePath(TTestActorRuntime &runtime, TString schema = value["myRes"]["Schema"]; NKikimrSchemeOp::TTableDescription desc; - Y_PROTOBUF_SUPPRESS_NODISCARD desc.ParseFromArray(schema.data(), schema.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD desc.ParseFromArray(schema.data(), schema.size()); return desc.GetPath(); } @@ -141,7 +141,7 @@ Y_UNIT_TEST_SUITE(TTxDataShardTestInit) { if (rec.GetTxKind() == NKikimrTxDataShard::TX_KIND_SCHEME) { TString body = rec.GetTxBody(); NKikimrTxDataShard::TFlatSchemeTransaction tx; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.ParseFromArray(body.Data(), body.Size()); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.ParseFromArray(body.Data(), body.Size()); if (tx.HasCreateTable()) { tableId = tx.GetCreateTable().GetId_Deprecated(); if (tx.GetCreateTable().HasPathId()) { @@ -150,7 +150,7 @@ Y_UNIT_TEST_SUITE(TTxDataShardTestInit) { } if (oldCreate) { tx.MutableCreateTable()->ClearPath(); - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&body); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&body); rec.SetTxBody(body); } } diff --git a/ydb/core/tx/datashard/datashard_ut_locks.cpp b/ydb/core/tx/datashard/datashard_ut_locks.cpp index 1d25c39f99..3fd985b34a 100644 --- a/ydb/core/tx/datashard/datashard_ut_locks.cpp +++ b/ydb/core/tx/datashard/datashard_ut_locks.cpp @@ -8,7 +8,7 @@ #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tx/datashard/datashard_ut_minstep.cpp b/ydb/core/tx/datashard/datashard_ut_minstep.cpp index 99d72b2e45..ad64b4cf90 100644 --- a/ydb/core/tx/datashard/datashard_ut_minstep.cpp +++ b/ydb/core/tx/datashard/datashard_ut_minstep.cpp @@ -6,7 +6,7 @@ #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/tx/tx.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tx/datashard/datashard_ut_rs.cpp b/ydb/core/tx/datashard/datashard_ut_rs.cpp index edbe2968da..2cf32b0b99 100644 --- a/ydb/core/tx/datashard/datashard_ut_rs.cpp +++ b/ydb/core/tx/datashard/datashard_ut_rs.cpp @@ -5,7 +5,7 @@ #include <ydb/core/tx/schemeshard/schemeshard.h> #include <ydb/core/tx/tx_proxy/proxy.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tx/datashard/datashard_ut_upload_rows.cpp b/ydb/core/tx/datashard/datashard_ut_upload_rows.cpp index ab1c586d30..b797de1db8 100644 --- a/ydb/core/tx/datashard/datashard_ut_upload_rows.cpp +++ b/ydb/core/tx/datashard/datashard_ut_upload_rows.cpp @@ -8,7 +8,7 @@ #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/tx/tx_proxy/upload_rows.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/tx/datashard/export_s3_buffer.cpp b/ydb/core/tx/datashard/export_s3_buffer.cpp index 470ed22d6b..db6d2f791a 100644 --- a/ydb/core/tx/datashard/export_s3_buffer.cpp +++ b/ydb/core/tx/datashard/export_s3_buffer.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tablet_flat/flat_row_state.h> #include <ydb/library/binary_json/read.h> #include <ydb/public/lib/scheme_types/scheme_type_id.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> #include <util/datetime/base.h> diff --git a/ydb/core/tx/datashard/read_table_scan.cpp b/ydb/core/tx/datashard/read_table_scan.cpp index 63e94fde96..d0340509bb 100644 --- a/ydb/core/tx/datashard/read_table_scan.cpp +++ b/ydb/core/tx/datashard/read_table_scan.cpp @@ -209,7 +209,7 @@ private: meta->mutable_type()->mutable_optional_type()->mutable_item()->mutable_data_type()->set_id(id); } res.set_truncated(true); - Y_PROTOBUF_SUPPRESS_NODISCARD res.SerializeToString(&ResultCommon); + Y_PROTOBUF_SUPPRESS_NODISCARD res.SerializeToString(&ResultCommon); } YdbOld::ResultSet OldResultSet; @@ -258,7 +258,7 @@ private: } } res.set_truncated(true); - Y_PROTOBUF_SUPPRESS_NODISCARD res.SerializeToString(&ResultCommon); + Y_PROTOBUF_SUPPRESS_NODISCARD res.SerializeToString(&ResultCommon); } Ydb::ResultSet YdbResultSet; diff --git a/ydb/core/tx/datashard/ya.make b/ydb/core/tx/datashard/ya.make index 9c98e8e79b..44a3f4ce4f 100644 --- a/ydb/core/tx/datashard/ya.make +++ b/ydb/core/tx/datashard/ya.make @@ -207,7 +207,7 @@ PEERDIR( library/cpp/actors/core library/cpp/containers/flat_hash library/cpp/html/pcdata - library/cpp/string_utils/quote + library/cpp/string_utils/quote ydb/core/actorlib_impl ydb/core/base ydb/core/engine diff --git a/ydb/core/tx/scheme_board/cache_ut.cpp b/ydb/core/tx/scheme_board/cache_ut.cpp index c27b3517b3..8ef246c721 100644 --- a/ydb/core/tx/scheme_board/cache_ut.cpp +++ b/ydb/core/tx/scheme_board/cache_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/core/tx/scheme_cache/scheme_cache.h> #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ptr.h> #include <util/generic/string.h> diff --git a/ydb/core/tx/scheme_board/double_indexed_ut.cpp b/ydb/core/tx/scheme_board/double_indexed_ut.cpp index 9d6727dd08..e4edcca938 100644 --- a/ydb/core/tx/scheme_board/double_indexed_ut.cpp +++ b/ydb/core/tx/scheme_board/double_indexed_ut.cpp @@ -1,6 +1,6 @@ #include "double_indexed.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> #include <util/string/vector.h> diff --git a/ydb/core/tx/scheme_board/populator.cpp b/ydb/core/tx/scheme_board/populator.cpp index f860bb88cb..144d9bce92 100644 --- a/ydb/core/tx/scheme_board/populator.cpp +++ b/ydb/core/tx/scheme_board/populator.cpp @@ -863,7 +863,7 @@ class TPopulator: public TMonitorableActor<TPopulator> { TString json; if (desc) { NKikimrScheme::TEvDescribeSchemeResult fullProto; - Y_PROTOBUF_SUPPRESS_NODISCARD fullProto.ParseFromString(desc->PreSerialized); + Y_PROTOBUF_SUPPRESS_NODISCARD fullProto.ParseFromString(desc->PreSerialized); fullProto.MergeFrom(desc->Record); using namespace google::protobuf::util; diff --git a/ydb/core/tx/scheme_board/populator_ut.cpp b/ydb/core/tx/scheme_board/populator_ut.cpp index c0eb1cb62f..3031ca54c7 100644 --- a/ydb/core/tx/scheme_board/populator_ut.cpp +++ b/ydb/core/tx/scheme_board/populator_ut.cpp @@ -7,7 +7,7 @@ #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h> #include <library/cpp/actors/core/log.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/map.h> diff --git a/ydb/core/tx/scheme_board/replica.cpp b/ydb/core/tx/scheme_board/replica.cpp index 638656e91d..ce065352c1 100644 --- a/ydb/core/tx/scheme_board/replica.cpp +++ b/ydb/core/tx/scheme_board/replica.cpp @@ -414,7 +414,7 @@ public: if (!isDeletion) { if (!PreSerializedDescribeSchemeResult) { TString serialized; - Y_PROTOBUF_SUPPRESS_NODISCARD DescribeSchemeResult.SerializeToString(&serialized); + Y_PROTOBUF_SUPPRESS_NODISCARD DescribeSchemeResult.SerializeToString(&serialized); if (TrackNotify) { UntrackMemory(); } diff --git a/ydb/core/tx/scheme_board/replica_ut.cpp b/ydb/core/tx/scheme_board/replica_ut.cpp index 10113c7bcc..6a27c68cf2 100644 --- a/ydb/core/tx/scheme_board/replica_ut.cpp +++ b/ydb/core/tx/scheme_board/replica_ut.cpp @@ -7,7 +7,7 @@ #include <ydb/core/testlib/basics/appdata.h> #include <library/cpp/actors/core/log.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NSchemeBoard { diff --git a/ydb/core/tx/scheme_board/subscriber_ut.cpp b/ydb/core/tx/scheme_board/subscriber_ut.cpp index 7e1d580305..a592e273fa 100644 --- a/ydb/core/tx/scheme_board/subscriber_ut.cpp +++ b/ydb/core/tx/scheme_board/subscriber_ut.cpp @@ -9,7 +9,7 @@ #include <ydb/core/testlib/basics/helpers.h> #include <library/cpp/actors/core/log.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> #include <util/generic/xrange.h> diff --git a/ydb/core/tx/scheme_board/ut_cache/ya.make b/ydb/core/tx/scheme_board/ut_cache/ya.make index 1b1d1200bc..1d7b583102 100644 --- a/ydb/core/tx/scheme_board/ut_cache/ya.make +++ b/ydb/core/tx/scheme_board/ut_cache/ya.make @@ -12,7 +12,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ydb/core/tx/schemeshard ydb/core/tx/schemeshard/ut_helpers diff --git a/ydb/core/tx/scheme_board/ut_double_indexed/ya.make b/ydb/core/tx/scheme_board/ut_double_indexed/ya.make index 0ae0cf3659..df534e2ceb 100644 --- a/ydb/core/tx/scheme_board/ut_double_indexed/ya.make +++ b/ydb/core/tx/scheme_board/ut_double_indexed/ya.make @@ -6,7 +6,7 @@ OWNER( ) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ) SRCS( diff --git a/ydb/core/tx/scheme_board/ut_helpers.h b/ydb/core/tx/scheme_board/ut_helpers.h index 1f2e4d5e9b..448d5a95c9 100644 --- a/ydb/core/tx/scheme_board/ut_helpers.h +++ b/ydb/core/tx/scheme_board/ut_helpers.h @@ -15,7 +15,7 @@ #include <ydb/core/tx/tx_allocator/txallocator.h> #include <library/cpp/actors/interconnect/interconnect_impl.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> #include <util/generic/string.h> diff --git a/ydb/core/tx/scheme_board/ut_populator/ya.make b/ydb/core/tx/scheme_board/ut_populator/ya.make index c5bf28ef04..02a374b469 100644 --- a/ydb/core/tx/scheme_board/ut_populator/ya.make +++ b/ydb/core/tx/scheme_board/ut_populator/ya.make @@ -12,7 +12,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ydb/core/tx/schemeshard ydb/core/tx/schemeshard/ut_helpers diff --git a/ydb/core/tx/scheme_board/ut_replica/ya.make b/ydb/core/tx/scheme_board/ut_replica/ya.make index 690a11fbe7..dfbde405ef 100644 --- a/ydb/core/tx/scheme_board/ut_replica/ya.make +++ b/ydb/core/tx/scheme_board/ut_replica/ya.make @@ -12,7 +12,7 @@ SIZE(MEDIUM) TIMEOUT(600) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib/basics ) diff --git a/ydb/core/tx/scheme_board/ut_subscriber/ya.make b/ydb/core/tx/scheme_board/ut_subscriber/ya.make index cf3dd5d1d0..b98116378b 100644 --- a/ydb/core/tx/scheme_board/ut_subscriber/ya.make +++ b/ydb/core/tx/scheme_board/ut_subscriber/ya.make @@ -13,7 +13,7 @@ TIMEOUT(600) PEERDIR( library/cpp/actors/interconnect - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib/basics ) diff --git a/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp b/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp index 56719d8b40..5c6bc761d2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp @@ -50,7 +50,7 @@ struct TSchemeShard::TTxMakeAccessDatabaseNoInheritable : public TTransactionBas } TString proto; - Y_PROTOBUF_SUPPRESS_NODISCARD acl.SerializeToString(&proto); + Y_PROTOBUF_SUPPRESS_NODISCARD acl.SerializeToString(&proto); return proto; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp index 7141c76ae7..7992d6c004 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp @@ -300,7 +300,7 @@ public: } } #endif - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&columnShardTxBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&columnShardTxBody); } for (auto& shard : txState->Shards) { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp index f7a47459b9..816e1dd0db 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp @@ -156,7 +156,7 @@ public: tabletConfig->SetYdbDatabasePath(databasePath); alterConfig.MutablePartitionKeySchema()->Swap(tabletConfig->MutablePartitionKeySchema()); - Y_PROTOBUF_SUPPRESS_NODISCARD alterConfig.SerializeToString(¶ms->TabletConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD alterConfig.SerializeToString(¶ms->TabletConfig); alterConfig.Swap(tabletConfig); } if (alter.PartitionsToDeleteSize()) { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common.h b/ydb/core/tx/schemeshard/schemeshard__operation_common.h index 5a3da32cad..834deac4ea 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_common.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_common.h @@ -1447,7 +1447,7 @@ public: FillNotice(pathId, tx, context); TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); txState->ClearShardsInProgress(); Y_VERIFY(txState->Shards.size()); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp index f504c34ef5..3a78301fc4 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp @@ -99,7 +99,7 @@ public: newShardTx.MutableReceiveSnapshot()->MutableTableId()->SetTableId(txState->TargetPathId.LocalPathId); newShardTx.MutableReceiveSnapshot()->AddReceiveFrom()->SetShard(ui64(srcDatashardId)); TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD newShardTx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD newShardTx.SerializeToString(&txBody); THolder<TEvDataShard::TEvProposeTransaction> dstEvent = THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, @@ -120,7 +120,7 @@ public: oldShardTx.MutableSendSnapshot()->AddSendTo()->SetShard(ui64(dstDatashardId)); oldShardTx.SetReadOnly(true); txBody.clear(); - Y_PROTOBUF_SUPPRESS_NODISCARD oldShardTx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD oldShardTx.SerializeToString(&txBody); THolder<TEvDataShard::TEvProposeTransaction> srcEvent = THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp index a3e6896b6f..948f6f965e 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp @@ -328,7 +328,7 @@ public: auto* init = tx.MutableInitShard(); init->SetDataChannelCount(storeInfo->Description.GetStorageConfig().GetDataChannelCount()); - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&columnShardTxBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&columnShardTxBody); } for (auto& shard : txState->Shards) { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp index 992fd3175c..ce3894e1e5 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp @@ -163,7 +163,7 @@ TPersQueueGroupInfo::TPtr CreatePersQueueGroup(TOperationContext& context, const TString databasePath = TPath::Init(context.SS->RootPathId(), context.SS).PathString(); tabletConfig.SetYdbDatabasePath(databasePath); - Y_PROTOBUF_SUPPRESS_NODISCARD tabletConfig.SerializeToString(&pqGroupInfo->TabletConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD tabletConfig.SerializeToString(&pqGroupInfo->TabletConfig); if (op.HasBootstrapConfig()) { Y_PROTOBUF_SUPPRESS_NODISCARD op.GetBootstrapConfig().SerializeToString(&pqGroupInfo->BootstrapConfig); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp index 5004522529..5a1ddd7f58 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp @@ -191,7 +191,7 @@ public: context.SS->FillTableDescription(txState->TargetPathId, i, NEW_TABLE_ALTER_VERSION, tableDesc); TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); THolder<TEvDataShard::TEvProposeTransaction> event = THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp index a84868b77b..5f4b0541f2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp @@ -104,7 +104,7 @@ public: PathIdFromPathId(childPathId, notice->MutableIndexPathId()); } - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); } Y_VERIFY(txState->Shards.size()); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp index 45730be409..4010fc02bb 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp @@ -122,7 +122,7 @@ public: tx.MutableDropTable()->SetId_Deprecated(pathId.LocalPathId); PathIdFromPathId(pathId, tx.MutableDropTable()->MutablePathId()); tx.MutableDropTable()->SetName(path->Name); - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); } Y_VERIFY(txState->Shards.size()); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp index fe4d116416..b8a9081ce5 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp @@ -80,7 +80,7 @@ public: context.SS->FillSeqNo(tx, seqNo); TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, DebugHint() << " ProgressState" diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp index f8d5ca96c6..6f56bbb718 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp @@ -103,7 +103,7 @@ public: context.SS->FillSeqNo(tx, seqNo); TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, DebugHint() << " ProgressState" diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp index fc39ce04ba..8f321bb205 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp @@ -113,7 +113,7 @@ public: PathIdFromPathId(dstIndexPath->PathId, remap->MutableDstPathId()); } - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); } // send messages diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp index ad9c6808fc..c9be761182 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp @@ -206,7 +206,7 @@ public: descr.SetNextColId(tableInfo->NextColumnId); TString partitionConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->PartitionConfig().SerializeToString(&partitionConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->PartitionConfig().SerializeToString(&partitionConfig); descr.SetPartitionConfig(partitionConfig); descr.SetAlterVersion(tableInfo->AlterVersion); @@ -241,7 +241,7 @@ public: partDescr->MutableShardIdx()->SetLocalId(ui64(partition.ShardIdx.GetLocalId())); if (tableInfo->PerShardPartitionConfig.contains(partition.ShardIdx)) { TString partitionConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->PerShardPartitionConfig.at(partition.ShardIdx).SerializeToString(&partitionConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->PerShardPartitionConfig.at(partition.ShardIdx).SerializeToString(&partitionConfig); partDescr->SetPartitionConfig(partitionConfig); } } @@ -274,7 +274,7 @@ public: descr.SetVersion(kesusInfo->Version); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD kesusInfo->Config.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD kesusInfo->Config.SerializeToString(&config); descr.SetConfig(config); return descr; diff --git a/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp b/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp index 4864dc9db3..3fd0d91452 100644 --- a/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp @@ -67,7 +67,7 @@ struct TSchemeShard::TTxUpgradeAccessDatabaseRights : public TTransactionBase<TS } TString proto; - Y_PROTOBUF_SUPPRESS_NODISCARD acl.SerializeToString(&proto); + Y_PROTOBUF_SUPPRESS_NODISCARD acl.SerializeToString(&proto); return proto; } diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp index 0715543a22..bf2300f821 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_impl.cpp @@ -2169,11 +2169,11 @@ void TSchemeShard::PersistTableAlterVersion(NIceDb::TNiceDb& db, const TPathId p void TSchemeShard::PersistTableAltered(NIceDb::TNiceDb& db, const TPathId pathId, const TTableInfo::TPtr tableInfo) { TString partitionConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->PartitionConfig().SerializeToString(&partitionConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->PartitionConfig().SerializeToString(&partitionConfig); TString ttlSettings; if (tableInfo->HasTTLSettings()) { - Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->TTLSettings().SerializeToString(&ttlSettings); + Y_PROTOBUF_SUPPRESS_NODISCARD tableInfo->TTLSettings().SerializeToString(&ttlSettings); } if (pathId.OwnerId == TabletID()) { @@ -2238,7 +2238,7 @@ void TSchemeShard::PersistTableCreated(NIceDb::TNiceDb& db, const TPathId pathId void TSchemeShard::PersistAddAlterTable(NIceDb::TNiceDb& db, TPathId pathId, const TTableInfo::TAlterDataPtr alter) { TString proto; - Y_PROTOBUF_SUPPRESS_NODISCARD alter->TableDescriptionFull->SerializeToString(&proto); + Y_PROTOBUF_SUPPRESS_NODISCARD alter->TableDescriptionFull->SerializeToString(&proto); if (pathId.OwnerId == TabletID()) { db.Table<Schema::Tables>().Key(pathId.LocalPathId).Update( NIceDb::TUpdate<Schema::Tables::AlterTableFull>(proto)); @@ -2699,7 +2699,7 @@ void TSchemeShard::PersistBlockStoreVolume(NIceDb::TNiceDb& db, TPathId pathId, Y_VERIFY(IsLocalId(pathId)); TString volumeConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD volume->VolumeConfig.SerializeToString(&volumeConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD volume->VolumeConfig.SerializeToString(&volumeConfig); db.Table<Schema::BlockStoreVolumes>().Key(pathId.LocalPathId).Update( NIceDb::TUpdate<Schema::BlockStoreVolumes::VolumeConfig>(volumeConfig), NIceDb::TUpdate<Schema::BlockStoreVolumes::AlterVersion>(volume->AlterVersion), @@ -2719,7 +2719,7 @@ void TSchemeShard::PersistAddBlockStoreVolumeAlter(NIceDb::TNiceDb& db, TPathId Y_VERIFY(IsLocalId(pathId)); TString volumeConfig; - Y_PROTOBUF_SUPPRESS_NODISCARD volume->VolumeConfig.SerializeToString(&volumeConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD volume->VolumeConfig.SerializeToString(&volumeConfig); db.Table<Schema::BlockStoreVolumeAlters>().Key(pathId.LocalPathId).Update( NIceDb::TUpdate<Schema::BlockStoreVolumeAlters::VolumeConfig>(volumeConfig), NIceDb::TUpdate<Schema::BlockStoreVolumeAlters::AlterVersion>(volume->AlterVersion), @@ -2767,7 +2767,7 @@ void TSchemeShard::PersistFileStoreInfo(NIceDb::TNiceDb& db, TPathId pathId, con Y_VERIFY(IsLocalId(pathId)); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD fs->Config.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD fs->Config.SerializeToString(&config); db.Table<Schema::FileStoreInfos>() .Key(pathId.LocalPathId) @@ -2781,7 +2781,7 @@ void TSchemeShard::PersistAddFileStoreAlter(NIceDb::TNiceDb& db, TPathId pathId, Y_VERIFY(IsLocalId(pathId)); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD fs->AlterConfig->SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD fs->AlterConfig->SerializeToString(&config); db.Table<Schema::FileStoreAlters>() .Key(pathId.LocalPathId) @@ -3053,7 +3053,7 @@ void TSchemeShard::PersistReplicationAlterRemove(NIceDb::TNiceDb& db, TPathId pa void TSchemeShard::PersistKesusInfo(NIceDb::TNiceDb& db, TPathId pathId, const TKesusInfo::TPtr kesus) { TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD kesus->Config.SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD kesus->Config.SerializeToString(&config); if (IsLocalId((pathId))) { db.Table<Schema::KesusInfos>().Key(pathId.LocalPathId).Update( @@ -3081,7 +3081,7 @@ void TSchemeShard::PersistAddKesusAlter(NIceDb::TNiceDb& db, TPathId pathId, con Y_VERIFY(kesus->AlterConfig); Y_VERIFY(kesus->AlterVersion); TString config; - Y_PROTOBUF_SUPPRESS_NODISCARD kesus->AlterConfig->SerializeToString(&config); + Y_PROTOBUF_SUPPRESS_NODISCARD kesus->AlterConfig->SerializeToString(&config); if (IsLocalId((pathId))) { db.Table<Schema::KesusAlters>().Key(pathId.LocalPathId).Update( @@ -3300,7 +3300,7 @@ void TSchemeShard::PersistRemoveTableIndex(NIceDb::TNiceDb &db, TPathId pathId) void TSchemeShard::PersistAddTableShardPartitionConfig(NIceDb::TNiceDb& db, TShardIdx shardIdx, const NKikimrSchemeOp::TPartitionConfig& config) { TString data; - Y_PROTOBUF_SUPPRESS_NODISCARD config.SerializeToString(&data); + Y_PROTOBUF_SUPPRESS_NODISCARD config.SerializeToString(&data); if (IsLocalId(shardIdx)) { db.Table<Schema::TableShardPartitionConfigs>().Key(shardIdx.GetLocalId()).Update( @@ -4386,7 +4386,7 @@ TString TSchemeShard::FillBackupTxBody(TPathId pathId, const NKikimrSchemeOp::TB backup->SetShardNum(shardNum); TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); return txBody; } @@ -5571,7 +5571,7 @@ TString TSchemeShard::FillAlterTableTxBody(TPathId pathId, TShardIdx shardIdx, T } TString txBody; - Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); + Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); return txBody; } diff --git a/ydb/core/tx/schemeshard/schemeshard_info_types.h b/ydb/core/tx/schemeshard/schemeshard_info_types.h index 2e5710c3d3..94c51e73d3 100644 --- a/ydb/core/tx/schemeshard/schemeshard_info_types.h +++ b/ydb/core/tx/schemeshard/schemeshard_info_types.h @@ -2354,7 +2354,7 @@ private: template <typename TSettingsPB> static TString SerializeSettings(const TSettingsPB& settings) { TString serialized; - Y_PROTOBUF_SUPPRESS_NODISCARD settings.SerializeToString(&serialized); + Y_PROTOBUF_SUPPRESS_NODISCARD settings.SerializeToString(&serialized); return serialized; } diff --git a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp index 3789d3af1b..b993dcfdca 100644 --- a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp @@ -173,7 +173,7 @@ void TPathDescriber::DescribeChildren(const TPath& path) { FillChildDescr(entry, childEl); } } - Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&pathEl->PreSerializedChildrenListing); + Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&pathEl->PreSerializedChildrenListing); } Result->PreSerializedData += pathEl->PreSerializedChildrenListing; @@ -225,7 +225,7 @@ void TPathDescriber::DescribeTable(const TActorContext& ctx, TPathId pathId, TPa part->SetIsInclusive(false); part->SetEndOfRangeKeyPrefix(p.EndOfRange); } - Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&tableInfo->PreSerializedPathDescription); + Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&tableInfo->PreSerializedPathDescription); } Result->PreSerializedData += tableInfo->PreSerializedPathDescription; if (!pathEl->IsCreateFinished()) { @@ -410,13 +410,13 @@ void TPathDescriber::DescribePersQueueGroup(TPathId pathId, TPathElement::TPtr p entry->SetTotalGroupCount(pqGroupInfo->TotalGroupCount); entry->SetPartitionPerTablet(pqGroupInfo->MaxPartsPerTablet); entry->SetAlterVersion(pqGroupInfo->AlterVersion); - Y_PROTOBUF_SUPPRESS_NODISCARD entry->MutablePQTabletConfig()->ParseFromString(pqGroupInfo->TabletConfig); + Y_PROTOBUF_SUPPRESS_NODISCARD entry->MutablePQTabletConfig()->ParseFromString(pqGroupInfo->TabletConfig); if (pqGroupInfo->HasBalancer()) { entry->SetBalancerTabletID(ui64(pqGroupInfo->BalancerTabletID)); } - Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&pqGroupInfo->PreSerializedPathDescription); + Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&pqGroupInfo->PreSerializedPathDescription); } Y_VERIFY_DEBUG(!pqGroupInfo->PreSerializedPathDescription.empty()); @@ -463,7 +463,7 @@ void TPathDescriber::DescribePersQueueGroup(TPathId pathId, TPathElement::TPtr p } } - Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&pqGroupInfo->PreSerializedPartitionsDescription); + Y_PROTOBUF_SUPPRESS_NODISCARD preSerializedResult.SerializeToString(&pqGroupInfo->PreSerializedPartitionsDescription); } Y_VERIFY_DEBUG(!pqGroupInfo->PreSerializedPartitionsDescription.empty()); diff --git a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp index c5d6c5a973..5436e45f68 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp +++ b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp @@ -5,7 +5,7 @@ #include <ydb/core/scheme/scheme_tabledefs.h> #include <ydb/public/lib/scheme_types/scheme_type_id.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NSchemeShardUT_Private { namespace NLs { diff --git a/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp b/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp index 9cfd8037b7..7fcc36b39a 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp +++ b/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp @@ -11,7 +11,7 @@ #include <ydb/core/tx/tx_proxy/proxy.h> #include <ydb/core/filestore/core/filestore.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> static const bool ENABLE_SCHEMESHARD_LOG = true; diff --git a/ydb/core/tx/schemeshard/ut_helpers/ya.make b/ydb/core/tx/schemeshard/ut_helpers/ya.make index b66d799ec0..5d4799515c 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/ya.make +++ b/ydb/core/tx/schemeshard/ut_helpers/ya.make @@ -3,7 +3,7 @@ LIBRARY() OWNER(g:kikimr) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/base ydb/core/blockstore/core ydb/core/engine diff --git a/ydb/core/tx/schemeshard/ut_user_attributes/ya.make b/ydb/core/tx/schemeshard/ut_user_attributes/ya.make index 6162927aa9..a8e77979dc 100644 --- a/ydb/core/tx/schemeshard/ut_user_attributes/ya.make +++ b/ydb/core/tx/schemeshard/ut_user_attributes/ya.make @@ -15,7 +15,7 @@ PEERDIR( library/cpp/http/io library/cpp/http/server library/cpp/svnversion - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/base ydb/core/blockstore/core ydb/core/engine/minikql diff --git a/ydb/core/tx/tx_allocator/txallocator_ut_helpers.h b/ydb/core/tx/tx_allocator/txallocator_ut_helpers.h index 1d90e63376..a20bc7e78d 100644 --- a/ydb/core/tx/tx_allocator/txallocator_ut_helpers.h +++ b/ydb/core/tx/tx_allocator/txallocator_ut_helpers.h @@ -6,8 +6,8 @@ #include <ydb/core/testlib/basics/appdata.h> #include <ydb/core/testlib/tablet_helpers.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> namespace NTxAllocatorUT_Private { diff --git a/ydb/core/tx/tx_allocator/ut/ya.make b/ydb/core/tx/tx_allocator/ut/ya.make index bd583687ab..2b1ebb2c3a 100644 --- a/ydb/core/tx/tx_allocator/ut/ya.make +++ b/ydb/core/tx/tx_allocator/ut/ya.make @@ -12,7 +12,7 @@ TIMEOUT(600) SIZE(MEDIUM) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/mind ydb/core/testlib ydb/core/tx diff --git a/ydb/core/tx/tx_proxy/proxy_ut_helpers.h b/ydb/core/tx/tx_proxy/proxy_ut_helpers.h index 846b0cf568..1f758eb21d 100644 --- a/ydb/core/tx/tx_proxy/proxy_ut_helpers.h +++ b/ydb/core/tx/tx_proxy/proxy_ut_helpers.h @@ -4,8 +4,8 @@ #include <ydb/core/protos/flat_tx_scheme.pb.h> #include <ydb/core/testlib/test_client.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> namespace NKikimr { namespace NTxProxyUT { diff --git a/ydb/core/tx/tx_proxy/ut_base_tenant/ya.make b/ydb/core/tx/tx_proxy/ut_base_tenant/ya.make index a07ffd818a..d1e2a87c2d 100644 --- a/ydb/core/tx/tx_proxy/ut_base_tenant/ya.make +++ b/ydb/core/tx/tx_proxy/ut_base_tenant/ya.make @@ -17,9 +17,9 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ydb/core/tx ydb/library/yql/public/udf/service/exception_policy diff --git a/ydb/core/tx/tx_proxy/ut_encrypted_storage/ya.make b/ydb/core/tx/tx_proxy/ut_encrypted_storage/ya.make index bc5ef23bd3..2341050b2c 100644 --- a/ydb/core/tx/tx_proxy/ut_encrypted_storage/ya.make +++ b/ydb/core/tx/tx_proxy/ut_encrypted_storage/ya.make @@ -25,9 +25,9 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ydb/core/tx ydb/library/yql/public/udf/service/exception_policy diff --git a/ydb/core/tx/tx_proxy/ut_ext_tenant/ya.make b/ydb/core/tx/tx_proxy/ut_ext_tenant/ya.make index 71efeaaeca..9ff35e1b07 100644 --- a/ydb/core/tx/tx_proxy/ut_ext_tenant/ya.make +++ b/ydb/core/tx/tx_proxy/ut_ext_tenant/ya.make @@ -17,9 +17,9 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/testlib ydb/core/tx ydb/library/yql/public/udf/service/exception_policy diff --git a/ydb/core/tx/tx_proxy/ut_storage_tenant/ya.make b/ydb/core/tx/tx_proxy/ut_storage_tenant/ya.make index 3192b7f7d2..08878ecf93 100644 --- a/ydb/core/tx/tx_proxy/ut_storage_tenant/ya.make +++ b/ydb/core/tx/tx_proxy/ut_storage_tenant/ya.make @@ -17,9 +17,9 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/blobstorage ydb/core/testlib ydb/core/tx diff --git a/ydb/core/util/address_classifier_ut.cpp b/ydb/core/util/address_classifier_ut.cpp index aaa2c8e3e5..89d54cb48c 100644 --- a/ydb/core/util/address_classifier_ut.cpp +++ b/ydb/core/util/address_classifier_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/util/address_classifier.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/ydb/core/util/bits_ut.cpp b/ydb/core/util/bits_ut.cpp index 2dc25234fe..3fc008fa3a 100644 --- a/ydb/core/util/bits_ut.cpp +++ b/ydb/core/util/bits_ut.cpp @@ -1,5 +1,5 @@ #include "bits.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/btree_benchmark/main.cpp b/ydb/core/util/btree_benchmark/main.cpp index b35d655929..f1e9872393 100644 --- a/ydb/core/util/btree_benchmark/main.cpp +++ b/ydb/core/util/btree_benchmark/main.cpp @@ -1,8 +1,8 @@ #include <ydb/core/util/btree.h> #include <ydb/core/util/btree_cow.h> -#include <library/cpp/testing/benchmark/bench.h> -#include <library/cpp/threading/skip_list/skiplist.h> +#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/threading/skip_list/skiplist.h> #include <util/generic/vector.h> #include <util/random/random.h> diff --git a/ydb/core/util/btree_benchmark/ya.make b/ydb/core/util/btree_benchmark/ya.make index 8c25f2f56c..a20ae7ab98 100644 --- a/ydb/core/util/btree_benchmark/ya.make +++ b/ydb/core/util/btree_benchmark/ya.make @@ -5,7 +5,7 @@ OWNER(snaury) ALLOCATOR(LF) PEERDIR( - library/cpp/threading/skip_list + library/cpp/threading/skip_list ydb/core/util ) diff --git a/ydb/core/util/btree_cow.h b/ydb/core/util/btree_cow.h index 3882e8d930..6cc9a36ef9 100644 --- a/ydb/core/util/btree_cow.h +++ b/ydb/core/util/btree_cow.h @@ -2,7 +2,7 @@ #include "btree_common.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/algorithm.h> #include <util/generic/typetraits.h> diff --git a/ydb/core/util/btree_cow_ut.cpp b/ydb/core/util/btree_cow_ut.cpp index 309ec5b18c..68035fc0b5 100644 --- a/ydb/core/util/btree_cow_ut.cpp +++ b/ydb/core/util/btree_cow_ut.cpp @@ -2,7 +2,7 @@ #include "ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/random/shuffle.h> #include <util/system/mutex.h> diff --git a/ydb/core/util/btree_ut.cpp b/ydb/core/util/btree_ut.cpp index 020797d2ed..3f095cfc63 100644 --- a/ydb/core/util/btree_ut.cpp +++ b/ydb/core/util/btree_ut.cpp @@ -2,7 +2,7 @@ #include "ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/random/shuffle.h> #include <util/system/mutex.h> diff --git a/ydb/core/util/cache_ut.cpp b/ydb/core/util/cache_ut.cpp index 1cc902e089..24d348caf0 100644 --- a/ydb/core/util/cache_ut.cpp +++ b/ydb/core/util/cache_ut.cpp @@ -1,6 +1,6 @@ #include "cache.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NCache { diff --git a/ydb/core/util/fast_tls_ut.cpp b/ydb/core/util/fast_tls_ut.cpp index 06c392f7d3..253117fad5 100644 --- a/ydb/core/util/fast_tls_ut.cpp +++ b/ydb/core/util/fast_tls_ut.cpp @@ -2,7 +2,7 @@ #include "ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> namespace NKikimr { diff --git a/ydb/core/util/fragmented_buffer_ut.cpp b/ydb/core/util/fragmented_buffer_ut.cpp index 7e7dee86df..03d4c7e27d 100644 --- a/ydb/core/util/fragmented_buffer_ut.cpp +++ b/ydb/core/util/fragmented_buffer_ut.cpp @@ -1,6 +1,6 @@ #include "fragmented_buffer.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/hazard_ut.cpp b/ydb/core/util/hazard_ut.cpp index 31c74ca125..39cd10cc70 100644 --- a/ydb/core/util/hazard_ut.cpp +++ b/ydb/core/util/hazard_ut.cpp @@ -1,6 +1,6 @@ #include "hazard.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <vector> diff --git a/ydb/core/util/hyperlog_counter_ut.cpp b/ydb/core/util/hyperlog_counter_ut.cpp index 25703265b0..d98326a96d 100644 --- a/ydb/core/util/hyperlog_counter_ut.cpp +++ b/ydb/core/util/hyperlog_counter_ut.cpp @@ -1,7 +1,7 @@ #include "hyperlog_counter.h" #include <util/random/random.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/interval_set_ut.cpp b/ydb/core/util/interval_set_ut.cpp index c1df7015fd..19beada277 100644 --- a/ydb/core/util/interval_set_ut.cpp +++ b/ydb/core/util/interval_set_ut.cpp @@ -1,6 +1,6 @@ #include "interval_set.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/intrusive_fixed_hash_set_ut.cpp b/ydb/core/util/intrusive_fixed_hash_set_ut.cpp index 434aca6b9b..d44836732b 100644 --- a/ydb/core/util/intrusive_fixed_hash_set_ut.cpp +++ b/ydb/core/util/intrusive_fixed_hash_set_ut.cpp @@ -2,7 +2,7 @@ #include <util/generic/deque.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/intrusive_heap_ut.cpp b/ydb/core/util/intrusive_heap_ut.cpp index d2a79dfaee..72366b6b40 100644 --- a/ydb/core/util/intrusive_heap_ut.cpp +++ b/ydb/core/util/intrusive_heap_ut.cpp @@ -1,6 +1,6 @@ #include "intrusive_heap.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/intrusive_stack_ut.cpp b/ydb/core/util/intrusive_stack_ut.cpp index 61e544b4ad..ca707bfc49 100644 --- a/ydb/core/util/intrusive_stack_ut.cpp +++ b/ydb/core/util/intrusive_stack_ut.cpp @@ -1,7 +1,7 @@ #include "intrusive_stack.h" #include <util/random/random.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/util/lf_stack_ut.cpp b/ydb/core/util/lf_stack_ut.cpp index b6472f388c..0fedb365d0 100644 --- a/ydb/core/util/lf_stack_ut.cpp +++ b/ydb/core/util/lf_stack_ut.cpp @@ -2,7 +2,7 @@ #include "ut_common.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> namespace NKikimr { diff --git a/ydb/core/util/page_map_ut.cpp b/ydb/core/util/page_map_ut.cpp index 0fd8eef29d..a2f717854a 100644 --- a/ydb/core/util/page_map_ut.cpp +++ b/ydb/core/util/page_map_ut.cpp @@ -1,6 +1,6 @@ #include "page_map.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/random/random.h> #include <util/random/shuffle.h> diff --git a/ydb/core/util/queue_inplace_ut.cpp b/ydb/core/util/queue_inplace_ut.cpp index fb2d511d04..dd3df46359 100644 --- a/ydb/core/util/queue_inplace_ut.cpp +++ b/ydb/core/util/queue_inplace_ut.cpp @@ -1,7 +1,7 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> #include "queue_inplace.h" diff --git a/ydb/core/util/queue_oneone_inplace_ut.cpp b/ydb/core/util/queue_oneone_inplace_ut.cpp index ac60a69f3d..5af214d11b 100644 --- a/ydb/core/util/queue_oneone_inplace_ut.cpp +++ b/ydb/core/util/queue_oneone_inplace_ut.cpp @@ -1,7 +1,7 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/vector.h> -#include <library/cpp/threading/future/legacy_future.h> +#include <library/cpp/threading/future/legacy_future.h> #include "queue_oneone_inplace.h" diff --git a/ydb/core/util/simple_cache_ut.cpp b/ydb/core/util/simple_cache_ut.cpp index 340d522663..cf936821a3 100644 --- a/ydb/core/util/simple_cache_ut.cpp +++ b/ydb/core/util/simple_cache_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "simple_cache.h" namespace NKikimr { diff --git a/ydb/core/util/ut/ya.make b/ydb/core/util/ut/ya.make index 315713cad8..79839815ba 100644 --- a/ydb/core/util/ut/ya.make +++ b/ydb/core/util/ut/ya.make @@ -14,9 +14,9 @@ ELSE() ENDIF() PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion - library/cpp/threading/future + library/cpp/threading/future ) SRCS( diff --git a/ydb/core/util/wildcard_ut.cpp b/ydb/core/util/wildcard_ut.cpp index ad818a54f1..8308c1bd30 100644 --- a/ydb/core/util/wildcard_ut.cpp +++ b/ydb/core/util/wildcard_ut.cpp @@ -1,5 +1,5 @@ #include "wildcard.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { Y_UNIT_TEST_SUITE(TWildcardTest) { diff --git a/ydb/core/util/ya.make b/ydb/core/util/ya.make index 4f325d8fcb..fc1c70b167 100644 --- a/ydb/core/util/ya.make +++ b/ydb/core/util/ya.make @@ -64,7 +64,7 @@ SRCS( PEERDIR( library/cpp/actors/interconnect/mock library/cpp/actors/util - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/html/escape library/cpp/ipmath library/cpp/lwtrace diff --git a/ydb/core/viewer/browse.h b/ydb/core/viewer/browse.h index c5716f46a7..53c53a1f75 100644 --- a/ydb/core/viewer/browse.h +++ b/ydb/core/viewer/browse.h @@ -265,7 +265,7 @@ public: Final = pbChild.GetFinal(); BrowseInfo.Clear(); MetaInfo.Clear(); - DescribeResult.Reset(); + DescribeResult.Reset(); return StepOnPath(ctx, currentName); } } diff --git a/ydb/core/viewer/json/json.cpp b/ydb/core/viewer/json/json.cpp index 51d7c9a32d..9030956168 100644 --- a/ydb/core/viewer/json/json.cpp +++ b/ydb/core/viewer/json/json.cpp @@ -1,5 +1,5 @@ #include <unordered_set> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/string/escape.h> #include <util/string/printf.h> #include <util/charset/utf8.h> diff --git a/ydb/core/viewer/json/json_ut.cpp b/ydb/core/viewer/json/json_ut.cpp index fa3825bcaf..479d35a88f 100644 --- a/ydb/core/viewer/json/json_ut.cpp +++ b/ydb/core/viewer/json/json_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include "json.h" #include <ydb/core/viewer/protos/viewer.pb.h> diff --git a/ydb/core/viewer/json/ya.make b/ydb/core/viewer/json/ya.make index d09b3d1954..23d8161f6e 100644 --- a/ydb/core/viewer/json/ya.make +++ b/ydb/core/viewer/json/ya.make @@ -16,7 +16,7 @@ SRCS( PEERDIR( contrib/libs/protobuf - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ydb/core/viewer/protos ) diff --git a/ydb/core/viewer/json_whoami.h b/ydb/core/viewer/json_whoami.h index b490a6930f..bd90ed3725 100644 --- a/ydb/core/viewer/json_whoami.h +++ b/ydb/core/viewer/json_whoami.h @@ -36,7 +36,7 @@ public: void ReplyAndDie(const TActorContext &ctx) { NACLibProto::TUserToken userToken; - Y_PROTOBUF_SUPPRESS_NODISCARD userToken.ParseFromString(Event->Get()->UserToken); + Y_PROTOBUF_SUPPRESS_NODISCARD userToken.ParseFromString(Event->Get()->UserToken); TStringStream json; TProtoToJson::ProtoToJson(json, userToken, JsonSettings); ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(Viewer->GetHTTPOKJSON() + json.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom)); diff --git a/ydb/core/ydb_convert/ydb_convert_ut.cpp b/ydb/core/ydb_convert/ydb_convert_ut.cpp index cb80206926..8670a7103b 100644 --- a/ydb/core/ydb_convert/ydb_convert_ut.cpp +++ b/ydb/core/ydb_convert/ydb_convert_ut.cpp @@ -2,8 +2,8 @@ #include <google/protobuf/text_format.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/core/ymq/actor/change_visibility.cpp b/ydb/core/ymq/actor/change_visibility.cpp index 5c3140bcc8..2a594a0978 100644 --- a/ydb/core/ymq/actor/change_visibility.cpp +++ b/ydb/core/ymq/actor/change_visibility.cpp @@ -8,7 +8,7 @@ #include <ydb/core/ymq/base/helpers.h> #include <ydb/core/ymq/proto/records.pb.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> using NKikimr::NClient::TValue; diff --git a/ydb/core/ymq/actor/send_message.cpp b/ydb/core/ymq/actor/send_message.cpp index e596b8f2e3..42068e9a9f 100644 --- a/ydb/core/ymq/actor/send_message.cpp +++ b/ydb/core/ymq/actor/send_message.cpp @@ -235,7 +235,7 @@ private: static TString ProtobufToString(const NProtoBuf::Message& proto) { TString ret; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&ret); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&ret); return ret; } diff --git a/ydb/core/ymq/actor/ut/attributes_md5_ut.cpp b/ydb/core/ymq/actor/ut/attributes_md5_ut.cpp index a6b00f7030..1c02531c56 100644 --- a/ydb/core/ymq/actor/ut/attributes_md5_ut.cpp +++ b/ydb/core/ymq/actor/ut/attributes_md5_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/actor/attributes_md5.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/actor/ut/infly_ut.cpp b/ydb/core/ymq/actor/ut/infly_ut.cpp index f6fed85aff..1eeed91036 100644 --- a/ydb/core/ymq/actor/ut/infly_ut.cpp +++ b/ydb/core/ymq/actor/ut/infly_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/actor/infly.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/actor/ut/message_delay_stats_ut.cpp b/ydb/core/ymq/actor/ut/message_delay_stats_ut.cpp index 0baffb3ef7..be3ba35cbe 100644 --- a/ydb/core/ymq/actor/ut/message_delay_stats_ut.cpp +++ b/ydb/core/ymq/actor/ut/message_delay_stats_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/actor/message_delay_stats.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/actor/ut/sha256_ut.cpp b/ydb/core/ymq/actor/ut/sha256_ut.cpp index a0f2b5286b..543db11bbe 100644 --- a/ydb/core/ymq/actor/ut/sha256_ut.cpp +++ b/ydb/core/ymq/actor/ut/sha256_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/core/ymq/base/helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/base/helpers.cpp b/ydb/core/ymq/base/helpers.cpp index 0d6ad36b13..c88b19a2bd 100644 --- a/ydb/core/ymq/base/helpers.cpp +++ b/ydb/core/ymq/base/helpers.cpp @@ -1,6 +1,6 @@ #include "helpers.h" -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/charset/utf8.h> #include <util/generic/array_size.h> @@ -122,7 +122,7 @@ bool ValidateQueueNameOrUserName(TStringBuf name) { static TString ProtobufToString(const NProtoBuf::Message& proto) { TString ret; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&ret); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&ret); return ret; } diff --git a/ydb/core/ymq/base/ut/action_ut.cpp b/ydb/core/ymq/base/ut/action_ut.cpp index 04298436fe..c5773edefa 100644 --- a/ydb/core/ymq/base/ut/action_ut.cpp +++ b/ydb/core/ymq/base/ut/action_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/base/action.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/base/ut/counters_ut.cpp b/ydb/core/ymq/base/ut/counters_ut.cpp index 5ff3d26e36..8e4fbcfadf 100644 --- a/ydb/core/ymq/base/ut/counters_ut.cpp +++ b/ydb/core/ymq/base/ut/counters_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/core/base/path.h> #include <ydb/core/protos/config.pb.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/subst.h> diff --git a/ydb/core/ymq/base/ut/dlq_helpers_ut.cpp b/ydb/core/ymq/base/ut/dlq_helpers_ut.cpp index 3254de751c..9d9e513a09 100644 --- a/ydb/core/ymq/base/ut/dlq_helpers_ut.cpp +++ b/ydb/core/ymq/base/ut/dlq_helpers_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/base/dlq_helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/base/ut/helpers_ut.cpp b/ydb/core/ymq/base/ut/helpers_ut.cpp index 9f1db59c72..16c9f3c5c6 100644 --- a/ydb/core/ymq/base/ut/helpers_ut.cpp +++ b/ydb/core/ymq/base/ut/helpers_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/base/helpers.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/base/ut/queue_attributes_ut.cpp b/ydb/core/ymq/base/ut/queue_attributes_ut.cpp index e33ab8ff20..e485a55046 100644 --- a/ydb/core/ymq/base/ut/queue_attributes_ut.cpp +++ b/ydb/core/ymq/base/ut/queue_attributes_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/base/queue_attributes.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp b/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp index 3ef6b6a956..be129f8b50 100644 --- a/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp +++ b/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/base/secure_protobuf_printer.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/base/ya.make b/ydb/core/ymq/base/ya.make index 14cd4e72a1..22e8f1f6f5 100644 --- a/ydb/core/ymq/base/ya.make +++ b/ydb/core/ymq/base/ya.make @@ -30,7 +30,7 @@ PEERDIR( library/cpp/lwtrace library/cpp/monlib/dynamic_counters library/cpp/scheme - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ydb/core/base ydb/core/protos ydb/core/ymq/proto diff --git a/ydb/core/ymq/client/bin/main.cpp b/ydb/core/ymq/client/bin/main.cpp index cb7dbd2a2c..09fbe90441 100644 --- a/ydb/core/ymq/client/bin/main.cpp +++ b/ydb/core/ymq/client/bin/main.cpp @@ -1,8 +1,8 @@ #include <util/random/shuffle.h> #include <ydb/core/ymq/client/cpp/client.h> -#include <library/cpp/getopt/opt.h> -#include <library/cpp/getopt/modchooser.h> +#include <library/cpp/getopt/opt.h> +#include <library/cpp/getopt/modchooser.h> #include <util/stream/file.h> #include <util/stream/output.h> diff --git a/ydb/core/ymq/client/bin/ya.make b/ydb/core/ymq/client/bin/ya.make index d00ca35587..df746754fb 100644 --- a/ydb/core/ymq/client/bin/ya.make +++ b/ydb/core/ymq/client/bin/ya.make @@ -10,7 +10,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt ydb/core/ymq/client/cpp ydb/core/ymq/proto ) diff --git a/ydb/core/ymq/http/http.cpp b/ydb/core/ymq/http/http.cpp index 5d0963bfb2..5e9eb26e3d 100644 --- a/ydb/core/ymq/http/http.cpp +++ b/ydb/core/ymq/http/http.cpp @@ -25,9 +25,9 @@ #include <util/network/init.h> #include <util/string/ascii.h> #include <util/string/builder.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> #include <util/string/split.h> -#include <library/cpp/string_utils/url/url.h> +#include <library/cpp/string_utils/url/url.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/http/http.h b/ydb/core/ymq/http/http.h index 01a2b0edc4..44103cdb1c 100644 --- a/ydb/core/ymq/http/http.h +++ b/ydb/core/ymq/http/http.h @@ -14,7 +14,7 @@ #include <util/generic/buffer.h> #include <util/generic/maybe.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> namespace NKikimr::NSQS { diff --git a/ydb/core/ymq/http/parser.rl6 b/ydb/core/ymq/http/parser.rl6 index b617c334a3..6d3baa4197 100644 --- a/ydb/core/ymq/http/parser.rl6 +++ b/ydb/core/ymq/http/parser.rl6 @@ -2,7 +2,7 @@ #include <ydb/core/ymq/base/helpers.h> #include <ydb/core/ymq/http/params.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/string/cast.h> #include <util/generic/strbuf.h> diff --git a/ydb/core/ymq/http/ut/xml_builder_ut.cpp b/ydb/core/ymq/http/ut/xml_builder_ut.cpp index 2eeed3a977..59ce70e14e 100644 --- a/ydb/core/ymq/http/ut/xml_builder_ut.cpp +++ b/ydb/core/ymq/http/ut/xml_builder_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/core/ymq/http/xml_builder.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(XmlBuilderTest) { Y_UNIT_TEST(WritesProperly) { diff --git a/ydb/core/ymq/http/xml.cpp b/ydb/core/ymq/http/xml.cpp index 0cb6f85274..1523f5d5ad 100644 --- a/ydb/core/ymq/http/xml.cpp +++ b/ydb/core/ymq/http/xml.cpp @@ -2,7 +2,7 @@ #include "xml_builder.h" #include <library/cpp/protobuf/json/proto2json.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/string/builder.h> #include <util/string/cast.h> diff --git a/ydb/core/ymq/http/ya.make b/ydb/core/ymq/http/ya.make index a8c5f62386..6b00e4893a 100644 --- a/ydb/core/ymq/http/ya.make +++ b/ydb/core/ymq/http/ya.make @@ -20,9 +20,9 @@ PEERDIR( library/cpp/http/misc library/cpp/http/server library/cpp/protobuf/json - library/cpp/string_utils/base64 - library/cpp/string_utils/quote - library/cpp/string_utils/url + library/cpp/string_utils/base64 + library/cpp/string_utils/quote + library/cpp/string_utils/url ydb/core/protos ydb/core/ymq/actor ydb/core/ymq/base diff --git a/ydb/core/ymq/ut/params_ut.cpp b/ydb/core/ymq/ut/params_ut.cpp index 8cc3aae9ef..477c35f522 100644 --- a/ydb/core/ymq/ut/params_ut.cpp +++ b/ydb/core/ymq/ut/params_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/http_proxy/error/error.h> #include <ydb/core/ymq/http/params.h> diff --git a/ydb/core/ymq/ut/queue_id_ut.cpp b/ydb/core/ymq/ut/queue_id_ut.cpp index 6e7305fc82..6b57c9a666 100644 --- a/ydb/core/ymq/ut/queue_id_ut.cpp +++ b/ydb/core/ymq/ut/queue_id_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/ymq/base/queue_id.h> using namespace NKikimr::NSQS; diff --git a/ydb/core/yql_testlib/ya.make b/ydb/core/yql_testlib/ya.make index a68cca63d3..1a6c29c3be 100644 --- a/ydb/core/yql_testlib/ya.make +++ b/ydb/core/yql_testlib/ya.make @@ -10,7 +10,7 @@ SRCS( PEERDIR( library/cpp/grpc/client library/cpp/regex/pcre - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/core/base ydb/core/client ydb/core/client/minikql_compile diff --git a/ydb/core/yql_testlib/yql_testlib.cpp b/ydb/core/yql_testlib/yql_testlib.cpp index 35838c40f6..3feba10c84 100644 --- a/ydb/core/yql_testlib/yql_testlib.cpp +++ b/ydb/core/yql_testlib/yql_testlib.cpp @@ -17,8 +17,8 @@ #include <ydb/library/yql/core/facade/yql_facade.h> #include <ydb/library/yql/public/udf/udf_helpers.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <ydb/core/keyvalue/keyvalue.h> #include <ydb/core/client/server/msgbus_server_tracer.h> diff --git a/ydb/library/aclib/aclib_ut.cpp b/ydb/library/aclib/aclib_ut.cpp index c5828f8624..35e8ac6cab 100644 --- a/ydb/library/aclib/aclib_ut.cpp +++ b/ydb/library/aclib/aclib_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/string_utils/base64/base64.h> #include "aclib.h" using namespace NACLib; @@ -284,7 +284,7 @@ Y_UNIT_TEST_SUITE(ACLib) { Y_UNIT_TEST(CheckACL) { TString ACL = "CiEIARD/DxoYcm9ib3QtcWxvdWQta2lraW1yQHN0YWZmIAMKGggBEP8PGhFyb2JvdC1xbG91ZEBzdGFmZiADCiEIARD/DxoYcm9ib3QtcWxvdWQtY2xpZW50QHN0YWZmIAMKFwgBEP8PGg54ZW5veGVub0BzdGFmZiAD"; TSecurityObject securityObject("owner@builtin", false); - Y_PROTOBUF_SUPPRESS_NODISCARD securityObject.MutableACL()->ParseFromString(Base64Decode(ACL)); + Y_PROTOBUF_SUPPRESS_NODISCARD securityObject.MutableACL()->ParseFromString(Base64Decode(ACL)); TUserToken user("xenoxeno@staff", {}); ui32 access = EAccessRights::DescribeSchema; UNIT_ASSERT(securityObject.CheckAccess(access, user)); diff --git a/ydb/library/backup/backup.cpp b/ydb/library/backup/backup.cpp index 676cc831ee..7e9fd94512 100644 --- a/ydb/library/backup/backup.cpp +++ b/ydb/library/backup/backup.cpp @@ -9,7 +9,7 @@ #include <ydb/public/sdk/cpp/client/ydb_table/table.h> #include <ydb/public/lib/ydb_cli/dump/util/util.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/string_utils/quote/quote.h> #include <util/datetime/base.h> diff --git a/ydb/library/backup/query_builder.cpp b/ydb/library/backup/query_builder.cpp index dd931c82bb..927e95512c 100644 --- a/ydb/library/backup/query_builder.cpp +++ b/ydb/library/backup/query_builder.cpp @@ -7,7 +7,7 @@ #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h> #include <util/string/builder.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> namespace NYdb::NBackup { diff --git a/ydb/library/backup/ut/ut.cpp b/ydb/library/backup/ut/ut.cpp index 5967e9dfa3..44e13ef6fe 100644 --- a/ydb/library/backup/ut/ut.cpp +++ b/ydb/library/backup/ut/ut.cpp @@ -5,11 +5,11 @@ #include <ydb/public/api/protos/ydb_table.pb.h> #include <ydb/public/sdk/cpp/client/ydb_table/table.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/folder/tempdir.h> #include <util/generic/strbuf.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> namespace NYdb { diff --git a/ydb/library/backup/ut/ya.make b/ydb/library/backup/ut/ya.make index 2819acff50..b74b2b59cf 100644 --- a/ydb/library/backup/ut/ya.make +++ b/ydb/library/backup/ut/ya.make @@ -12,7 +12,7 @@ TIMEOUT(60) SRC(ut.cpp) PEERDIR( - library/cpp/string_utils/quote + library/cpp/string_utils/quote ydb/library/backup ) diff --git a/ydb/library/backup/ya.make b/ydb/library/backup/ya.make index 9ea7b93961..ba2ea316bc 100644 --- a/ydb/library/backup/ya.make +++ b/ydb/library/backup/ya.make @@ -8,7 +8,7 @@ OWNER( PEERDIR( library/cpp/bucket_quoter library/cpp/regex/pcre - library/cpp/string_utils/quote + library/cpp/string_utils/quote util ydb/library/dynumber ydb/public/api/grpc diff --git a/ydb/library/binary_json/ut/test_base.h b/ydb/library/binary_json/ut/test_base.h index 838fb33251..29229ca0f6 100644 --- a/ydb/library/binary_json/ut/test_base.h +++ b/ydb/library/binary_json/ut/test_base.h @@ -15,7 +15,7 @@ #include <ydb/library/binary_json/read.h> #include <library/cpp/json/json_reader.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/yexception.h> diff --git a/ydb/library/http_proxy/authorization/signature.cpp b/ydb/library/http_proxy/authorization/signature.cpp index 60368c0614..fcaaf9e22b 100644 --- a/ydb/library/http_proxy/authorization/signature.cpp +++ b/ydb/library/http_proxy/authorization/signature.cpp @@ -11,7 +11,7 @@ #include <util/generic/algorithm.h> #include <util/stream/str.h> #include <util/string/builder.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> #include <util/string/hex.h> #include <util/string/join.h> #include <util/string/strip.h> diff --git a/ydb/library/http_proxy/authorization/ut/auth_helpers_ut.cpp b/ydb/library/http_proxy/authorization/ut/auth_helpers_ut.cpp index 0fb753120a..8ec4ca6ac1 100644 --- a/ydb/library/http_proxy/authorization/ut/auth_helpers_ut.cpp +++ b/ydb/library/http_proxy/authorization/ut/auth_helpers_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/library/http_proxy/error/error.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr::NSQS { diff --git a/ydb/library/http_proxy/authorization/ut/signature_ut.cpp b/ydb/library/http_proxy/authorization/ut/signature_ut.cpp index 062ac52146..7813aef1c4 100644 --- a/ydb/library/http_proxy/authorization/ut/signature_ut.cpp +++ b/ydb/library/http_proxy/authorization/ut/signature_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/library/http_proxy/authorization/signature.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/http_proxy/error/error.h> using namespace NKikimr::NSQS; diff --git a/ydb/library/mkql_proto/mkql_proto.cpp b/ydb/library/mkql_proto/mkql_proto.cpp index 53d7722dee..1908e476cc 100644 --- a/ydb/library/mkql_proto/mkql_proto.cpp +++ b/ydb/library/mkql_proto/mkql_proto.cpp @@ -7,7 +7,7 @@ #include <ydb/library/yql/minikql/mkql_type_ops.h> #include <ydb/library/yql/public/decimal/yql_decimal.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr::NMiniKQL { diff --git a/ydb/library/mkql_proto/ut/helpers/helpers.h b/ydb/library/mkql_proto/ut/helpers/helpers.h index e5094e8085..c27345227d 100644 --- a/ydb/library/mkql_proto/ut/helpers/helpers.h +++ b/ydb/library/mkql_proto/ut/helpers/helpers.h @@ -7,7 +7,7 @@ #include <ydb/library/yql/minikql/comp_nodes/mkql_factories.h> #include <google/protobuf/text_format.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <functional> diff --git a/ydb/library/mkql_proto/ut/helpers/ya.make b/ydb/library/mkql_proto/ut/helpers/ya.make index 8bb5d97871..bc77a82f84 100644 --- a/ydb/library/mkql_proto/ut/helpers/ya.make +++ b/ydb/library/mkql_proto/ut/helpers/ya.make @@ -7,7 +7,7 @@ PEERDIR( ydb/library/yql/minikql/comp_nodes ydb/library/yql/minikql/computation ydb/library/yql/minikql/invoke_builtins - library/cpp/testing/unittest + library/cpp/testing/unittest contrib/libs/protobuf ) diff --git a/ydb/library/pdisk_io/sector_map.cpp b/ydb/library/pdisk_io/sector_map.cpp index c1a7a28964..7cb8d282ee 100644 --- a/ydb/library/pdisk_io/sector_map.cpp +++ b/ydb/library/pdisk_io/sector_map.cpp @@ -27,7 +27,7 @@ void TSectorMap::StoreToFile(const TString& path) { } TString raw; - Y_PROTOBUF_SUPPRESS_NODISCARD snap.SerializeToString(&raw); + Y_PROTOBUF_SUPPRESS_NODISCARD snap.SerializeToString(&raw); TFileOutput(path).Write(raw); } diff --git a/ydb/library/schlab/mon/test/test.cpp b/ydb/library/schlab/mon/test/test.cpp index 64bf719d9a..3be8daf8c5 100644 --- a/ydb/library/schlab/mon/test/test.cpp +++ b/ydb/library/schlab/mon/test/test.cpp @@ -1,5 +1,5 @@ #include <ydb/library/schlab/mon/mon.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <library/cpp/monlib/service/monservice.h> #include <library/cpp/monlib/service/pages/resource_mon_page.h> #include <library/cpp/resource/resource.h> diff --git a/ydb/library/schlab/mon/test/ya.make b/ydb/library/schlab/mon/test/ya.make index bc282bfcf4..6374f230b3 100644 --- a/ydb/library/schlab/mon/test/ya.make +++ b/ydb/library/schlab/mon/test/ya.make @@ -14,7 +14,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/monlib/dynamic_counters ydb/library/schlab/mon ) diff --git a/ydb/library/schlab/schoot/ya.make b/ydb/library/schlab/schoot/ya.make index 89519078de..371e3099d5 100644 --- a/ydb/library/schlab/schoot/ya.make +++ b/ydb/library/schlab/schoot/ya.make @@ -6,7 +6,7 @@ OWNER( ) PEERDIR( - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/protobuf/json ydb/library/schlab/protos ) diff --git a/ydb/library/schlab/ut/schlab_ut.cpp b/ydb/library/schlab/ut/schlab_ut.cpp index 6ca075471a..562a22312b 100644 --- a/ydb/library/schlab/ut/schlab_ut.cpp +++ b/ydb/library/schlab/ut/schlab_ut.cpp @@ -1,7 +1,7 @@ #include <ydb/library/schlab/schoot/schoot_gen_cfg.h> #include <ydb/library/schlab/schoot/schoot_gen.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(SchLab) { Y_UNIT_TEST(TestSchootGenCfgSet1) { diff --git a/ydb/library/yql/ast/ya.make b/ydb/library/yql/ast/ya.make index 2d55860c89..5bd6f1a6cf 100644 --- a/ydb/library/yql/ast/ya.make +++ b/ydb/library/yql/ast/ya.make @@ -33,7 +33,7 @@ SRCS( PEERDIR( library/cpp/colorizer library/cpp/containers/sorted_vector - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/deprecated/enum_codegen library/cpp/enumbitset library/cpp/string_utils/levenshtein_diff diff --git a/ydb/library/yql/ast/yql_ast.cpp b/ydb/library/yql/ast/yql_ast.cpp index 16e521d901..03963d67fd 100644 --- a/ydb/library/yql/ast/yql_ast.cpp +++ b/ydb/library/yql/ast/yql_ast.cpp @@ -3,7 +3,7 @@ #include <util/string/builder.h> #include <util/system/compiler.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <ydb/library/yql/utils/utf8.h> #include <cstdlib> diff --git a/ydb/library/yql/ast/yql_ast_annotation.cpp b/ydb/library/yql/ast/yql_ast_annotation.cpp index fc97b879c8..2b68e4b534 100644 --- a/ydb/library/yql/ast/yql_ast_annotation.cpp +++ b/ydb/library/yql/ast/yql_ast_annotation.cpp @@ -3,7 +3,7 @@ #include <util/string/split.h> #include <util/string/cast.h> #include <util/string/builder.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NYql { diff --git a/ydb/library/yql/ast/yql_ast_ut.cpp b/ydb/library/yql/ast/yql_ast_ut.cpp index 23e140653d..75dfb48a0e 100644 --- a/ydb/library/yql/ast/yql_ast_ut.cpp +++ b/ydb/library/yql/ast/yql_ast_ut.cpp @@ -1,7 +1,7 @@ #include "yql_ast.h" #include "yql_ast_annotation.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/util.h> #include <util/system/sanitizers.h> diff --git a/ydb/library/yql/ast/yql_expr.cpp b/ydb/library/yql/ast/yql_expr.cpp index 82f6c5812a..67458b8dd8 100644 --- a/ydb/library/yql/ast/yql_expr.cpp +++ b/ydb/library/yql/ast/yql_expr.cpp @@ -4,7 +4,7 @@ #include <ydb/library/yql/utils/utf8.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/hash.h> #include <util/generic/size_literals.h> #include <util/string/cast.h> diff --git a/ydb/library/yql/ast/yql_expr.h b/ydb/library/yql/ast/yql_expr.h index d6eb544f9a..2ca743cc92 100644 --- a/ydb/library/yql/ast/yql_expr.h +++ b/ydb/library/yql/ast/yql_expr.h @@ -14,7 +14,7 @@ #include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h> #include <library/cpp/enumbitset/enumbitset.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/deprecated/enum_codegen/enum_codegen.h> #include <util/string/builder.h> diff --git a/ydb/library/yql/ast/yql_expr_builder_ut.cpp b/ydb/library/yql/ast/yql_expr_builder_ut.cpp index eb0f2a0bf1..b91114c164 100644 --- a/ydb/library/yql/ast/yql_expr_builder_ut.cpp +++ b/ydb/library/yql/ast/yql_expr_builder_ut.cpp @@ -1,5 +1,5 @@ #include "yql_expr.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { diff --git a/ydb/library/yql/ast/yql_expr_check_args_ut.cpp b/ydb/library/yql/ast/yql_expr_check_args_ut.cpp index 9f1a8af420..0954762208 100644 --- a/ydb/library/yql/ast/yql_expr_check_args_ut.cpp +++ b/ydb/library/yql/ast/yql_expr_check_args_ut.cpp @@ -1,5 +1,5 @@ #include "yql_expr.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { diff --git a/ydb/library/yql/ast/yql_expr_ut.cpp b/ydb/library/yql/ast/yql_expr_ut.cpp index 06550f2507..5050c74ed3 100644 --- a/ydb/library/yql/ast/yql_expr_ut.cpp +++ b/ydb/library/yql/ast/yql_expr_ut.cpp @@ -1,5 +1,5 @@ #include "yql_expr.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/hex.h> diff --git a/ydb/library/yql/ast/yql_type_string.cpp b/ydb/library/yql/ast/yql_type_string.cpp index af9af93259..b1c7605f0a 100644 --- a/ydb/library/yql/ast/yql_type_string.cpp +++ b/ydb/library/yql/ast/yql_type_string.cpp @@ -2,7 +2,7 @@ #include "yql_expr.h" #include "yql_ast_escaping.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/string/cast.h> #include <util/generic/map.h> diff --git a/ydb/library/yql/ast/yql_type_string_ut.cpp b/ydb/library/yql/ast/yql_type_string_ut.cpp index 2f22c42258..21f2034808 100644 --- a/ydb/library/yql/ast/yql_type_string_ut.cpp +++ b/ydb/library/yql/ast/yql_type_string_ut.cpp @@ -1,7 +1,7 @@ #include "yql_type_string.h" #include "yql_expr.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/core/facade/ya.make b/ydb/library/yql/core/facade/ya.make index c3b5188980..3cd5a5eb36 100644 --- a/ydb/library/yql/core/facade/ya.make +++ b/ydb/library/yql/core/facade/ya.make @@ -9,8 +9,8 @@ SRCS( PEERDIR( library/cpp/deprecated/split library/cpp/random_provider - library/cpp/string_utils/base64 - library/cpp/threading/future + library/cpp/string_utils/base64 + library/cpp/threading/future library/cpp/time_provider library/cpp/yson library/cpp/yson/node diff --git a/ydb/library/yql/core/facade/yql_facade.cpp b/ydb/library/yql/core/facade/yql_facade.cpp index b74abc1c34..ca6f55f344 100644 --- a/ydb/library/yql/core/facade/yql_facade.cpp +++ b/ydb/library/yql/core/facade/yql_facade.cpp @@ -26,7 +26,7 @@ #include <library/cpp/yson/node/node_io.h> #include <library/cpp/deprecated/split/split_iterator.h> #include <library/cpp/yson/writer.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/stream/file.h> #include <util/stream/null.h> diff --git a/ydb/library/yql/core/facade/yql_facade.h b/ydb/library/yql/core/facade/yql_facade.h index 1f8f47681d..d792147033 100644 --- a/ydb/library/yql/core/facade/yql_facade.h +++ b/ydb/library/yql/core/facade/yql_facade.h @@ -10,7 +10,7 @@ #include <library/cpp/random_provider/random_provider.h> #include <library/cpp/time_provider/time_provider.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/system/file.h> #include <util/generic/ptr.h> diff --git a/ydb/library/yql/core/file_storage/file_storage.cpp b/ydb/library/yql/core/file_storage/file_storage.cpp index 631adbc688..835fceccac 100644 --- a/ydb/library/yql/core/file_storage/file_storage.cpp +++ b/ydb/library/yql/core/file_storage/file_storage.cpp @@ -14,9 +14,9 @@ #include <ydb/library/yql/utils/retry.h> #include <ydb/library/yql/utils/yql_panic.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <library/cpp/digest/md5/md5.h> -#include <library/cpp/threading/future/async.h> +#include <library/cpp/threading/future/async.h> #include <util/generic/guid.h> #include <util/generic/yexception.h> diff --git a/ydb/library/yql/core/file_storage/file_storage.h b/ydb/library/yql/core/file_storage/file_storage.h index 9133d57b1b..dec49d4056 100644 --- a/ydb/library/yql/core/file_storage/file_storage.h +++ b/ydb/library/yql/core/file_storage/file_storage.h @@ -2,7 +2,7 @@ #include "storage.h" -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <library/cpp/uri/http_url.h> #include <util/folder/path.h> diff --git a/ydb/library/yql/core/file_storage/file_storage_ut.cpp b/ydb/library/yql/core/file_storage/file_storage_ut.cpp index 5103fdd31d..409f0042ae 100644 --- a/ydb/library/yql/core/file_storage/file_storage_ut.cpp +++ b/ydb/library/yql/core/file_storage/file_storage_ut.cpp @@ -4,10 +4,10 @@ #include <ydb/library/yql/core/file_storage/proto/file_storage.pb.h> #include <ydb/library/yql/core/file_storage/http_download/http_download.h> -#include <library/cpp/threading/future/future.h> -#include <library/cpp/threading/future/async.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/async.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/stream/file.h> #include <util/system/tempfile.h> diff --git a/ydb/library/yql/core/file_storage/http_download/pattern_group_ut.cpp b/ydb/library/yql/core/file_storage/http_download/pattern_group_ut.cpp index 1b917252c1..5dd9bf4d8b 100644 --- a/ydb/library/yql/core/file_storage/http_download/pattern_group_ut.cpp +++ b/ydb/library/yql/core/file_storage/http_download/pattern_group_ut.cpp @@ -1,6 +1,6 @@ #include "pattern_group.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/core/file_storage/sized_cache.h b/ydb/library/yql/core/file_storage/sized_cache.h index a08095cab7..dfc34daa52 100644 --- a/ydb/library/yql/core/file_storage/sized_cache.h +++ b/ydb/library/yql/core/file_storage/sized_cache.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <util/system/spinlock.h> #include <util/generic/string.h> diff --git a/ydb/library/yql/core/file_storage/sized_cache_ut.cpp b/ydb/library/yql/core/file_storage/sized_cache_ut.cpp index b0e41e5c62..8cba4b38cb 100644 --- a/ydb/library/yql/core/file_storage/sized_cache_ut.cpp +++ b/ydb/library/yql/core/file_storage/sized_cache_ut.cpp @@ -1,6 +1,6 @@ #include "sized_cache.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/core/file_storage/storage_ut.cpp b/ydb/library/yql/core/file_storage/storage_ut.cpp index 4229abd219..fc670db82f 100644 --- a/ydb/library/yql/core/file_storage/storage_ut.cpp +++ b/ydb/library/yql/core/file_storage/storage_ut.cpp @@ -1,7 +1,7 @@ #include "storage.h" -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/threading/future/async.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/threading/future/async.h> #include <util/datetime/base.h> #include <util/folder/path.h> diff --git a/ydb/library/yql/core/file_storage/url_mapper_ut.cpp b/ydb/library/yql/core/file_storage/url_mapper_ut.cpp index 287caf054c..877622ee5a 100644 --- a/ydb/library/yql/core/file_storage/url_mapper_ut.cpp +++ b/ydb/library/yql/core/file_storage/url_mapper_ut.cpp @@ -1,5 +1,5 @@ #include "url_mapper.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/core/file_storage/ut/test_http_server.cpp b/ydb/library/yql/core/file_storage/ut/test_http_server.cpp index c296fc4bef..4adc7c34f1 100644 --- a/ydb/library/yql/core/file_storage/ut/test_http_server.cpp +++ b/ydb/library/yql/core/file_storage/ut/test_http_server.cpp @@ -2,7 +2,7 @@ #include <library/cpp/http/misc/httpcodes.h> #include <library/cpp/http/server/http_ex.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/atomic_ops.h> diff --git a/ydb/library/yql/core/file_storage/ut/test_http_server.h b/ydb/library/yql/core/file_storage/ut/test_http_server.h index 170b45ca62..24b45a41a6 100644 --- a/ydb/library/yql/core/file_storage/ut/test_http_server.h +++ b/ydb/library/yql/core/file_storage/ut/test_http_server.h @@ -5,7 +5,7 @@ #include <util/generic/string.h> #include <library/cpp/http/misc/httpcodes.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <functional> namespace NYql { diff --git a/ydb/library/yql/core/file_storage/ut/ya.make b/ydb/library/yql/core/file_storage/ut/ya.make index c19f58203b..1082d4500a 100644 --- a/ydb/library/yql/core/file_storage/ut/ya.make +++ b/ydb/library/yql/core/file_storage/ut/ya.make @@ -19,7 +19,7 @@ SRCS( PEERDIR( library/cpp/http/server - library/cpp/threading/future + library/cpp/threading/future ydb/library/yql/core/file_storage/http_download ) diff --git a/ydb/library/yql/core/file_storage/ya.make b/ydb/library/yql/core/file_storage/ya.make index f25592bfb7..0d58ef33e3 100644 --- a/ydb/library/yql/core/file_storage/ya.make +++ b/ydb/library/yql/core/file_storage/ya.make @@ -18,7 +18,7 @@ SRCS( ) PEERDIR( - library/cpp/cache + library/cpp/cache library/cpp/digest/md5 library/cpp/logger/global library/cpp/threading/future diff --git a/ydb/library/yql/core/issue/yql_issue_ut.cpp b/ydb/library/yql/core/issue/yql_issue_ut.cpp index fa8f97e63a..1f4d5bd19c 100644 --- a/ydb/library/yql/core/issue/yql_issue_ut.cpp +++ b/ydb/library/yql/core/issue/yql_issue_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "yql_issue.h" diff --git a/ydb/library/yql/core/yql_callable_transform.h b/ydb/library/yql/core/yql_callable_transform.h index d508152029..e34515197a 100644 --- a/ydb/library/yql/core/yql_callable_transform.h +++ b/ydb/library/yql/core/yql_callable_transform.h @@ -10,7 +10,7 @@ #include <ydb/library/yql/public/issue/yql_issue.h> #include <ydb/library/yql/utils/yql_panic.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/ptr.h> #include <util/string/builder.h> diff --git a/ydb/library/yql/core/yql_graph_transformer.h b/ydb/library/yql/core/yql_graph_transformer.h index 60d87727dd..09a518543f 100644 --- a/ydb/library/yql/core/yql_graph_transformer.h +++ b/ydb/library/yql/core/yql_graph_transformer.h @@ -3,7 +3,7 @@ #include <ydb/library/yql/utils/yql_panic.h> #include <ydb/library/yql/core/issue/yql_issue.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/hash.h> #include <util/datetime/base.h> diff --git a/ydb/library/yql/dq/runtime/dq_output_channel_ut.cpp b/ydb/library/yql/dq/runtime/dq_output_channel_ut.cpp index 2c3c1ad100..0de6e4b818 100644 --- a/ydb/library/yql/dq/runtime/dq_output_channel_ut.cpp +++ b/ydb/library/yql/dq/runtime/dq_output_channel_ut.cpp @@ -6,7 +6,7 @@ #include <ydb/library/yql/minikql/computation/mkql_value_builder.h> #include <ydb/library/yql/minikql/mkql_string_util.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NActors; using namespace NKikimr; diff --git a/ydb/library/yql/dq/runtime/ut/ya.make b/ydb/library/yql/dq/runtime/ut/ya.make index d0b21e0c24..14f8ee92ef 100644 --- a/ydb/library/yql/dq/runtime/ut/ya.make +++ b/ydb/library/yql/dq/runtime/ut/ya.make @@ -15,7 +15,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/library/yql/public/udf/service/exception_policy ) diff --git a/ydb/library/yql/minikql/benchmark/pack_num/pack_num_bench.cpp b/ydb/library/yql/minikql/benchmark/pack_num/pack_num_bench.cpp index d49aa682d0..121c4c78f3 100644 --- a/ydb/library/yql/minikql/benchmark/pack_num/pack_num_bench.cpp +++ b/ydb/library/yql/minikql/benchmark/pack_num/pack_num_bench.cpp @@ -1,6 +1,6 @@ #include <ydb/library/yql/minikql/pack_num.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <library/cpp/packedtypes/longs.h> #include <dict/dictutil/pack.h> diff --git a/ydb/library/yql/minikql/codegen/codegen_ut.cpp b/ydb/library/yql/minikql/codegen/codegen_ut.cpp index 332e3fdcdc..972c7c1b27 100644 --- a/ydb/library/yql/minikql/codegen/codegen_ut.cpp +++ b/ydb/library/yql/minikql/codegen/codegen_ut.cpp @@ -6,7 +6,7 @@ #include <llvm/IR/LLVMContext.h> #include <llvm/IR/Module.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/resource/resource.h> using namespace NYql::NCodegen; diff --git a/ydb/library/yql/minikql/comp_nodes/ut/mkql_computation_node_ut.h b/ydb/library/yql/minikql/comp_nodes/ut/mkql_computation_node_ut.h index db79fc7ab8..c040aa29fe 100644 --- a/ydb/library/yql/minikql/comp_nodes/ut/mkql_computation_node_ut.h +++ b/ydb/library/yql/minikql/comp_nodes/ut/mkql_computation_node_ut.h @@ -7,7 +7,7 @@ #include <ydb/library/yql/minikql/mkql_terminator.h> #include "../mkql_factories.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #define UNBOXED_VALUE_STR_EQUAL(unboxed, expected) \ do { \ diff --git a/ydb/library/yql/minikql/comp_nodes/ut/mkql_safe_circular_buffer_ut.cpp b/ydb/library/yql/minikql/comp_nodes/ut/mkql_safe_circular_buffer_ut.cpp index 9df6d01d4e..fb6df4f7b7 100644 --- a/ydb/library/yql/minikql/comp_nodes/ut/mkql_safe_circular_buffer_ut.cpp +++ b/ydb/library/yql/minikql/comp_nodes/ut/mkql_safe_circular_buffer_ut.cpp @@ -1,6 +1,6 @@ #include "mkql_safe_circular_buffer.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/yql/public/udf/udf_value.h> diff --git a/ydb/library/yql/minikql/compact_hash_ut.cpp b/ydb/library/yql/minikql/compact_hash_ut.cpp index 02278f64cb..c678f46d9c 100644 --- a/ydb/library/yql/minikql/compact_hash_ut.cpp +++ b/ydb/library/yql/minikql/compact_hash_ut.cpp @@ -1,6 +1,6 @@ #include "compact_hash.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/bitmap.h> #include <util/generic/ylimits.h> diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_graph_saveload_ut.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_graph_saveload_ut.cpp index cc734e11d6..a029178ebf 100644 --- a/ydb/library/yql/minikql/computation/mkql_computation_node_graph_saveload_ut.cpp +++ b/ydb/library/yql/minikql/computation/mkql_computation_node_graph_saveload_ut.cpp @@ -8,7 +8,7 @@ #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> #include <ydb/library/yql/minikql/comp_nodes/mkql_factories.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_holders.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_holders.cpp index 67a7cfb302..a4c811bd0c 100644 --- a/ydb/library/yql/minikql/computation/mkql_computation_node_holders.cpp +++ b/ydb/library/yql/minikql/computation/mkql_computation_node_holders.cpp @@ -13,7 +13,7 @@ #include <ydb/library/yql/public/udf/udf_value.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_list_ut.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_list_ut.cpp index f8a90d60fe..fd5a267016 100644 --- a/ydb/library/yql/minikql/computation/mkql_computation_node_list_ut.cpp +++ b/ydb/library/yql/minikql/computation/mkql_computation_node_list_ut.cpp @@ -1,7 +1,7 @@ #include "mkql_computation_node_list.h" #include <ydb/library/yql/minikql/mkql_function_registry.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_pack_ut.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_pack_ut.cpp index 6a47b51829..b5f27091be 100644 --- a/ydb/library/yql/minikql/computation/mkql_computation_node_pack_ut.cpp +++ b/ydb/library/yql/minikql/computation/mkql_computation_node_pack_ut.cpp @@ -11,7 +11,7 @@ #include <ydb/library/yql/public/udf/udf_value.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> #include <util/generic/xrange.h> #include <util/generic/maybe.h> diff --git a/ydb/library/yql/minikql/computation/mkql_validate.cpp b/ydb/library/yql/minikql/computation/mkql_validate.cpp index b238b28aee..da540c5ea1 100644 --- a/ydb/library/yql/minikql/computation/mkql_validate.cpp +++ b/ydb/library/yql/minikql/computation/mkql_validate.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <ydb/library/yql/public/udf/udf_value_builder.h> #include "mkql_validate.h" diff --git a/ydb/library/yql/minikql/computation/mkql_validate_ut.cpp b/ydb/library/yql/minikql/computation/mkql_validate_ut.cpp index ed2f12303a..83a2bb1a2c 100644 --- a/ydb/library/yql/minikql/computation/mkql_validate_ut.cpp +++ b/ydb/library/yql/minikql/computation/mkql_validate_ut.cpp @@ -13,7 +13,7 @@ #include <ydb/library/yql/minikql/mkql_utils.h> #include <ydb/library/yql/minikql/comp_nodes/mkql_factories.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> diff --git a/ydb/library/yql/minikql/computation/mkql_value_builder_ut.cpp b/ydb/library/yql/minikql/computation/mkql_value_builder_ut.cpp index 5f54b2dd24..2556cd24f9 100644 --- a/ydb/library/yql/minikql/computation/mkql_value_builder_ut.cpp +++ b/ydb/library/yql/minikql/computation/mkql_value_builder_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/library/yql/minikql/mkql_function_registry.h> #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/library/yql/minikql/computation/presort_ut.cpp b/ydb/library/yql/minikql/computation/presort_ut.cpp index 4adf957ca1..edb5a29cd2 100644 --- a/ydb/library/yql/minikql/computation/presort_ut.cpp +++ b/ydb/library/yql/minikql/computation/presort_ut.cpp @@ -5,7 +5,7 @@ #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/hex.h> diff --git a/ydb/library/yql/minikql/dom/json.cpp b/ydb/library/yql/minikql/dom/json.cpp index 853df56cab..9f73690a0f 100644 --- a/ydb/library/yql/minikql/dom/json.cpp +++ b/ydb/library/yql/minikql/dom/json.cpp @@ -1,7 +1,7 @@ #include "json.h" #include "node.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/json/json_reader.h> #include <library/cpp/json/json_writer.h> diff --git a/ydb/library/yql/minikql/dom/ut/json_ut.cpp b/ydb/library/yql/minikql/dom/ut/json_ut.cpp index 5b636eedcf..609912b4ba 100644 --- a/ydb/library/yql/minikql/dom/ut/json_ut.cpp +++ b/ydb/library/yql/minikql/dom/ut/json_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/library/yql/minikql/dom/json.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/yql/minikql/mkql_alloc.h> #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h> #include <ydb/library/yql/minikql/computation/mkql_value_builder.h> diff --git a/ydb/library/yql/minikql/dom/ut/yson_ut.cpp b/ydb/library/yql/minikql/dom/ut/yson_ut.cpp index b9c479b81b..e34910e332 100644 --- a/ydb/library/yql/minikql/dom/ut/yson_ut.cpp +++ b/ydb/library/yql/minikql/dom/ut/yson_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/library/yql/minikql/dom/yson.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/yql/minikql/mkql_alloc.h> #include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h> #include <ydb/library/yql/minikql/computation/mkql_value_builder.h> diff --git a/ydb/library/yql/minikql/dom/ya.make b/ydb/library/yql/minikql/dom/ya.make index d18bbe29e6..cb254765df 100644 --- a/ydb/library/yql/minikql/dom/ya.make +++ b/ydb/library/yql/minikql/dom/ya.make @@ -9,7 +9,7 @@ OWNER( YQL_ABI_VERSION(2 21 0) PEERDIR( - library/cpp/containers/stack_vector + library/cpp/containers/stack_vector library/cpp/json library/cpp/yson_pull ydb/library/yql/public/udf diff --git a/ydb/library/yql/minikql/dom/yson.cpp b/ydb/library/yql/minikql/dom/yson.cpp index f3ab30f22c..c9004dace3 100644 --- a/ydb/library/yql/minikql/dom/yson.cpp +++ b/ydb/library/yql/minikql/dom/yson.cpp @@ -1,7 +1,7 @@ #include "node.h" #include "yson.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/yson_pull/exceptions.h> #include <library/cpp/yson_pull/reader.h> diff --git a/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_ut.cpp b/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_ut.cpp index 9420223b74..e7c48d16a4 100644 --- a/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_ut.cpp +++ b/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_ut.cpp @@ -2,7 +2,7 @@ #include <ydb/library/yql/public/udf/udf_value.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <array> diff --git a/ydb/library/yql/minikql/jsonpath/benchmark/main.cpp b/ydb/library/yql/minikql/jsonpath/benchmark/main.cpp index 742a9e18b4..c3903ec8d6 100644 --- a/ydb/library/yql/minikql/jsonpath/benchmark/main.cpp +++ b/ydb/library/yql/minikql/jsonpath/benchmark/main.cpp @@ -10,7 +10,7 @@ #include <ydb/library/yql/minikql/mkql_node.h> #include <library/cpp/json/json_value.h> -#include <library/cpp/testing/benchmark/bench.h> +#include <library/cpp/testing/benchmark/bench.h> #include <util/random/fast.h> diff --git a/ydb/library/yql/minikql/jsonpath/executor.h b/ydb/library/yql/minikql/jsonpath/executor.h index 782ab1818d..7b880d6708 100644 --- a/ydb/library/yql/minikql/jsonpath/executor.h +++ b/ydb/library/yql/minikql/jsonpath/executor.h @@ -10,7 +10,7 @@ #include <ydb/library/yql/public/udf/udf_allocator.h> #include <library/cpp/json/json_value.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/ptr.h> #include <util/generic/stack.h> diff --git a/ydb/library/yql/minikql/jsonpath/ut/test_base.h b/ydb/library/yql/minikql/jsonpath/ut/test_base.h index 7c4bd803f6..2a277964f2 100644 --- a/ydb/library/yql/minikql/jsonpath/ut/test_base.h +++ b/ydb/library/yql/minikql/jsonpath/ut/test_base.h @@ -13,7 +13,7 @@ #include <ydb/library/yql/minikql/mkql_node.h> #include <library/cpp/json/json_reader.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/yexception.h> diff --git a/ydb/library/yql/minikql/mkql_alloc_ut.cpp b/ydb/library/yql/minikql/mkql_alloc_ut.cpp index 72d8f696af..1bcec71f65 100644 --- a/ydb/library/yql/minikql/mkql_alloc_ut.cpp +++ b/ydb/library/yql/minikql/mkql_alloc_ut.cpp @@ -1,6 +1,6 @@ #include "mkql_alloc.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/mkql_node_builder_ut.cpp b/ydb/library/yql/minikql/mkql_node_builder_ut.cpp index df310d00b9..7f6f02ac6b 100644 --- a/ydb/library/yql/minikql/mkql_node_builder_ut.cpp +++ b/ydb/library/yql/minikql/mkql_node_builder_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/library/yql/public/udf/udf_type_inspection.h> #include "mkql_type_builder.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/mkql_node_cast_ut.cpp b/ydb/library/yql/minikql/mkql_node_cast_ut.cpp index 0ae19fa5e4..340f044b6a 100644 --- a/ydb/library/yql/minikql/mkql_node_cast_ut.cpp +++ b/ydb/library/yql/minikql/mkql_node_cast_ut.cpp @@ -2,7 +2,7 @@ #include "mkql_node_cast.h" #include "mkql_node_builder.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/library/yql/minikql/mkql_node_printer_ut.cpp b/ydb/library/yql/minikql/mkql_node_printer_ut.cpp index ec8c5d1afe..6960b959c7 100644 --- a/ydb/library/yql/minikql/mkql_node_printer_ut.cpp +++ b/ydb/library/yql/minikql/mkql_node_printer_ut.cpp @@ -2,7 +2,7 @@ #include "mkql_node_builder.h" #include "mkql_node_serialization.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/mkql_node_serialization.cpp b/ydb/library/yql/minikql/mkql_node_serialization.cpp index e314f38cd6..6f0fdc43a2 100644 --- a/ydb/library/yql/minikql/mkql_node_serialization.cpp +++ b/ydb/library/yql/minikql/mkql_node_serialization.cpp @@ -5,7 +5,7 @@ #include <ydb/library/yql/minikql/pack_num.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/packedtypes/zigzag.h> #include <util/generic/algorithm.h> diff --git a/ydb/library/yql/minikql/mkql_node_ut.cpp b/ydb/library/yql/minikql/mkql_node_ut.cpp index 1612627246..8122fca87b 100644 --- a/ydb/library/yql/minikql/mkql_node_ut.cpp +++ b/ydb/library/yql/minikql/mkql_node_ut.cpp @@ -1,7 +1,7 @@ #include "mkql_node.h" #include "mkql_node_visitor.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> diff --git a/ydb/library/yql/minikql/mkql_node_visitor.h b/ydb/library/yql/minikql/mkql_node_visitor.h index f5bf76d520..46ea7fb976 100644 --- a/ydb/library/yql/minikql/mkql_node_visitor.h +++ b/ydb/library/yql/minikql/mkql_node_visitor.h @@ -5,7 +5,7 @@ #include <util/generic/hash.h> #include <util/generic/hash_set.h> #include <util/generic/vector.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <functional> namespace NKikimr { diff --git a/ydb/library/yql/minikql/mkql_opt_literal.cpp b/ydb/library/yql/minikql/mkql_opt_literal.cpp index 832a87ea80..232bea13aa 100644 --- a/ydb/library/yql/minikql/mkql_opt_literal.cpp +++ b/ydb/library/yql/minikql/mkql_opt_literal.cpp @@ -5,7 +5,7 @@ #include "mkql_program_builder.h" #include "mkql_node_printer.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <util/generic/singleton.h> diff --git a/ydb/library/yql/minikql/mkql_opt_literal_ut.cpp b/ydb/library/yql/minikql/mkql_opt_literal_ut.cpp index c1c0a5b79d..b32df1c7ab 100644 --- a/ydb/library/yql/minikql/mkql_opt_literal_ut.cpp +++ b/ydb/library/yql/minikql/mkql_opt_literal_ut.cpp @@ -3,7 +3,7 @@ #include "mkql_node_printer.h" #include "mkql_function_registry.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NMiniKQL { diff --git a/ydb/library/yql/minikql/mkql_stats_registry_ut.cpp b/ydb/library/yql/minikql/mkql_stats_registry_ut.cpp index 0504fb2986..bcd13341a5 100644 --- a/ydb/library/yql/minikql/mkql_stats_registry_ut.cpp +++ b/ydb/library/yql/minikql/mkql_stats_registry_ut.cpp @@ -1,6 +1,6 @@ #include "mkql_stats_registry.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NKikimr; diff --git a/ydb/library/yql/minikql/mkql_type_builder.cpp b/ydb/library/yql/minikql/mkql_type_builder.cpp index 4aecb564bf..f9370075ee 100644 --- a/ydb/library/yql/minikql/mkql_type_builder.cpp +++ b/ydb/library/yql/minikql/mkql_type_builder.cpp @@ -4,7 +4,7 @@ #include <ydb/library/yql/public/udf/udf_type_ops.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <ydb/library/yql/minikql/computation/mkql_computation_node_impl.h> // TODO: remove const_casts diff --git a/ydb/library/yql/minikql/mkql_type_ops_ut.cpp b/ydb/library/yql/minikql/mkql_type_ops_ut.cpp index 01828a9a52..00a3bef145 100644 --- a/ydb/library/yql/minikql/mkql_type_ops_ut.cpp +++ b/ydb/library/yql/minikql/mkql_type_ops_ut.cpp @@ -1,7 +1,7 @@ #include "mkql_alloc.h" #include "mkql_type_ops.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/stream/format.h> #include <util/stream/str.h> diff --git a/ydb/library/yql/minikql/pack_num_ut.cpp b/ydb/library/yql/minikql/pack_num_ut.cpp index bfc9c79309..80ba457dec 100644 --- a/ydb/library/yql/minikql/pack_num_ut.cpp +++ b/ydb/library/yql/minikql/pack_num_ut.cpp @@ -1,6 +1,6 @@ #include <ydb/library/yql/minikql/pack_num.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/ylimits.h> diff --git a/ydb/library/yql/providers/common/codec/yql_codec.cpp b/ydb/library/yql/providers/common/codec/yql_codec.cpp index 7587e188fa..a2e9786a57 100644 --- a/ydb/library/yql/providers/common/codec/yql_codec.cpp +++ b/ydb/library/yql/providers/common/codec/yql_codec.cpp @@ -16,7 +16,7 @@ #include <library/cpp/yson/node/node_io.h> #include <library/cpp/yson/writer.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <library/cpp/yson/parser.h> #include <library/cpp/yson/detail.h> diff --git a/ydb/library/yql/providers/common/codec/yql_codec_results.cpp b/ydb/library/yql/providers/common/codec/yql_codec_results.cpp index 96c7d784ca..d3274ae1dd 100644 --- a/ydb/library/yql/providers/common/codec/yql_codec_results.cpp +++ b/ydb/library/yql/providers/common/codec/yql_codec_results.cpp @@ -1,6 +1,6 @@ #include "yql_codec_results.h" -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <ydb/library/yql/utils/utf8.h> diff --git a/ydb/library/yql/providers/common/codec/yql_restricted_yson_ut.cpp b/ydb/library/yql/providers/common/codec/yql_restricted_yson_ut.cpp index aee6715a93..d13757c282 100644 --- a/ydb/library/yql/providers/common/codec/yql_restricted_yson_ut.cpp +++ b/ydb/library/yql/providers/common/codec/yql_restricted_yson_ut.cpp @@ -3,7 +3,7 @@ #include <library/cpp/yson/node/node_io.h> #include <library/cpp/yson/node/node_visitor.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { diff --git a/ydb/library/yql/providers/common/config/ya.make b/ydb/library/yql/providers/common/config/ya.make index 3211a5823b..af36d6b466 100644 --- a/ydb/library/yql/providers/common/config/ya.make +++ b/ydb/library/yql/providers/common/config/ya.make @@ -13,7 +13,7 @@ PEERDIR( ydb/library/yql/core/expr_nodes ydb/library/yql/ast library/cpp/containers/sorted_vector - library/cpp/string_utils/parse_size + library/cpp/string_utils/parse_size library/cpp/string_utils/levenshtein_diff ) diff --git a/ydb/library/yql/providers/common/config/yql_dispatch.h b/ydb/library/yql/providers/common/config/yql_dispatch.h index 7389cbf082..f06f592620 100644 --- a/ydb/library/yql/providers/common/config/yql_dispatch.h +++ b/ydb/library/yql/providers/common/config/yql_dispatch.h @@ -4,7 +4,7 @@ #include <ydb/library/yql/core/yql_expr_type_annotation.h> -#include <library/cpp/string_utils/parse_size/parse_size.h> +#include <library/cpp/string_utils/parse_size/parse_size.h> #include <util/string/cast.h> #include <util/string/join.h> diff --git a/ydb/library/yql/providers/common/gateway/yql_provider_gateway.h b/ydb/library/yql/providers/common/gateway/yql_provider_gateway.h index c4b498e9a1..7b0ed650cb 100644 --- a/ydb/library/yql/providers/common/gateway/yql_provider_gateway.h +++ b/ydb/library/yql/providers/common/gateway/yql_provider_gateway.h @@ -3,7 +3,7 @@ #include <ydb/library/yql/core/issue/yql_issue.h> #include <ydb/library/yql/public/issue/yql_issue_manager.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NYql { namespace NCommon { diff --git a/ydb/library/yql/providers/dq/actors/result_aggregator.cpp b/ydb/library/yql/providers/dq/actors/result_aggregator.cpp index 59ae95c3af..b55cb85dc5 100644 --- a/ydb/library/yql/providers/dq/actors/result_aggregator.cpp +++ b/ydb/library/yql/providers/dq/actors/result_aggregator.cpp @@ -26,7 +26,7 @@ #include <library/cpp/actors/core/executor_pool_basic.h> #include <library/cpp/actors/core/hfunc.h> #include <library/cpp/actors/core/scheduler_basic.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <library/cpp/yson/writer.h> #include <util/generic/ptr.h> diff --git a/ydb/library/yql/providers/dq/service/grpc_service.h b/ydb/library/yql/providers/dq/service/grpc_service.h index fa2a835c8c..4a75f0fc19 100644 --- a/ydb/library/yql/providers/dq/service/grpc_service.h +++ b/ydb/library/yql/providers/dq/service/grpc_service.h @@ -14,7 +14,7 @@ #include <library/cpp/actors/core/event_local.h> #include <library/cpp/actors/core/events.h> #include <library/cpp/monlib/dynamic_counters/counters.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include "grpc_session.h" diff --git a/ydb/library/yql/providers/dq/service/ya.make b/ydb/library/yql/providers/dq/service/ya.make index 7af208b9cd..211b389272 100644 --- a/ydb/library/yql/providers/dq/service/ya.make +++ b/ydb/library/yql/providers/dq/service/ya.make @@ -17,7 +17,7 @@ PEERDIR( library/cpp/grpc/server library/cpp/grpc/server/actors library/cpp/svnversion - library/cpp/threading/future + library/cpp/threading/future ydb/library/yql/sql ydb/public/api/protos ydb/library/yql/providers/common/metrics diff --git a/ydb/library/yql/providers/pq/async_io/ut/ut_helpers.cpp b/ydb/library/yql/providers/pq/async_io/ut/ut_helpers.cpp index 6fcae4e0a7..4501e1c113 100644 --- a/ydb/library/yql/providers/pq/async_io/ut/ut_helpers.cpp +++ b/ydb/library/yql/providers/pq/async_io/ut/ut_helpers.cpp @@ -52,7 +52,7 @@ void TPqIoTestFixture::InitSource( partitioninigParams->SetDqPartitionsCount(1); TString serializedParams; - Y_PROTOBUF_SUPPRESS_NODISCARD params.SerializeToString(&serializedParams); + Y_PROTOBUF_SUPPRESS_NODISCARD params.SerializeToString(&serializedParams); const THashMap<TString, TString> secureParams; const THashMap<TString, TString> taskParams { {"pq", serializedParams} }; diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_gateway.h b/ydb/library/yql/providers/solomon/provider/yql_solomon_gateway.h index 574bf79235..392f47730d 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_gateway.h +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_gateway.h @@ -3,7 +3,7 @@ #include <ydb/library/yql/providers/common/gateway/yql_provider_gateway.h> #include <ydb/library/yql/providers/common/proto/gateways_config.pb.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NYql { diff --git a/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp b/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp index 9c263c2b0b..a545621ac6 100644 --- a/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp +++ b/ydb/library/yql/public/decimal/ut/yql_decimal_ut.cpp @@ -1,7 +1,7 @@ #include <ydb/library/yql/public/decimal/yql_decimal.h> #include <ydb/library/yql/public/decimal/yql_decimal_serialize.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { namespace NDecimal { diff --git a/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp b/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp index 29ec766caf..517441be9d 100644 --- a/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp +++ b/ydb/library/yql/public/decimal/ut/yql_wide_int_ut.cpp @@ -1,5 +1,5 @@ #include <ydb/library/yql/public/decimal/yql_wide_int.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { Y_UNIT_TEST_SUITE(TYqlWideIntTest) { diff --git a/ydb/library/yql/public/issue/yql_issue_manager_ut.cpp b/ydb/library/yql/public/issue/yql_issue_manager_ut.cpp index 287f63fedd..4f283dc606 100644 --- a/ydb/library/yql/public/issue/yql_issue_manager_ut.cpp +++ b/ydb/library/yql/public/issue/yql_issue_manager_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "yql_issue_manager.h" diff --git a/ydb/library/yql/public/issue/yql_issue_message.cpp b/ydb/library/yql/public/issue/yql_issue_message.cpp index f9d512ca5a..8b1d2c5a58 100644 --- a/ydb/library/yql/public/issue/yql_issue_message.cpp +++ b/ydb/library/yql/public/issue/yql_issue_message.cpp @@ -125,7 +125,7 @@ TString IssueToBinaryMessage(const TIssue& issue) { TString result; Ydb::Issue::IssueMessage protobuf; IssueToMessage(issue, &protobuf); - Y_PROTOBUF_SUPPRESS_NODISCARD protobuf.SerializeToString(&result); + Y_PROTOBUF_SUPPRESS_NODISCARD protobuf.SerializeToString(&result); return result; } diff --git a/ydb/library/yql/public/issue/yql_issue_ut.cpp b/ydb/library/yql/public/issue/yql_issue_ut.cpp index 87b417da39..83541f6ee8 100644 --- a/ydb/library/yql/public/issue/yql_issue_ut.cpp +++ b/ydb/library/yql/public/issue/yql_issue_ut.cpp @@ -1,6 +1,6 @@ #include "yql_issue.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/yql/public/issue/protos/issue_message.pb.h> #include <ydb/library/yql/public/issue/yql_issue_message.h> #include <ydb/public/api/protos/ydb_issue_message.pb.h> diff --git a/ydb/library/yql/public/issue/yql_warning_ut.cpp b/ydb/library/yql/public/issue/yql_warning_ut.cpp index 5edf7ed363..acbf627625 100644 --- a/ydb/library/yql/public/issue/yql_warning_ut.cpp +++ b/ydb/library/yql/public/issue/yql_warning_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include "yql_warning.h" diff --git a/ydb/library/yql/public/udf/tz/udf_tz_ut.cpp b/ydb/library/yql/public/udf/tz/udf_tz_ut.cpp index 5853398c75..ff9df8131f 100644 --- a/ydb/library/yql/public/udf/tz/udf_tz_ut.cpp +++ b/ydb/library/yql/public/udf/tz/udf_tz_ut.cpp @@ -1,6 +1,6 @@ #include "udf_tz.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql::NUdf; diff --git a/ydb/library/yql/public/udf/udf_counter_ut.cpp b/ydb/library/yql/public/udf/udf_counter_ut.cpp index 22fd91d5f5..3f1f6fca8c 100644 --- a/ydb/library/yql/public/udf/udf_counter_ut.cpp +++ b/ydb/library/yql/public/udf/udf_counter_ut.cpp @@ -1,6 +1,6 @@ #include "udf_counter.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql::NUdf; diff --git a/ydb/library/yql/public/udf/udf_type_inspection.h b/ydb/library/yql/public/udf/udf_type_inspection.h index f11ea0ff07..082e5cfa20 100644 --- a/ydb/library/yql/public/udf/udf_type_inspection.h +++ b/ydb/library/yql/public/udf/udf_type_inspection.h @@ -3,7 +3,7 @@ #include "udf_string_ref.h" #include "udf_types.h" -#include <library/cpp/containers/stack_vector/stack_vec.h> // TSmallVec +#include <library/cpp/containers/stack_vector/stack_vec.h> // TSmallVec #include <util/generic/algorithm.h> #include <util/system/yassert.h> // FAIL, VERIFY_DEBUG diff --git a/ydb/library/yql/public/udf/udf_value_builder_ut.cpp b/ydb/library/yql/public/udf/udf_value_builder_ut.cpp index 1b55e94822..3619fe0818 100644 --- a/ydb/library/yql/public/udf/udf_value_builder_ut.cpp +++ b/ydb/library/yql/public/udf/udf_value_builder_ut.cpp @@ -1,7 +1,7 @@ #include "udf_value_builder.h" #include "udf_ut_helpers.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql::NUdf; diff --git a/ydb/library/yql/public/udf/udf_value_ut.cpp b/ydb/library/yql/public/udf/udf_value_ut.cpp index 8d9708c7b1..585c60f908 100644 --- a/ydb/library/yql/public/udf/udf_value_ut.cpp +++ b/ydb/library/yql/public/udf/udf_value_ut.cpp @@ -2,7 +2,7 @@ #include "udf_ut_helpers.h" #include <ydb/library/yql/minikql/mkql_alloc.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql::NUdf; diff --git a/ydb/library/yql/sql/v0/node.cpp b/ydb/library/yql/sql/v0/node.cpp index 57f0c6a561..7051b66ae1 100644 --- a/ydb/library/yql/sql/v0/node.cpp +++ b/ydb/library/yql/sql/v0/node.cpp @@ -6,7 +6,7 @@ #include <ydb/library/yql/minikql/mkql_type_ops.h> #include <ydb/library/yql/utils/yql_panic.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/charset/ci_string.h> #include <util/generic/hash_set.h> #include <util/stream/str.h> diff --git a/ydb/library/yql/sql/v0/sql_ut.cpp b/ydb/library/yql/sql/v0/sql_ut.cpp index 3a70aef93c..0986b76fae 100644 --- a/ydb/library/yql/sql/v0/sql_ut.cpp +++ b/ydb/library/yql/sql/v0/sql_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/library/yql/providers/common/provider/yql_provider_names.h> #include <util/generic/map.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/split.h> diff --git a/ydb/library/yql/sql/v1/node.cpp b/ydb/library/yql/sql/v1/node.cpp index 870bbd9cc7..307581a519 100644 --- a/ydb/library/yql/sql/v1/node.cpp +++ b/ydb/library/yql/sql/v1/node.cpp @@ -7,7 +7,7 @@ #include <ydb/library/yql/minikql/mkql_type_ops.h> #include <ydb/library/yql/utils/yql_panic.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <library/cpp/charset/ci_string.h> #include <util/generic/hash_set.h> #include <util/stream/str.h> diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp index 85b6e0dfcd..1530a76456 100644 --- a/ydb/library/yql/sql/v1/sql_ut.cpp +++ b/ydb/library/yql/sql/v1/sql_ut.cpp @@ -3,7 +3,7 @@ #include <ydb/library/yql/sql/sql.h> #include <util/generic/map.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/split.h> diff --git a/ydb/library/yql/udfs/common/histogram/histogram_udf.cpp b/ydb/library/yql/udfs/common/histogram/histogram_udf.cpp index 3cbf685cc1..dd4b00a807 100644 --- a/ydb/library/yql/udfs/common/histogram/histogram_udf.cpp +++ b/ydb/library/yql/udfs/common/histogram/histogram_udf.cpp @@ -236,7 +236,7 @@ namespace { THistogram proto; TString result; static_cast<THistogramResource*>(args[0].AsBoxed().Get())->Get()->ToProto(proto); - Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&result); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.SerializeToString(&result); return valueBuilder->NewString(result); } catch (const std::exception& e) { UdfTerminate((TStringBuilder() << Pos_ << " " << e.what()).data()); @@ -287,7 +287,7 @@ namespace { try { Y_UNUSED(valueBuilder); THistogram proto; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromString(TString(args[0].AsStringRef())); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromString(TString(args[0].AsStringRef())); THolder<THistogramResource> histogram(new THistogramResource(args[1].Get<ui32>())); histogram->Get()->FromProto(proto); return TUnboxedValuePod(histogram.Release()); @@ -511,7 +511,7 @@ namespace { try { Y_UNUSED(valueBuilder); THistogram proto; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromString(TString(args[0].AsStringRef())); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromString(TString(args[0].AsStringRef())); THolder<THistogramResource> histogram( new THistogramResource(args[1].Get<double>(), args[2].Get<double>(), args[3].Get<double>())); histogram->Get()->FromProto(proto); @@ -581,7 +581,7 @@ namespace { try { Y_UNUSED(valueBuilder); THistogram proto; - Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromString(TString(args[0].AsStringRef())); + Y_PROTOBUF_SUPPRESS_NODISCARD proto.ParseFromString(TString(args[0].AsStringRef())); THolder<THistogramResource> histogram( new THistogramResource(args[1].Get<double>(), args[2].Get<double>(), args[3].Get<double>())); histogram->Get()->FromProto(proto); diff --git a/ydb/library/yql/udfs/common/math/lib/round_ut.cpp b/ydb/library/yql/udfs/common/math/lib/round_ut.cpp index 81ded7d28c..357ef72541 100644 --- a/ydb/library/yql/udfs/common/math/lib/round_ut.cpp +++ b/ydb/library/yql/udfs/common/math/lib/round_ut.cpp @@ -1,6 +1,6 @@ #include "round.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/hex.h> diff --git a/ydb/library/yql/udfs/common/stat/stat_udf_ut.cpp b/ydb/library/yql/udfs/common/stat/stat_udf_ut.cpp index d6da83539e..b3bd7e2339 100644 --- a/ydb/library/yql/udfs/common/stat/stat_udf_ut.cpp +++ b/ydb/library/yql/udfs/common/stat/stat_udf_ut.cpp @@ -1,4 +1,4 @@ -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/yql/minikql/mkql_function_registry.h> #include <ydb/library/yql/minikql/mkql_program_builder.h> #include <ydb/library/yql/minikql/computation/mkql_computation_node.h> diff --git a/ydb/library/yql/udfs/common/string/string_udf.cpp b/ydb/library/yql/udfs/common/string/string_udf.cpp index c468215090..9df1d59041 100644 --- a/ydb/library/yql/udfs/common/string/string_udf.cpp +++ b/ydb/library/yql/udfs/common/string/string_udf.cpp @@ -5,7 +5,7 @@ #include <library/cpp/charset/codepage.h> #include <library/cpp/deprecated/split/split_iterator.h> #include <library/cpp/html/pcdata/pcdata.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <library/cpp/string_utils/levenshtein_diff/levenshtein_diff.h> #include <library/cpp/string_utils/quote/quote.h> diff --git a/ydb/library/yql/udfs/common/string/ya.make b/ydb/library/yql/udfs/common/string/ya.make index ca6da4e586..86ee889d50 100644 --- a/ydb/library/yql/udfs/common/string/ya.make +++ b/ydb/library/yql/udfs/common/string/ya.make @@ -16,9 +16,9 @@ PEERDIR( library/cpp/charset library/cpp/deprecated/split library/cpp/html/pcdata - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 library/cpp/string_utils/levenshtein_diff - library/cpp/string_utils/quote + library/cpp/string_utils/quote ) TIMEOUT(300) diff --git a/ydb/library/yql/udfs/common/top/top_udf.cpp b/ydb/library/yql/udfs/common/top/top_udf.cpp index 748ffe489b..6a6ea04fb4 100644 --- a/ydb/library/yql/udfs/common/top/top_udf.cpp +++ b/ydb/library/yql/udfs/common/top/top_udf.cpp @@ -1,7 +1,7 @@ #include <ydb/library/yql/public/udf/udf_helpers.h> #include <ydb/library/yql/public/udf/udf_type_ops.h> -#include <library/cpp/containers/top_keeper/top_keeper.h> +#include <library/cpp/containers/top_keeper/top_keeper.h> #include <util/generic/set.h> diff --git a/ydb/library/yql/udfs/common/top/ya.make b/ydb/library/yql/udfs/common/top/ya.make index e99fe77c36..ac0ceca64a 100644 --- a/ydb/library/yql/udfs/common/top/ya.make +++ b/ydb/library/yql/udfs/common/top/ya.make @@ -13,7 +13,7 @@ SRCS( ) PEERDIR( - library/cpp/containers/top_keeper + library/cpp/containers/top_keeper ) END() diff --git a/ydb/library/yql/udfs/common/topfreq/topfreq_udf_ut.cpp b/ydb/library/yql/udfs/common/topfreq/topfreq_udf_ut.cpp index c6f6ecab72..9310754d1c 100644 --- a/ydb/library/yql/udfs/common/topfreq/topfreq_udf_ut.cpp +++ b/ydb/library/yql/udfs/common/topfreq/topfreq_udf_ut.cpp @@ -1,5 +1,5 @@ #include <util/random/shuffle.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/library/yql/minikql/mkql_function_registry.h> #include <ydb/library/yql/minikql/mkql_program_builder.h> #include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h> diff --git a/ydb/library/yql/utils/fp_bits_ut.cpp b/ydb/library/yql/utils/fp_bits_ut.cpp index c93e848a66..4fbd4f27a5 100644 --- a/ydb/library/yql/utils/fp_bits_ut.cpp +++ b/ydb/library/yql/utils/fp_bits_ut.cpp @@ -1,5 +1,5 @@ #include "fp_bits.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/system/valgrind.h> diff --git a/ydb/library/yql/utils/future_action.h b/ydb/library/yql/utils/future_action.h index d4a8dd69aa..a52a169e33 100644 --- a/ydb/library/yql/utils/future_action.h +++ b/ydb/library/yql/utils/future_action.h @@ -1,6 +1,6 @@ #pragma once -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> namespace NYql { /* diff --git a/ydb/library/yql/utils/log/log_ut.cpp b/ydb/library/yql/utils/log/log_ut.cpp index bf8b71476c..0114488507 100644 --- a/ydb/library/yql/utils/log/log_ut.cpp +++ b/ydb/library/yql/utils/log/log_ut.cpp @@ -3,7 +3,7 @@ #include "profile.h" #include <ydb/library/yql/utils/log/ut/log_parser.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/logger/stream.h> #include <util/datetime/base.h> diff --git a/ydb/library/yql/utils/log/tls_backend_ut.cpp b/ydb/library/yql/utils/log/tls_backend_ut.cpp index 6f4147fed6..6257ab7d95 100644 --- a/ydb/library/yql/utils/log/tls_backend_ut.cpp +++ b/ydb/library/yql/utils/log/tls_backend_ut.cpp @@ -2,7 +2,7 @@ #include "log.h" #include <ydb/library/yql/utils/log/ut/log_parser.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/logger/stream.h> #include <library/cpp/logger/null.h> diff --git a/ydb/library/yql/utils/log/ut/log_parser.h b/ydb/library/yql/utils/log/ut/log_parser.h index 98d796f007..25e90bc34c 100644 --- a/ydb/library/yql/utils/log/ut/log_parser.h +++ b/ydb/library/yql/utils/log/ut/log_parser.h @@ -2,7 +2,7 @@ #include <ydb/library/yql/utils/log/log.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/datetime/base.h> diff --git a/ydb/library/yql/utils/md5_stream_ut.cpp b/ydb/library/yql/utils/md5_stream_ut.cpp index 1d04c632d4..8342551d41 100644 --- a/ydb/library/yql/utils/md5_stream_ut.cpp +++ b/ydb/library/yql/utils/md5_stream_ut.cpp @@ -1,7 +1,7 @@ #include "md5_stream.h" #include <util/stream/input.h> #include <util/stream/str.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/utils/multi_resource_lock_ut.cpp b/ydb/library/yql/utils/multi_resource_lock_ut.cpp index 0af9cea3ff..1a5618db68 100644 --- a/ydb/library/yql/utils/multi_resource_lock_ut.cpp +++ b/ydb/library/yql/utils/multi_resource_lock_ut.cpp @@ -1,7 +1,7 @@ #include "multi_resource_lock.h" #include <util/generic/xrange.h> -#include <library/cpp/threading/future/async.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/threading/future/async.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { using namespace NThreading; diff --git a/ydb/library/yql/utils/parse_double_ut.cpp b/ydb/library/yql/utils/parse_double_ut.cpp index 6f9cdea2f1..11a3fff690 100644 --- a/ydb/library/yql/utils/parse_double_ut.cpp +++ b/ydb/library/yql/utils/parse_double_ut.cpp @@ -1,5 +1,5 @@ #include "parse_double.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> namespace NYql { diff --git a/ydb/library/yql/utils/range_walker_ut.cpp b/ydb/library/yql/utils/range_walker_ut.cpp index d6a86cc804..80b18312f5 100644 --- a/ydb/library/yql/utils/range_walker_ut.cpp +++ b/ydb/library/yql/utils/range_walker_ut.cpp @@ -1,6 +1,6 @@ #include "range_walker.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/utils/retry_ut.cpp b/ydb/library/yql/utils/retry_ut.cpp index 47cb35fd73..8c57eb2a05 100644 --- a/ydb/library/yql/utils/retry_ut.cpp +++ b/ydb/library/yql/utils/retry_ut.cpp @@ -1,6 +1,6 @@ #include "retry.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYql; diff --git a/ydb/library/yql/utils/utf8_ut.cpp b/ydb/library/yql/utils/utf8_ut.cpp index 7479acd7a1..1d51ed9c67 100644 --- a/ydb/library/yql/utils/utf8_ut.cpp +++ b/ydb/library/yql/utils/utf8_ut.cpp @@ -1,6 +1,6 @@ #include "utf8.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> Y_UNIT_TEST_SUITE(TUtf8Tests) { Y_UNIT_TEST(Simple) { diff --git a/ydb/library/yql/utils/ya.make b/ydb/library/yql/utils/ya.make index afba70be53..f24b4eea38 100644 --- a/ydb/library/yql/utils/ya.make +++ b/ydb/library/yql/utils/ya.make @@ -39,7 +39,7 @@ SRCS( PEERDIR( library/cpp/digest/md5 - library/cpp/threading/future + library/cpp/threading/future library/cpp/messagebus ) diff --git a/ydb/public/lib/deprecated/client/grpc_client.cpp b/ydb/public/lib/deprecated/client/grpc_client.cpp index dbf808ef75..be4d74190a 100644 --- a/ydb/public/lib/deprecated/client/grpc_client.cpp +++ b/ydb/public/lib/deprecated/client/grpc_client.cpp @@ -262,7 +262,7 @@ namespace NKikimr { THolder<IStreamRequestReadProcessor> processor(static_cast<IStreamRequestReadProcessor*>(tag)); if (ok) { processor->InvokeProcess(); - Y_UNUSED(processor.Release()); // keep processor alive + Y_UNUSED(processor.Release()); // keep processor alive finished = false; } else { processor->InvokeFinish(); @@ -290,7 +290,7 @@ namespace NKikimr { void Start(THolder<IProcessorBase> &&processor) { processor->Start(); - Y_UNUSED(processor.Release()); + Y_UNUSED(processor.Release()); ++InFlight; } }; diff --git a/ydb/public/lib/deprecated/client/msgbus_client.cpp b/ydb/public/lib/deprecated/client/msgbus_client.cpp index 4d5f2427eb..70f6765339 100644 --- a/ydb/public/lib/deprecated/client/msgbus_client.cpp +++ b/ydb/public/lib/deprecated/client/msgbus_client.cpp @@ -55,7 +55,7 @@ struct TSyncMessageCookie : public TMessageCookie { } virtual void Signal(TAutoPtr<NBus::TBusMessage>& msg, NBus::EMessageStatus errorStatus, TAutoPtr<NBus::TBusMessage> reply) { - Y_UNUSED(msg.Release()); + Y_UNUSED(msg.Release()); ErrorStatus = errorStatus; Reply = reply; Ev.Signal(); @@ -158,8 +158,8 @@ NBus::EMessageStatus TMsgBusClient::AsyncCall(TAutoPtr<NBus::TBusMessage> msg, T if (status == NBus::MESSAGE_OK) { // would be destructed in onresult/onerror - Y_UNUSED(cookie.Release()); - Y_UNUSED(msg.Release()); + Y_UNUSED(cookie.Release()); + Y_UNUSED(msg.Release()); } return status; @@ -178,8 +178,8 @@ NBus::EMessageStatus TMsgBusClient::AsyncCall(TAutoPtr<NBus::TBusMessage> msg, T if (status == NBus::MESSAGE_OK) { // would be destructed in onresult/onerror - Y_UNUSED(cookie.Release()); - Y_UNUSED(msg.Release()); + Y_UNUSED(cookie.Release()); + Y_UNUSED(msg.Release()); } return status; diff --git a/ydb/public/lib/deprecated/client/msgbus_client_config.h b/ydb/public/lib/deprecated/client/msgbus_client_config.h index 816efff967..607bcb4a7c 100644 --- a/ydb/public/lib/deprecated/client/msgbus_client_config.h +++ b/ydb/public/lib/deprecated/client/msgbus_client_config.h @@ -2,7 +2,7 @@ #include <library/cpp/messagebus/queue_config.h> #include <library/cpp/messagebus/session_config.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> namespace NKikimr { namespace NMsgBusProxy { diff --git a/ydb/public/lib/deprecated/kicli/cpp_ut.cpp b/ydb/public/lib/deprecated/kicli/cpp_ut.cpp index cb7dc3ed6d..b1a69c3920 100644 --- a/ydb/public/lib/deprecated/kicli/cpp_ut.cpp +++ b/ydb/public/lib/deprecated/kicli/cpp_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <ydb/core/testlib/test_client.h> #include <ydb/core/tx/datashard/datashard_failpoints.h> diff --git a/ydb/public/lib/deprecated/kicli/kicli.h b/ydb/public/lib/deprecated/kicli/kicli.h index 9dc472d231..ae32891087 100644 --- a/ydb/public/lib/deprecated/kicli/kicli.h +++ b/ydb/public/lib/deprecated/kicli/kicli.h @@ -12,7 +12,7 @@ #include <library/cpp/actors/core/interconnect.h> #include <library/cpp/messagebus/message_status.h> #include <library/cpp/messagebus/message.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/queue.h> #include <util/system/mutex.h> diff --git a/ydb/public/lib/deprecated/kicli/result.cpp b/ydb/public/lib/deprecated/kicli/result.cpp index 0f86ba4340..a4fd48f2c5 100644 --- a/ydb/public/lib/deprecated/kicli/result.cpp +++ b/ydb/public/lib/deprecated/kicli/result.cpp @@ -94,7 +94,7 @@ const YdbOld::ResultSet &TReadTableResult::GetResultSet() const { if (!Parsed) { const NKikimrClient::TResponse& response = GetResult<NKikimrClient::TResponse>(); const auto& result = response.GetSerializedReadTableResponse(); - Y_PROTOBUF_SUPPRESS_NODISCARD Result.ParseFromArray(result.data(), result.size()); + Y_PROTOBUF_SUPPRESS_NODISCARD Result.ParseFromArray(result.data(), result.size()); } return Result; } diff --git a/ydb/public/lib/deprecated/kicli/ya.make b/ydb/public/lib/deprecated/kicli/ya.make index d9aa54bc4c..9e5bc696d5 100644 --- a/ydb/public/lib/deprecated/kicli/ya.make +++ b/ydb/public/lib/deprecated/kicli/ya.make @@ -22,7 +22,7 @@ SRCS( PEERDIR( contrib/libs/grpc library/cpp/actors/core - library/cpp/threading/future + library/cpp/threading/future ydb/core/protos ydb/library/aclib ydb/public/api/grpc diff --git a/ydb/public/lib/idx_test/idx_test_data_provider.cpp b/ydb/public/lib/idx_test/idx_test_data_provider.cpp index 0006551f29..aac5739c85 100644 --- a/ydb/public/lib/idx_test/idx_test_data_provider.cpp +++ b/ydb/public/lib/idx_test/idx_test_data_provider.cpp @@ -2,7 +2,7 @@ #include "idx_test_common.h" #include "idx_test_data_provider.h" -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/string/builder.h> diff --git a/ydb/public/lib/idx_test/idx_test_upload.cpp b/ydb/public/lib/idx_test/idx_test_upload.cpp index 7c7252e34d..0ef2cf0e50 100644 --- a/ydb/public/lib/idx_test/idx_test_upload.cpp +++ b/ydb/public/lib/idx_test/idx_test_upload.cpp @@ -4,7 +4,7 @@ #include <util/string/printf.h> #include <util/system/mutex.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <ydb/public/lib/yson_value/ydb_yson_value.h> diff --git a/ydb/public/lib/idx_test/ut/idx_test_data_provider_ut.cpp b/ydb/public/lib/idx_test/ut/idx_test_data_provider_ut.cpp index 2ffe6d636e..0a46ba4090 100644 --- a/ydb/public/lib/idx_test/ut/idx_test_data_provider_ut.cpp +++ b/ydb/public/lib/idx_test/ut/idx_test_data_provider_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <ydb/public/lib/idx_test/idx_test_data_provider.h> diff --git a/ydb/public/lib/idx_test/ya.make b/ydb/public/lib/idx_test/ya.make index 6593eee071..0ae0e3f244 100644 --- a/ydb/public/lib/idx_test/ya.make +++ b/ydb/public/lib/idx_test/ya.make @@ -12,7 +12,7 @@ SRCS( ) PEERDIR( - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ydb/public/sdk/cpp/client/ydb_table ) diff --git a/ydb/public/lib/json_value/ut/ya.make b/ydb/public/lib/json_value/ut/ya.make index d1c93eecf5..8f1d8464c1 100644 --- a/ydb/public/lib/json_value/ut/ya.make +++ b/ydb/public/lib/json_value/ut/ya.make @@ -17,7 +17,7 @@ SRCS( PEERDIR( library/cpp/json - library/cpp/testing/unittest + library/cpp/testing/unittest ydb/public/sdk/cpp/client/ydb_proto ) diff --git a/ydb/public/lib/json_value/ydb_json_value_ut.cpp b/ydb/public/lib/json_value/ydb_json_value_ut.cpp index d8c1356338..7ee4ecab87 100644 --- a/ydb/public/lib/json_value/ydb_json_value_ut.cpp +++ b/ydb/public/lib/json_value/ydb_json_value_ut.cpp @@ -1,7 +1,7 @@ #include "ydb_json_value.h" -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/public/sdk/cpp/client/ydb_types/exceptions/exceptions.h> #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h> #include <library/cpp/json/json_reader.h> diff --git a/ydb/public/lib/operation_id/operation_id.cpp b/ydb/public/lib/operation_id/operation_id.cpp index 725da690f4..047fcba6f4 100644 --- a/ydb/public/lib/operation_id/operation_id.cpp +++ b/ydb/public/lib/operation_id/operation_id.cpp @@ -2,7 +2,7 @@ #include <google/protobuf/message.h> -#include <library/cpp/cgiparam/cgiparam.h> +#include <library/cpp/cgiparam/cgiparam.h> #include <library/cpp/uri/uri.h> #include <util/generic/yexception.h> diff --git a/ydb/public/lib/operation_id/operation_id_ut.cpp b/ydb/public/lib/operation_id/operation_id_ut.cpp index 64fbedce4b..7bed99965a 100644 --- a/ydb/public/lib/operation_id/operation_id_ut.cpp +++ b/ydb/public/lib/operation_id/operation_id_ut.cpp @@ -1,7 +1,7 @@ #include "operation_id.h" -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { namespace NOperationId { diff --git a/ydb/public/lib/operation_id/ut/ya.make b/ydb/public/lib/operation_id/ut/ya.make index bff26b3e09..c2d7bb16f7 100644 --- a/ydb/public/lib/operation_id/ut/ya.make +++ b/ydb/public/lib/operation_id/ut/ya.make @@ -16,7 +16,7 @@ SRCS( ) PEERDIR( - library/cpp/testing/unittest + library/cpp/testing/unittest ) END() diff --git a/ydb/public/lib/operation_id/ya.make b/ydb/public/lib/operation_id/ya.make index d8a249f59a..a701741104 100644 --- a/ydb/public/lib/operation_id/ya.make +++ b/ydb/public/lib/operation_id/ya.make @@ -11,7 +11,7 @@ SRCS( PEERDIR( contrib/libs/protobuf - library/cpp/cgiparam + library/cpp/cgiparam library/cpp/uri ydb/public/lib/operation_id/protos ) diff --git a/ydb/public/lib/value/value.cpp b/ydb/public/lib/value/value.cpp index 0ed8b82689..492c65a53e 100644 --- a/ydb/public/lib/value/value.cpp +++ b/ydb/public/lib/value/value.cpp @@ -2,7 +2,7 @@ #include <ydb/library/yql/public/decimal/yql_decimal.h> -#include <library/cpp/string_utils/base64/base64.h> +#include <library/cpp/string_utils/base64/base64.h> #include <util/charset/utf8.h> #include <util/string/cast.h> diff --git a/ydb/public/lib/value/ya.make b/ydb/public/lib/value/ya.make index 36a3851ddf..6fdb3fbd10 100644 --- a/ydb/public/lib/value/ya.make +++ b/ydb/public/lib/value/ya.make @@ -8,7 +8,7 @@ SRCS( PEERDIR( contrib/libs/protobuf - library/cpp/string_utils/base64 + library/cpp/string_utils/base64 ydb/core/protos ydb/library/mkql_proto/protos ydb/public/lib/scheme_types diff --git a/ydb/public/lib/ydb_cli/common/command.h b/ydb/public/lib/ydb_cli/common/command.h index 441206cdf7..e7d4dd4cb0 100644 --- a/ydb/public/lib/ydb_cli/common/command.h +++ b/ydb/public/lib/ydb_cli/common/command.h @@ -4,7 +4,7 @@ #include <ydb/public/sdk/cpp/client/ydb_types/credentials/credentials.h> -#include <library/cpp/getopt/last_getopt.h> +#include <library/cpp/getopt/last_getopt.h> #include <library/cpp/colorizer/colors.h> #include <util/generic/strbuf.h> #include <util/generic/vector.h> diff --git a/ydb/public/lib/ydb_cli/common/normalize_path_ut.cpp b/ydb/public/lib/ydb_cli/common/normalize_path_ut.cpp index aae7cd7301..8c3495dcd3 100644 --- a/ydb/public/lib/ydb_cli/common/normalize_path_ut.cpp +++ b/ydb/public/lib/ydb_cli/common/normalize_path_ut.cpp @@ -1,5 +1,5 @@ #include "normalize_path.h" -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> using namespace NYdb::NConsoleClient; diff --git a/ydb/public/lib/ydb_cli/common/ya.make b/ydb/public/lib/ydb_cli/common/ya.make index 35523bfb4c..5fb94e1cae 100644 --- a/ydb/public/lib/ydb_cli/common/ya.make +++ b/ydb/public/lib/ydb_cli/common/ya.make @@ -24,7 +24,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/json/writer library/cpp/yaml/as ydb/public/lib/json_value diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/discovery_mutator_ut.cpp b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/discovery_mutator_ut.cpp index 7a5fa43cc3..74edff02f6 100644 --- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/discovery_mutator_ut.cpp +++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/discovery_mutator_ut.cpp @@ -3,8 +3,8 @@ #include <ydb/public/sdk/cpp/client/ydb_extension/extension.h> #include <ydb/public/sdk/cpp/client/ydb_table/table.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> using namespace NYdb; using namespace NDiscoveryMutator; diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints.cpp b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints.cpp index b6d03cc50a..996020f3c4 100644 --- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints.cpp +++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints.cpp @@ -1,7 +1,7 @@ #include "endpoints.h" #include <library/cpp/monlib/metrics/metric_registry.h> -#include <library/cpp/string_utils/quote/quote.h> +#include <library/cpp/string_utils/quote/quote.h> #include <util/random/random.h> diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints_ut.cpp b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints_ut.cpp index 7823fb6460..6213052ef7 100644 --- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints_ut.cpp +++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints_ut.cpp @@ -1,7 +1,7 @@ #include <ydb/public/sdk/cpp/client/impl/ydb_endpoints/endpoints.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <library/cpp/threading/future/core/future.h> #include <util/system/thread.h> diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/coordination_ut.cpp b/ydb/public/sdk/cpp/client/ydb_coordination/coordination_ut.cpp index 3c6fb7d678..2ad6139d03 100644 --- a/ydb/public/sdk/cpp/client/ydb_coordination/coordination_ut.cpp +++ b/ydb/public/sdk/cpp/client/ydb_coordination/coordination_ut.cpp @@ -7,8 +7,8 @@ #include <grpcpp/server_builder.h> #include <grpcpp/server_context.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> using namespace NYdb; using namespace NYdb::NCoordination; diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h index 250ce03620..7ece1565ec 100644 --- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h +++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h @@ -4,8 +4,8 @@ #include <library/cpp/grpc/server/grpc_server.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/system/tempfile.h> diff --git a/ydb/public/sdk/cpp/client/ydb_table/impl/client_session.h b/ydb/public/sdk/cpp/client/ydb_table/impl/client_session.h index 1c33edc333..12a725acef 100644 --- a/ydb/public/sdk/cpp/client/ydb_table/impl/client_session.h +++ b/ydb/public/sdk/cpp/client/ydb_table/impl/client_session.h @@ -5,7 +5,7 @@ #include <ydb/public/api/protos/ydb_table.pb.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <util/datetime/base.h> diff --git a/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator.h b/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator.h index 81b89392be..ffa5d010eb 100644 --- a/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator.h +++ b/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator.h @@ -4,7 +4,7 @@ #include <ydb/public/sdk/cpp/client/ydb_table/table.h> -#include <library/cpp/threading/future/future.h> +#include <library/cpp/threading/future/future.h> #include <util/generic/string.h> diff --git a/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator_ut.cpp b/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator_ut.cpp index 714890a324..3f81583886 100644 --- a/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator_ut.cpp +++ b/ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/system/thread.h> #include <util/thread/pool.h> diff --git a/ydb/public/sdk/cpp/client/ydb_table/table.cpp b/ydb/public/sdk/cpp/client/ydb_table/table.cpp index 610fec3884..ee3b839ee4 100644 --- a/ydb/public/sdk/cpp/client/ydb_table/table.cpp +++ b/ydb/public/sdk/cpp/client/ydb_table/table.cpp @@ -15,7 +15,7 @@ #include <ydb/public/sdk/cpp/client/ydb_table/impl/data_query.h> #include <ydb/public/sdk/cpp/client/ydb_table/impl/request_migrator.h> -#include <library/cpp/cache/cache.h> +#include <library/cpp/cache/cache.h> #include <util/generic/map.h> #include <util/random/random.h> diff --git a/ydb/public/sdk/cpp/client/ydb_value/value.cpp b/ydb/public/sdk/cpp/client/ydb_value/value.cpp index 8c18d4d50f..12cf7c344c 100644 --- a/ydb/public/sdk/cpp/client/ydb_value/value.cpp +++ b/ydb/public/sdk/cpp/client/ydb_value/value.cpp @@ -10,7 +10,7 @@ #include <ydb/public/api/protos/ydb_value.pb.h> -#include <library/cpp/containers/stack_vector/stack_vec.h> +#include <library/cpp/containers/stack_vector/stack_vec.h> #include <ydb/library/yql/public/decimal/yql_decimal.h> diff --git a/ydb/services/cms/cms_ut.cpp b/ydb/services/cms/cms_ut.cpp index 7d5234715e..73a04a4756 100644 --- a/ydb/services/cms/cms_ut.cpp +++ b/ydb/services/cms/cms_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> diff --git a/ydb/services/cms/ut/ya.make b/ydb/services/cms/ut/ya.make index 646ff009e9..15abe25dfe 100644 --- a/ydb/services/cms/ut/ya.make +++ b/ydb/services/cms/ut/ya.make @@ -13,7 +13,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/grpc/client library/cpp/regex/pcre library/cpp/svnversion diff --git a/ydb/services/datastreams/datastreams_ut.cpp b/ydb/services/datastreams/datastreams_ut.cpp index 2ede2a2d05..6ea2e8518a 100644 --- a/ydb/services/datastreams/datastreams_ut.cpp +++ b/ydb/services/datastreams/datastreams_ut.cpp @@ -1022,7 +1022,7 @@ Y_UNIT_TEST_SUITE(DataStreams) { protoNextToken.SetMaxResults(1); protoNextToken.SetCreationTimestamp(timestamp); TString stringNextToken; - Y_PROTOBUF_SUPPRESS_NODISCARD protoNextToken.SerializeToString(&stringNextToken); + Y_PROTOBUF_SUPPRESS_NODISCARD protoNextToken.SerializeToString(&stringNextToken); TString encodedNextToken; Base64Encode(stringNextToken, encodedNextToken); return encodedNextToken; diff --git a/ydb/services/persqueue_cluster_discovery/cluster_discovery_service_ut.cpp b/ydb/services/persqueue_cluster_discovery/cluster_discovery_service_ut.cpp index 34721e262d..ee06f798f4 100644 --- a/ydb/services/persqueue_cluster_discovery/cluster_discovery_service_ut.cpp +++ b/ydb/services/persqueue_cluster_discovery/cluster_discovery_service_ut.cpp @@ -11,8 +11,8 @@ #include <library/cpp/actors/http/http_proxy.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/text_format.h> #include <grpc++/client_context.h> diff --git a/ydb/services/persqueue_cluster_discovery/cluster_ordering/weighed_ordering_ut.cpp b/ydb/services/persqueue_cluster_discovery/cluster_ordering/weighed_ordering_ut.cpp index 068f90e293..499f4b8216 100644 --- a/ydb/services/persqueue_cluster_discovery/cluster_ordering/weighed_ordering_ut.cpp +++ b/ydb/services/persqueue_cluster_discovery/cluster_ordering/weighed_ordering_ut.cpp @@ -1,7 +1,7 @@ #include <ydb/services/persqueue_cluster_discovery/cluster_ordering/weighed_ordering.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/generic/hash.h> #include <util/generic/string.h> diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp index 3bc9b21728..4dfbd562c9 100644 --- a/ydb/services/persqueue_v1/persqueue_ut.cpp +++ b/ydb/services/persqueue_v1/persqueue_ut.cpp @@ -17,8 +17,8 @@ #include <ydb/library/persqueue/tests/counters.h> #include <ydb/library/persqueue/topic_parser/topic_parser.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <library/cpp/json/json_reader.h> #include <library/cpp/monlib/dynamic_counters/encode.h> #include <google/protobuf/text_format.h> diff --git a/ydb/services/persqueue_v1/ut/api_test_setup.h b/ydb/services/persqueue_v1/ut/api_test_setup.h index 8d5d82b33d..2c834a4d6c 100644 --- a/ydb/services/persqueue_v1/ut/api_test_setup.h +++ b/ydb/services/persqueue_v1/ut/api_test_setup.h @@ -7,8 +7,8 @@ #include <google/protobuf/message.h> #include <library/cpp/logger/log.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <util/string/builder.h> class APITestSetup { diff --git a/ydb/services/persqueue_v1/ut/pq_data_writer.h b/ydb/services/persqueue_v1/ut/pq_data_writer.h index caef894060..ac9a0772c3 100644 --- a/ydb/services/persqueue_v1/ut/pq_data_writer.h +++ b/ydb/services/persqueue_v1/ut/pq_data_writer.h @@ -5,7 +5,7 @@ #include <ydb/public/api/protos/persqueue_error_codes_v1.pb.h> #include <ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/generic/string.h> diff --git a/ydb/services/persqueue_v1/ut/test_utils.h b/ydb/services/persqueue_v1/ut/test_utils.h index c02308b0d7..78305ab9a3 100644 --- a/ydb/services/persqueue_v1/ut/test_utils.h +++ b/ydb/services/persqueue_v1/ut/test_utils.h @@ -3,7 +3,7 @@ #include <ydb/public/api/protos/persqueue_error_codes_v1.pb.h> #include <ydb/core/testlib/test_pq_client.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/registar.h> #include <google/protobuf/message.h> #include <contrib/libs/grpc/include/grpcpp/support/sync_stream.h> #include <util/string/builder.h> diff --git a/ydb/services/persqueue_v1/ut/ya.make b/ydb/services/persqueue_v1/ut/ya.make index 70c088383d..84152155ed 100644 --- a/ydb/services/persqueue_v1/ut/ya.make +++ b/ydb/services/persqueue_v1/ut/ya.make @@ -33,7 +33,7 @@ SRCS( ) PEERDIR( - library/cpp/getopt + library/cpp/getopt library/cpp/svnversion ydb/core/testlib ydb/library/aclib diff --git a/ydb/services/rate_limiter/rate_limiter_ut.cpp b/ydb/services/rate_limiter/rate_limiter_ut.cpp index 4ac05a571c..b6a78141fb 100644 --- a/ydb/services/rate_limiter/rate_limiter_ut.cpp +++ b/ydb/services/rate_limiter/rate_limiter_ut.cpp @@ -9,8 +9,8 @@ #include <ydb/library/yql/public/issue/yql_issue_message.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <util/string/builder.h> diff --git a/ydb/services/ydb/ydb_common_ut.h b/ydb/services/ydb/ydb_common_ut.h index c067928c78..93db8bb673 100644 --- a/ydb/services/ydb/ydb_common_ut.h +++ b/ydb/services/ydb/ydb_common_ut.h @@ -1,7 +1,7 @@ #pragma once -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <ydb/core/testlib/test_client.h> #include <ydb/core/formats/arrow_helpers.h> #include <ydb/services/ydb/ydb_dummy.h> diff --git a/ydb/services/ydb/ydb_coordination_ut.cpp b/ydb/services/ydb/ydb_coordination_ut.cpp index 54c973a7e8..2cb7ba6c31 100644 --- a/ydb/services/ydb/ydb_coordination_ut.cpp +++ b/ydb/services/ydb/ydb_coordination_ut.cpp @@ -5,8 +5,8 @@ #include <ydb/core/tx/scheme_cache/scheme_cache.h> -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> namespace NKikimr { diff --git a/ydb/services/ydb/ydb_stats_ut.cpp b/ydb/services/ydb/ydb_stats_ut.cpp index b40e22fc42..f8a0e84ae6 100644 --- a/ydb/services/ydb/ydb_stats_ut.cpp +++ b/ydb/services/ydb/ydb_stats_ut.cpp @@ -4,8 +4,8 @@ #include <ydb/public/sdk/cpp/client/ydb_extension/extension.h> #include <ydb/public/sdk/cpp/client/ydb_table/table.h> -#include <library/cpp/testing/unittest/registar.h> -#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> #include <library/cpp/monlib/encode/encoder.h> #include <library/cpp/monlib/encode/json/json.h> diff --git a/ydb/services/ydb/ydb_ut.cpp b/ydb/services/ydb/ydb_ut.cpp index 2d37063079..b618a54faf 100644 --- a/ydb/services/ydb/ydb_ut.cpp +++ b/ydb/services/ydb/ydb_ut.cpp @@ -1,5 +1,5 @@ -#include <library/cpp/testing/unittest/tests_data.h> -#include <library/cpp/testing/unittest/registar.h> +#include <library/cpp/testing/unittest/tests_data.h> +#include <library/cpp/testing/unittest/registar.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> |