Refactor event pb (#6235)

Author: maximyurchuk

ydb/library/actors/core/event_pb.cpp

@@ -347,22 +347,24 @@ namespace NActors {
         }
     }
 
-    ui32 CalculateSerializedSizeImpl(const TVector<TRope> &payload, size_t totalPayloadSize, ssize_t recordSize) {
-        // TODO: calc totalPayloadSize via payload? 
+    ui32 CalculateSerializedSizeImpl(const TVector<TRope> &payload, ssize_t recordSize) {
         ssize_t result = recordSize;
         if (result >= 0 && payload) {
             ++result; // marker
             char buf[MaxNumberBytes];
             result += SerializeNumber(payload.size(), buf);
+            size_t totalPayloadSize = 0;
             for (const TRope& rope : payload) {
-                result += SerializeNumber(rope.GetSize(), buf);
+                size_t ropeSize = rope.GetSize();
+                totalPayloadSize += ropeSize;
+                result += SerializeNumber(ropeSize, buf);
             }
             result += totalPayloadSize;
         }
         return result;
     }
 
-    TEventSerializationInfo CreateSerializationInfoImpl(size_t preserializedSize, bool allowExternalDataChannel, const TVector<TRope> &payload, size_t totalPayloadSize, ssize_t recordSize) {
+    TEventSerializationInfo CreateSerializationInfoImpl(size_t preserializedSize, bool allowExternalDataChannel, const TVector<TRope> &payload, ssize_t recordSize) {
             TEventSerializationInfo info;
             info.IsExtendedFormat = static_cast<bool>(payload);
 
@@ -382,14 +384,12 @@ namespace NActors {
                 const size_t byteSize = Max<ssize_t>(0, recordSize) + preserializedSize;
                 info.Sections.push_back(TEventSectionInfo{0, byteSize, 0, 0, true}); // protobuf itself
 
-#ifdef NDEBUG
-                Y_UNUSED(totalPayloadSize);
-#else
+#ifndef NDEBUG
                 size_t total = 0;
                 for (const auto& section : info.Sections) {
                     total += section.Size;
                 }
-                size_t serialized = CalculateSerializedSizeImpl(payload, totalPayloadSize, recordSize);
+                size_t serialized = CalculateSerializedSizeImpl(payload, recordSize);
                 Y_ABORT_UNLESS(total == serialized, "total# %zu serialized# %zu byteSize# %zd payload.size# %zu", total,
                     serialized, byteSize, payload.size());
 #endif

ydb/library/actors/core/event_pb.h

@@ -148,10 +148,9 @@ namespace NActors {
     static constexpr size_t MaxNumberBytes = (sizeof(size_t) * CHAR_BIT + 6) / 7;
 
     void ParseExtendedFormatPayload(TRope::TConstIterator &iter, size_t &size, TVector<TRope> &payload, size_t &totalPayloadSize);
-    size_t SerializeNumber(size_t num, char *buffer);
     bool SerializeToArcadiaStreamImpl(TChunkSerializer* chunker, const TVector<TRope> &payload);
-    ui32 CalculateSerializedSizeImpl(const TVector<TRope> &payload, size_t totalPayloadSize, ssize_t recordSize);
-    TEventSerializationInfo CreateSerializationInfoImpl(size_t preserializedSize, bool allowExternalDataChannel, const TVector<TRope> &payload, size_t totalPayloadSize, ssize_t recordSize);
+    ui32 CalculateSerializedSizeImpl(const TVector<TRope> &payload, ssize_t recordSize);
+    TEventSerializationInfo CreateSerializationInfoImpl(size_t preserializedSize, bool allowExternalDataChannel, const TVector<TRope> &payload, ssize_t recordSize);
 
     template <typename TEv, typename TRecord /*protobuf record*/, ui32 TEventType, typename TRecHolder>
     class TEventPBBase: public TEventBase<TEv, TEventType> , public TRecHolder {
@@ -201,7 +200,7 @@ namespace NActors {
         }
 
         ui32 CalculateSerializedSize() const override {
-            return CalculateSerializedSizeImpl(Payload, GetTotalPayloadSize(), Record.ByteSize());
+            return CalculateSerializedSizeImpl(Payload, Record.ByteSize());
         }
 
         static IEventBase* Load(TEventSerializedData *input) {
@@ -242,18 +241,14 @@ namespace NActors {
         }
 
         TEventSerializationInfo CreateSerializationInfo() const override {
-            return CreateSerializationInfoImpl(0, static_cast<const TEv&>(*this).AllowExternalDataChannel(), GetPayload(), GetTotalPayloadSize(), Record.ByteSize());
+            return CreateSerializationInfoImpl(0, static_cast<const TEv&>(*this).AllowExternalDataChannel(), GetPayload(), Record.ByteSize());
         }
 
         bool AllowExternalDataChannel() const {
             return TotalPayloadSize >= 4096;
         }
 
     public:
-        void ReservePayload(size_t size) {
-            Payload.reserve(size);
-        }
-
         ui32 AddPayload(TRope&& rope) {
             const ui32 id = Payload.size();
             TotalPayloadSize += rope.size();
@@ -278,10 +273,6 @@ namespace NActors {
         void StripPayload() {
             Payload.clear();
             TotalPayloadSize = 0;
-        } 
-
-        size_t GetTotalPayloadSize() const {
-            return TotalPayloadSize;
         }
 
     protected:
@@ -444,7 +435,7 @@ namespace NActors {
         }
 
         TEventSerializationInfo CreateSerializationInfo() const override {
-            return CreateSerializationInfoImpl(PreSerializedData.size(), static_cast<const TEv&>(*this).AllowExternalDataChannel(), TBase::GetPayload(), TBase::GetTotalPayloadSize(), Record.ByteSize());
+            return CreateSerializationInfoImpl(PreSerializedData.size(), static_cast<const TEv&>(*this).AllowExternalDataChannel(), TBase::GetPayload(), Record.ByteSize());
         }
     };