aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbabenko <babenko@yandex-team.com>2025-01-11 18:25:53 +0300
committerbabenko <babenko@yandex-team.com>2025-01-11 18:39:47 +0300
commit2ce6f2ac701e5e2127c468e9b0b05b9c7ad83b11 (patch)
tree01a61ff320e69895c8365203fe1adca72bb2649c
parentdbd433e8011091346b3a3740428e392a2ddc76c1 (diff)
downloadydb-2ce6f2ac701e5e2127c468e9b0b05b9c7ad83b11.tar.gz
Reduce the number of braces in PHOENIX_REGISTER_FIELD usages
commit_hash:a74b726c5ba35c2fd9d2d7c3ac1c7e85b3177e2e
-rw-r--r--yt/yt/client/chunk_client/chunk_replica.cpp2
-rw-r--r--yt/yt/core/logging/logger_owner.cpp2
-rw-r--r--yt/yt/core/misc/digest.cpp16
-rw-r--r--yt/yt/core/misc/histogram.cpp12
-rw-r--r--yt/yt/core/phoenix/type_def-inl.h4
-rw-r--r--yt/yt/core/phoenix/type_def.h2
-rw-r--r--yt/yt/core/phoenix/unittests/phoenix_ut.cpp114
7 files changed, 76 insertions, 76 deletions
diff --git a/yt/yt/client/chunk_client/chunk_replica.cpp b/yt/yt/client/chunk_client/chunk_replica.cpp
index f2a6aa00cf..568af6a8d1 100644
--- a/yt/yt/client/chunk_client/chunk_replica.cpp
+++ b/yt/yt/client/chunk_client/chunk_replica.cpp
@@ -21,7 +21,7 @@ using namespace NObjectClient;
void TChunkReplica::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, Value_)();
+ PHOENIX_REGISTER_FIELD(1, Value_);
}
PHOENIX_DEFINE_TYPE(TChunkReplica);
diff --git a/yt/yt/core/logging/logger_owner.cpp b/yt/yt/core/logging/logger_owner.cpp
index b9a571f9dc..3d50a40e5b 100644
--- a/yt/yt/core/logging/logger_owner.cpp
+++ b/yt/yt/core/logging/logger_owner.cpp
@@ -8,7 +8,7 @@ namespace NYT::NLogging {
void TLoggerOwner::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, Logger)();
+ PHOENIX_REGISTER_FIELD(1, Logger);
}
PHOENIX_DEFINE_TYPE(TLoggerOwner);
diff --git a/yt/yt/core/misc/digest.cpp b/yt/yt/core/misc/digest.cpp
index 8ce0bd4ef9..71b9eb9a0e 100644
--- a/yt/yt/core/misc/digest.cpp
+++ b/yt/yt/core/misc/digest.cpp
@@ -85,14 +85,14 @@ private:
void TLogDigest::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, Step_)();
- PHOENIX_REGISTER_FIELD(2, LogStep_)();
- PHOENIX_REGISTER_FIELD(3, LowerBound_)();
- PHOENIX_REGISTER_FIELD(4, UpperBound_)();
- PHOENIX_REGISTER_FIELD(5, DefaultValue_)();
- PHOENIX_REGISTER_FIELD(6, BucketCount_)();
- PHOENIX_REGISTER_FIELD(7, SampleCount_)();
- PHOENIX_REGISTER_FIELD(8, Buckets_)();
+ PHOENIX_REGISTER_FIELD(1, Step_);
+ PHOENIX_REGISTER_FIELD(2, LogStep_);
+ PHOENIX_REGISTER_FIELD(3, LowerBound_);
+ PHOENIX_REGISTER_FIELD(4, UpperBound_);
+ PHOENIX_REGISTER_FIELD(5, DefaultValue_);
+ PHOENIX_REGISTER_FIELD(6, BucketCount_);
+ PHOENIX_REGISTER_FIELD(7, SampleCount_);
+ PHOENIX_REGISTER_FIELD(8, Buckets_);
}
PHOENIX_DEFINE_TYPE(TLogDigest);
diff --git a/yt/yt/core/misc/histogram.cpp b/yt/yt/core/misc/histogram.cpp
index 9ce25ad784..72c4d0035d 100644
--- a/yt/yt/core/misc/histogram.cpp
+++ b/yt/yt/core/misc/histogram.cpp
@@ -133,10 +133,10 @@ private:
void THistogram::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, MaxBuckets_)();
- PHOENIX_REGISTER_FIELD(2, ValueMin_)();
- PHOENIX_REGISTER_FIELD(3, ValueMax_)();
- PHOENIX_REGISTER_FIELD(4, Items_)();
+ PHOENIX_REGISTER_FIELD(1, MaxBuckets_);
+ PHOENIX_REGISTER_FIELD(2, ValueMin_);
+ PHOENIX_REGISTER_FIELD(3, ValueMax_);
+ PHOENIX_REGISTER_FIELD(4, Items_);
}
PHOENIX_DEFINE_TYPE(THistogram);
@@ -145,8 +145,8 @@ PHOENIX_DEFINE_TYPE(THistogram);
void THistogram::TItem::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, Value)();
- PHOENIX_REGISTER_FIELD(2, Count)();
+ PHOENIX_REGISTER_FIELD(1, Value);
+ PHOENIX_REGISTER_FIELD(2, Count);
}
PHOENIX_DEFINE_TYPE(THistogram::TItem);
diff --git a/yt/yt/core/phoenix/type_def-inl.h b/yt/yt/core/phoenix/type_def-inl.h
index 59535a02ec..c8bc0cfc7f 100644
--- a/yt/yt/core/phoenix/type_def-inl.h
+++ b/yt/yt/core/phoenix/type_def-inl.h
@@ -86,8 +86,8 @@ namespace NYT::NPhoenix2::NDetail {
YT_STATIC_INITIALIZER(::NYT::NPhoenix2::NDetail::RegisterOpaqueTypeDescriptorImpl<type>()); \
}
-#define PHOENIX_REGISTER_FIELD(fieldTag, fieldName) \
- registrar.template Field<fieldTag, &TThis::fieldName>(#fieldName)
+#define PHOENIX_REGISTER_FIELD(fieldTag, fieldName, ...) \
+ registrar.template Field<fieldTag, &TThis::fieldName>(#fieldName) __VA_ARGS__ ()
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/phoenix/type_def.h b/yt/yt/core/phoenix/type_def.h
index 96447c6f85..f5576bfe6e 100644
--- a/yt/yt/core/phoenix/type_def.h
+++ b/yt/yt/core/phoenix/type_def.h
@@ -29,7 +29,7 @@ struct _
#define PHOENIX_DEFINE_OPAQUE_TYPE(type, typeTagValue)
//! A handy helper for registering Phoenix fields.
-#define PHOENIX_REGISTER_FIELD(fieldTag, fieldName)
+#define PHOENIX_REGISTER_FIELD(fieldTag, fieldName, ...)
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/phoenix/unittests/phoenix_ut.cpp b/yt/yt/core/phoenix/unittests/phoenix_ut.cpp
index 165c157be2..8ff17aec4e 100644
--- a/yt/yt/core/phoenix/unittests/phoenix_ut.cpp
+++ b/yt/yt/core/phoenix/unittests/phoenix_ut.cpp
@@ -91,8 +91,8 @@ private:
void TPoint::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X_)();
- PHOENIX_REGISTER_FIELD(2, Y_)();
+ PHOENIX_REGISTER_FIELD(1, X_);
+ PHOENIX_REGISTER_FIELD(2, Y_);
}
PHOENIX_DEFINE_TYPE(TPoint);
@@ -112,7 +112,7 @@ struct TBaseStruct
void TBaseStruct::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
+ PHOENIX_REGISTER_FIELD(1, A);
}
PHOENIX_DEFINE_YSON_DUMPABLE_TYPE_MIXIN(TBaseStruct);
@@ -133,7 +133,7 @@ struct TDerivedStruct
void TDerivedStruct::RegisterMetadata(auto&& registrar)
{
registrar.template BaseType<TBaseStruct>();
- PHOENIX_REGISTER_FIELD(1, B)();
+ PHOENIX_REGISTER_FIELD(1, B);
}
PHOENIX_DEFINE_TYPE(TDerivedStruct); // <- TRegisterTypeDescriptor() for BaseStruct is not called yet
@@ -158,8 +158,8 @@ struct TPair
template <class T1, class T2>
void TPair<T1, T2>::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, First)();
- PHOENIX_REGISTER_FIELD(2, Second)();
+ PHOENIX_REGISTER_FIELD(1, First);
+ PHOENIX_REGISTER_FIELD(2, Second);
}
PHOENIX_DEFINE_TEMPLATE_TYPE(TPair, (_, _));
@@ -264,14 +264,14 @@ struct S
void S::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
- PHOENIX_REGISTER_FIELD(2, B)
- .SinceVersion(100)();
- PHOENIX_REGISTER_FIELD(3, C)
+ PHOENIX_REGISTER_FIELD(1, A);
+ PHOENIX_REGISTER_FIELD(2, B,
+ .SinceVersion(100));
+ PHOENIX_REGISTER_FIELD(3, C,
.SinceVersion(200)
.WhenMissing([] (TThis* this_, auto& /*context*/) {
this_->C = 777;
- })();
+ }));
}
PHOENIX_DEFINE_TYPE(S);
@@ -327,14 +327,14 @@ struct S
void S::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
- PHOENIX_REGISTER_FIELD(2, B)
- .BeforeVersion(100)();
- PHOENIX_REGISTER_FIELD(3, C)
+ PHOENIX_REGISTER_FIELD(1, A);
+ PHOENIX_REGISTER_FIELD(2, B,
+ .BeforeVersion(100));
+ PHOENIX_REGISTER_FIELD(3, C,
.BeforeVersion(200)
.WhenMissing([] (TThis* this_, auto& /*context*/) {
this_->C = 777;
- })();
+ }));
}
PHOENIX_DEFINE_TYPE(S);
@@ -392,18 +392,18 @@ struct S
void S::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
- PHOENIX_REGISTER_FIELD(2, B)
+ PHOENIX_REGISTER_FIELD(1, A);
+ PHOENIX_REGISTER_FIELD(2, B,
.InVersions([] (int version) {
return version >= 150 && version <= 250;
- })();
- PHOENIX_REGISTER_FIELD(3, C)
+ }));
+ PHOENIX_REGISTER_FIELD(3, C,
.InVersions([] (int version) {
return version >= 100 && version <= 200;
})
.WhenMissing([] (TThis* this_, auto& /*context*/) {
this_->C = 777;
- })();
+ }));
}
PHOENIX_DEFINE_TYPE(S);
@@ -581,9 +581,9 @@ struct S
void S::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)
- .template Serializer<TSerializer>()();
- PHOENIX_REGISTER_FIELD(2, B)();
+ PHOENIX_REGISTER_FIELD(1, A,
+ .template Serializer<TSerializer>());
+ PHOENIX_REGISTER_FIELD(2, B);
}
PHOENIX_DEFINE_TYPE(S);
@@ -929,7 +929,7 @@ struct TBase
void TBase::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
+ PHOENIX_REGISTER_FIELD(1, A);
}
PHOENIX_DEFINE_TYPE(TBase);
@@ -979,8 +979,8 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
- PHOENIX_REGISTER_FIELD(2, Y)();
+ PHOENIX_REGISTER_FIELD(1, X);
+ PHOENIX_REGISTER_FIELD(2, Y);
}
PHOENIX_DEFINE_TYPE(A);
@@ -995,7 +995,7 @@ struct B
void B::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, V)();
+ PHOENIX_REGISTER_FIELD(1, V);
}
PHOENIX_DEFINE_TYPE(B);
@@ -1034,7 +1034,7 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
+ PHOENIX_REGISTER_FIELD(1, X);
}
PHOENIX_DEFINE_TYPE(A);
@@ -1082,7 +1082,7 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
+ PHOENIX_REGISTER_FIELD(1, X);
}
PHOENIX_DEFINE_TYPE(A);
@@ -1127,7 +1127,7 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
+ PHOENIX_REGISTER_FIELD(1, X);
}
PHOENIX_DEFINE_TYPE(A);
@@ -1143,8 +1143,8 @@ struct B
void B::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, L)();
- PHOENIX_REGISTER_FIELD(2, R)();
+ PHOENIX_REGISTER_FIELD(1, L);
+ PHOENIX_REGISTER_FIELD(2, R);
}
PHOENIX_DEFINE_TYPE(B);
@@ -1223,8 +1223,8 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
- PHOENIX_REGISTER_FIELD(2, Y)();
+ PHOENIX_REGISTER_FIELD(1, X);
+ PHOENIX_REGISTER_FIELD(2, Y);
}
PHOENIX_DEFINE_TYPE(A);
@@ -1280,8 +1280,8 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
- PHOENIX_REGISTER_FIELD(2, Y)();
+ PHOENIX_REGISTER_FIELD(1, X);
+ PHOENIX_REGISTER_FIELD(2, Y);
}
PHOENIX_DEFINE_TYPE(A);
@@ -1298,7 +1298,7 @@ struct B
void B::RegisterMetadata(auto&& registrar)
{
registrar.template Field<1, &B::V>("v")();
- PHOENIX_REGISTER_FIELD(2, W)();
+ PHOENIX_REGISTER_FIELD(2, W);
}
PHOENIX_DEFINE_TYPE(B);
@@ -1315,9 +1315,9 @@ struct C
void C::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, APtr)();
- PHOENIX_REGISTER_FIELD(2, BPtr)();
- PHOENIX_REGISTER_FIELD(3, BWeakPtr)();
+ PHOENIX_REGISTER_FIELD(1, APtr);
+ PHOENIX_REGISTER_FIELD(2, BPtr);
+ PHOENIX_REGISTER_FIELD(3, BWeakPtr);
}
PHOENIX_DEFINE_TYPE(C);
@@ -1387,7 +1387,7 @@ struct TDerived1
void TDerived1::RegisterMetadata(auto&& registrar)
{
registrar.template BaseType<TBase>();
- PHOENIX_REGISTER_FIELD(1, V)();
+ PHOENIX_REGISTER_FIELD(1, V);
}
PHOENIX_DEFINE_TYPE(TDerived1);
@@ -1403,7 +1403,7 @@ struct TDerived2
void TDerived2::RegisterMetadata(auto&& registrar)
{
registrar.template BaseType<TBase>();
- PHOENIX_REGISTER_FIELD(1, V)();
+ PHOENIX_REGISTER_FIELD(1, V);
}
PHOENIX_DEFINE_TYPE(TDerived2);
@@ -1443,7 +1443,7 @@ struct S
void S::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
+ PHOENIX_REGISTER_FIELD(1, X);
}
PHOENIX_DEFINE_TYPE(S);
@@ -1479,8 +1479,8 @@ struct A
void A::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
- PHOENIX_REGISTER_FIELD(2, T)();
+ PHOENIX_REGISTER_FIELD(1, X);
+ PHOENIX_REGISTER_FIELD(2, T);
}
PHOENIX_DEFINE_TYPE(A);
@@ -1495,8 +1495,8 @@ struct B
void B::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, Y)();
- PHOENIX_REGISTER_FIELD(2, Z)();
+ PHOENIX_REGISTER_FIELD(1, Y);
+ PHOENIX_REGISTER_FIELD(2, Z);
}
PHOENIX_DEFINE_TYPE(B);
@@ -1584,7 +1584,7 @@ struct TBase
void TBase::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X)();
+ PHOENIX_REGISTER_FIELD(1, X);
}
PHOENIX_DEFINE_TYPE(TBase);
@@ -1608,8 +1608,8 @@ struct TDervied
void TDervied::RegisterMetadata(auto&& registrar)
{
registrar.template BaseType<TBase>();
- PHOENIX_REGISTER_FIELD(1, Y)();
- PHOENIX_REGISTER_FIELD(2, Z)();
+ PHOENIX_REGISTER_FIELD(1, Y);
+ PHOENIX_REGISTER_FIELD(2, Z);
}
PHOENIX_DEFINE_TYPE(TDervied);
@@ -1649,7 +1649,7 @@ struct TBase1
void TBase1::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X1)();
+ PHOENIX_REGISTER_FIELD(1, X1);
}
PHOENIX_DEFINE_TYPE(TBase1);
@@ -1665,7 +1665,7 @@ struct TBase2
void TBase2::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, X2)();
+ PHOENIX_REGISTER_FIELD(1, X2);
}
PHOENIX_DEFINE_TYPE(TBase2);
@@ -1684,8 +1684,8 @@ void TDerived::RegisterMetadata(auto&& registrar)
{
registrar.template BaseType<TBase1>();
registrar.template BaseType<TBase2>();
- PHOENIX_REGISTER_FIELD(1, Y)();
- PHOENIX_REGISTER_FIELD(2, Z)();
+ PHOENIX_REGISTER_FIELD(1, Y);
+ PHOENIX_REGISTER_FIELD(2, Z);
}
PHOENIX_DEFINE_TYPE(TDerived);
@@ -1781,7 +1781,7 @@ struct S
void S::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
+ PHOENIX_REGISTER_FIELD(1, A);
}
PHOENIX_DEFINE_TYPE(S);
@@ -1839,7 +1839,7 @@ PHOENIX_DEFINE_TYPE(TOuter::TInner);
void TOuter::TInner::RegisterMetadata(auto&& registrar)
{
- PHOENIX_REGISTER_FIELD(1, A)();
+ PHOENIX_REGISTER_FIELD(1, A);
}
} // namespace NPrivateInner