YT-21993: Remove Phoenix v1

commit_hash:e4285d508e98757c71cb20a91f3cd1f3a56a3c73

Author: galtsev

yt/yt/client/table_client/table_upload_options.cpp

@@ -61,7 +61,7 @@ ui64 TEpochSchema::Set(const TTableSchemaPtr& schema)
     return ++Revision_;
 }
 
-void TEpochSchema::Persist(const NPhoenix::TPersistenceContext& context)
+void TEpochSchema::Persist(const NPhoenix2::TPersistenceContext& context)
 {
     using NYT::Persist;
 
@@ -91,7 +91,7 @@ TTableSchemaPtr TTableUploadOptions::GetUploadSchema() const
     }
 }
 
-void TTableUploadOptions::Persist(const NPhoenix::TPersistenceContext& context)
+void TTableUploadOptions::Persist(const NPhoenix2::TPersistenceContext& context)
 {
     using NYT::Persist;
 

yt/yt/client/table_client/table_upload_options.h

@@ -13,7 +13,7 @@
 
 #include <yt/yt/core/compression/public.h>
 
-#include <yt/yt/core/misc/phoenix.h>
+#include <yt/yt/core/phoenix/context.h>
 
 namespace NYT::NTableClient {
 
@@ -39,7 +39,7 @@ class TEpochSchema
 
     ui64 Set(const TTableSchemaPtr& schema);
 
-    void Persist(const NPhoenix::TPersistenceContext& context);
+    void Persist(const NPhoenix2::TPersistenceContext& context);
 
     ui64 Reset();
 
@@ -67,7 +67,7 @@ struct TTableUploadOptions
 
     TTableSchemaPtr GetUploadSchema() const;
 
-    void Persist(const NPhoenix::TPersistenceContext& context);
+    void Persist(const NPhoenix2::TPersistenceContext& context);
 };
 
 const std::vector<TString>& GetTableUploadOptionsAttributeKeys();

yt/yt/core/misc/arithmetic_formula.cpp

@@ -1,5 +1,4 @@
 #include "arithmetic_formula.h"
-#include "phoenix.h"
 
 #include <yt/yt/core/misc/error.h>
 

yt/yt/core/misc/digest.cpp

@@ -1,17 +1,23 @@
 #include "digest.h"
 #include "config.h"
 
-#include <yt/yt/core/misc/phoenix.h>
+#include <yt/yt/core/phoenix/type_def.h>
 
 namespace NYT {
 
-using namespace NPhoenix;
+using namespace NPhoenix2;
+
+////////////////////////////////////////////////////////////////////////////////
+
+void IPersistentDigest::RegisterMetadata(auto&& /*registrar*/)
+{ }
+
+PHOENIX_DEFINE_TYPE(IPersistentDigest);
 
 ////////////////////////////////////////////////////////////////////////////////
 
 class TLogDigest
     : public IPersistentDigest
-    , public NPhoenix::TFactoryTag<NPhoenix::TSimpleFactory>
 {
 public:
     TLogDigest(TLogDigestConfigPtr config)
@@ -60,21 +66,6 @@ class TLogDigest
         std::fill(Buckets_.begin(), Buckets_.end(), 0);
     }
 
-    void Persist(const TPersistenceContext& context) override
-    {
-        using NYT::Persist;
-        Persist(context, Step_);
-        Persist(context, LogStep_);
-        Persist(context, LowerBound_);
-        Persist(context, UpperBound_);
-        Persist(context, DefaultValue_);
-        Persist(context, BucketCount_);
-        Persist(context, SampleCount_);
-        Persist(context, Buckets_);
-    }
-
-    DECLARE_DYNAMIC_PHOENIX_TYPE(TLogDigest, 0x42424243);
-
 private:
     double Step_;
     double LogStep_;
@@ -88,9 +79,23 @@ class TLogDigest
     i64 SampleCount_ = 0;
 
     std::vector<i64> Buckets_;
+
+    PHOENIX_DECLARE_POLYMORPHIC_TYPE(TLogDigest, 0x42424243);
 };
 
-DEFINE_DYNAMIC_PHOENIX_TYPE(TLogDigest);
+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_DEFINE_TYPE(TLogDigest);
 
 ////////////////////////////////////////////////////////////////////////////////
 

yt/yt/core/misc/digest.h

@@ -2,7 +2,8 @@
 
 #include "public.h"
 
-#include <yt/yt/core/misc/phoenix.h>
+#include <yt/yt/core/phoenix/context.h>
+#include <yt/yt/core/phoenix/type_decl.h>
 
 namespace NYT {
 
@@ -31,9 +32,12 @@ DEFINE_REFCOUNTED_TYPE(IDigest)
 
 struct IPersistentDigest
     : public IDigest
-    , public NPhoenix::IPersistent
+    , public NPhoenix2::IPersistent
 {
-    void Persist(const NPhoenix::TPersistenceContext& context) override = 0;
+    using TLoadContext = NPhoenix2::TLoadContext;
+    using TSaveContext = NPhoenix2::TSaveContext;
+
+    PHOENIX_DECLARE_POLYMORPHIC_TYPE(IPersistentDigest, 0x1ed99609);
 };
 
 DEFINE_REFCOUNTED_TYPE(IPersistentDigest)

yt/yt/core/misc/histogram.cpp

@@ -1,5 +1,8 @@
 #include "histogram.h"
 
+#include <yt/yt/core/phoenix/type_decl.h>
+#include <yt/yt/core/phoenix/type_def.h>
+
 #include <yt/yt/core/yson/public.h>
 
 #include <yt/yt/core/ytree/fluent.h>
@@ -8,13 +11,12 @@ namespace NYT {
 
 using namespace NYTree;
 using namespace NYson;
-using namespace NPhoenix;
+using namespace NPhoenix2;
 
 ////////////////////////////////////////////////////////////////////////////////
 
 class THistogram
     : public IHistogram
-    , public NPhoenix::TFactoryTag<NPhoenix::TSimpleFactory>
 {
 public:
     THistogram() = default;
@@ -74,31 +76,15 @@ class THistogram
         return result;
     }
 
-    void Persist(const TPersistenceContext& context) override
-    {
-        using NYT::Persist;
-        Persist(context, MaxBuckets_);
-        Persist(context, ValueMin_);
-        Persist(context, ValueMax_);
-        Persist(context, Items_);
-    }
-
 private:
     struct TItem
     {
         i64 Value;
         i64 Count;
 
-        void Persist(const TPersistenceContext& context)
-        {
-            using NYT::Persist;
-            Persist(context, Value);
-            Persist(context, Count);
-        }
+        PHOENIX_DECLARE_TYPE(TItem, 0x9860143c);
     };
 
-    DECLARE_DYNAMIC_PHOENIX_TYPE(THistogram, 0x636d76d7);
-
     static const i64 HistogramViewReserveFactor = 2;
 
     i64 MaxBuckets_ = 0;
@@ -140,9 +126,30 @@ class THistogram
             View_.Count[GetBucketIndex(item.Value)] += item.Count;
         }
     }
+
+    PHOENIX_DECLARE_FRIEND();
+    PHOENIX_DECLARE_POLYMORPHIC_TYPE(THistogram, 0x636d76d7);
 };
 
-DEFINE_DYNAMIC_PHOENIX_TYPE(THistogram);
+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_DEFINE_TYPE(THistogram);
+
+////////////////////////////////////////////////////////////////////////////////
+
+void THistogram::TItem::RegisterMetadata(auto&& registrar)
+{
+    PHOENIX_REGISTER_FIELD(1, Value)();
+    PHOENIX_REGISTER_FIELD(2, Count)();
+}
+
+PHOENIX_DEFINE_TYPE(THistogram::TItem);
 
 ////////////////////////////////////////////////////////////////////////////////
 

yt/yt/core/misc/histogram.h

@@ -3,7 +3,7 @@
 #include "public.h"
 #include "serialize.h"
 
-#include <yt/yt/core/misc/phoenix.h>
+#include <yt/yt/core/phoenix/context.h>
 
 namespace NYT {
 
@@ -21,7 +21,7 @@ struct THistogramView
 };
 
 struct IHistogram
-    : public virtual NPhoenix::IPersistent
+    : public virtual NPhoenix2::IPersistent
 {
     virtual void AddValue(i64 value, i64 count = 1) = 0;
     virtual void RemoveValue(i64 value, i64 count = 1) = 0;