diff options
| -rw-r--r-- | library/cpp/yt/misc/cast-inl.h | 4 | ||||
| -rw-r--r-- | library/cpp/yt/misc/enum.h | 14 | ||||
| -rw-r--r-- | library/cpp/yt/string/enum-inl.h | 5 | ||||
| -rw-r--r-- | yt/yt/core/bus/public.cpp | 8 | ||||
| -rw-r--r-- | yt/yt/core/bus/public.h | 3 | ||||
| -rw-r--r-- | yt/yt/core/misc/protobuf_helpers-inl.h | 12 | ||||
| -rw-r--r-- | yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto | 2 |
7 files changed, 4 insertions, 44 deletions
diff --git a/library/cpp/yt/misc/cast-inl.h b/library/cpp/yt/misc/cast-inl.h index 795682864fc..a694394f88d 100644 --- a/library/cpp/yt/misc/cast-inl.h +++ b/library/cpp/yt/misc/cast-inl.h @@ -124,10 +124,6 @@ T CheckedEnumCast(S value) { T result; if (!TryEnumCast<T>(value, &result)) { - if constexpr (TEnumHasDefaultValue<T>::value) { - return GetDefaultValue(T{}); - } - throw TSimpleException(Sprintf("Error casting %s value \"%d\" to enum %s", TypeName<S>().c_str(), static_cast<int>(value), diff --git a/library/cpp/yt/misc/enum.h b/library/cpp/yt/misc/enum.h index 11e168948f4..954b63cbc03 100644 --- a/library/cpp/yt/misc/enum.h +++ b/library/cpp/yt/misc/enum.h @@ -197,20 +197,6 @@ constexpr bool None(E value) noexcept; //////////////////////////////////////////////////////////////////////////////// -template <typename E, typename = void> - requires TEnumTraits<E>::IsEnum -struct TEnumHasDefaultValue - : std::false_type -{ }; - -template <typename E> - requires TEnumTraits<E>::IsEnum -struct TEnumHasDefaultValue<E, std::void_t<decltype(GetDefaultValue(std::declval<E>()))>> - : std::is_same<decltype(GetDefaultValue(std::declval<E>())), E> -{ }; - -//////////////////////////////////////////////////////////////////////////////// - } // namespace NYT #define ENUM_INL_H_ diff --git a/library/cpp/yt/string/enum-inl.h b/library/cpp/yt/string/enum-inl.h index 19ba1f7fe54..41f7197d156 100644 --- a/library/cpp/yt/string/enum-inl.h +++ b/library/cpp/yt/string/enum-inl.h @@ -87,11 +87,6 @@ T ParseEnum(TStringBuf value) if (auto optionalResult = TryParseEnum<T>(value)) { return *optionalResult; } - - if constexpr (TEnumHasDefaultValue<T>::value) { - return GetDefaultValue(T{}); - } - NYT::NDetail::ThrowMalformedEnumValueException(TEnumTraits<T>::GetTypeName(), value); } diff --git a/yt/yt/core/bus/public.cpp b/yt/yt/core/bus/public.cpp index 0487d79fd60..6cff5f25eb8 100644 --- a/yt/yt/core/bus/public.cpp +++ b/yt/yt/core/bus/public.cpp @@ -9,11 +9,5 @@ const TString LocalNetworkName("local"); //////////////////////////////////////////////////////////////////////////////// -EMultiplexingBand GetDefaultValue(EMultiplexingBand) -{ - return EMultiplexingBand::Default; -} - -//////////////////////////////////////////////////////////////////////////////// - } // namespace NYT::NBus + diff --git a/yt/yt/core/bus/public.h b/yt/yt/core/bus/public.h index ba06208732a..f5359d51b78 100644 --- a/yt/yt/core/bus/public.h +++ b/yt/yt/core/bus/public.h @@ -36,8 +36,6 @@ DEFINE_ENUM(EMultiplexingBand, ((RealTime) (4)) ); -EMultiplexingBand GetDefaultValue(EMultiplexingBand); - YT_DEFINE_ERROR_ENUM( ((TransportError) (100)) ((SslError) (119)) @@ -61,3 +59,4 @@ extern const TString LocalNetworkName; //////////////////////////////////////////////////////////////////////////////// } // namespace NYT::NBus + diff --git a/yt/yt/core/misc/protobuf_helpers-inl.h b/yt/yt/core/misc/protobuf_helpers-inl.h index 00ae1906ffe..adf5a308518 100644 --- a/yt/yt/core/misc/protobuf_helpers-inl.h +++ b/yt/yt/core/misc/protobuf_helpers-inl.h @@ -181,11 +181,7 @@ template <class T> requires TEnumTraits<T>::IsEnum && (!TEnumTraits<T>::IsBitEnum) void FromProto(T* original, int serialized) { - if constexpr (TEnumHasDefaultValue<T>::value) { - *original = CheckedEnumCast<T>(serialized); - } else { - *original = static_cast<T>(serialized); - } + *original = static_cast<T>(serialized); } template <class T> @@ -199,11 +195,7 @@ template <class T> requires TEnumTraits<T>::IsBitEnum void FromProto(T* original, ui64 serialized) { - if constexpr (TEnumHasDefaultValue<T>::value) { - *original = CheckedEnumCast<T>(serialized); - } else { - *original = static_cast<T>(serialized); - } + *original = static_cast<T>(serialized); } //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto index 79e4c38f4f7..705d6273135 100644 --- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto +++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto @@ -225,8 +225,6 @@ enum EMultiplexingBand MB_CONTROL = 1; MB_HEAVY = 2; MB_INTERACTIVE = 3; - MB_REAL_TIME = 4; - MB_JOURNAL = 5; } enum ETableSchemaModification |