From 7688f2313619a39a60ef3c2734d8efbc49a0a6db Mon Sep 17 00:00:00 2001 From: abogutksiy Date: Tue, 25 Jun 2024 00:09:54 +0300 Subject: [PATCH] deprecated_codecs options improvements Waiting for pull-request [#616](https://github.com/ytsaurus/ytsaurus/pull/616) to be merged. Then I'll rebase and resolve the conflicts, then this pr will be ready for merge Discussion led to this pr: [link](https://github.com/ytsaurus/ytsaurus/pull/616#discussion_r1616997490) --- 2816c45b6457268a97dedad1968e6f22ba42df8c Pull Request resolved: https://github.com/ytsaurus/ytsaurus/pull/629 --- yt/yt/core/compression/codec.cpp | 24 +++++++++---------- yt/yt/core/compression/codec.h | 6 ++--- yt/yt/core/compression/unittests/codec_ut.cpp | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/yt/yt/core/compression/codec.cpp b/yt/yt/core/compression/codec.cpp index 3edaae9de39a..206938ec2d96 100644 --- a/yt/yt/core/compression/codec.cpp +++ b/yt/yt/core/compression/codec.cpp @@ -413,15 +413,15 @@ ICodec* GetCodec(ECodec id) //////////////////////////////////////////////////////////////////////////////// -const THashSet& GetDeprecatedCodecIds() +const THashSet& GetForbiddenCodecs() { - static const THashSet deprecatedCodecIds{ + static const THashSet deprecatedCodecs{ ECodec::QuickLz }; - return deprecatedCodecIds; + return deprecatedCodecs; } -const THashMap& GetDeprecatedCodecNameToAlias() +const THashMap& GetForbiddenCodecNameToAlias() { static const THashMap deprecatedCodecNameToAlias = { {"zlib6", FormatEnum(ECodec::Zlib_6)}, @@ -436,19 +436,19 @@ const THashMap& GetDeprecatedCodecNameToAlias() return deprecatedCodecNameToAlias; } -const std::vector& GetSupportedCodecIds() +const std::vector& GetSupportedCodecs() { - static const std::vector supportedCodecIds = [] { - std::vector supportedCodecIds; + static const std::vector supportedCodecs = [] { + std::vector supportedCodecs; for (auto codecId : TEnumTraits::GetDomainValues()) { - if (!GetDeprecatedCodecIds().contains(codecId)) { - supportedCodecIds.push_back(codecId); + if (!GetForbiddenCodecs().contains(codecId)) { + supportedCodecs.push_back(codecId); } } - SortUnique(supportedCodecIds); - return supportedCodecIds; + SortUnique(supportedCodecs); + return supportedCodecs; }(); - return supportedCodecIds; + return supportedCodecs; } //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/core/compression/codec.h b/yt/yt/core/compression/codec.h index ec102e6a5572..97d62d100d6b 100644 --- a/yt/yt/core/compression/codec.h +++ b/yt/yt/core/compression/codec.h @@ -33,9 +33,9 @@ struct ICodec ICodec* GetCodec(ECodec id); //! Deprecated codecs information. -const THashSet& GetDeprecatedCodecIds(); -const THashMap& GetDeprecatedCodecNameToAlias(); -const std::vector& GetSupportedCodecIds(); +const THashSet& GetForbiddenCodecs(); +const THashMap& GetForbiddenCodecNameToAlias(); +const std::vector& GetSupportedCodecs(); //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/core/compression/unittests/codec_ut.cpp b/yt/yt/core/compression/unittests/codec_ut.cpp index 43923cca7121..87cfa8b6ae05 100644 --- a/yt/yt/core/compression/unittests/codec_ut.cpp +++ b/yt/yt/core/compression/unittests/codec_ut.cpp @@ -101,7 +101,7 @@ INSTANTIATE_TEST_SUITE_P( All, TCodecTest, ::testing::Combine( - ::testing::ValuesIn(GetSupportedCodecIds()), + ::testing::ValuesIn(GetSupportedCodecs()), ::testing::ValuesIn(std::vector({static_cast(-1), 1, 1024}))), [] (const ::testing::TestParamInfo>& info) -> std::string { return