From 0803bc6ded0097443d626c20a4d399cea7ef8868 Mon Sep 17 00:00:00 2001
From: Airat Arifullin <a.arifullin@yadro.com>
Date: Thu, 16 May 2024 12:03:42 +0300
Subject: [PATCH] [#83] object: Regenerate protobufs for `ECHeader`

* Fix marshalers and converters;
* Fix unit-tests.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
---
 object/convert.go       |  18 ++++++++++++++++--
 object/grpc/types.pb.go | Bin 51227 -> 51762 bytes
 object/marshal.go       |  18 +++++++++---------
 object/test/generate.go |   2 +-
 object/types.go         |  14 +++++++-------
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/object/convert.go b/object/convert.go
index 5b4acda..99047dc 100644
--- a/object/convert.go
+++ b/object/convert.go
@@ -270,7 +270,7 @@ func (h *ECHeader) ToGRPCMessage() grpc.Message {
 
 		m.Parent = h.Parent.ToGRPCMessage().(*refsGRPC.ObjectID)
 		m.ParentSplitId = h.ParentSplitID
-		m.ParentSplitIndex = h.ParentSplitIndex
+		m.ParentSplitParentId = h.ParentSplitParentID.ToGRPCMessage().(*refsGRPC.ObjectID)
 		m.Index = h.Index
 		m.Total = h.Total
 		m.Header = h.Header
@@ -303,7 +303,21 @@ func (h *ECHeader) FromGRPCMessage(m grpc.Message) error {
 	}
 
 	h.ParentSplitID = v.GetParentSplitId()
-	h.ParentSplitIndex = v.GetParentSplitIndex()
+
+	parSplitParentID := v.GetParentSplitParentId()
+	if parSplitParentID == nil {
+		h.ParentSplitParentID = nil
+	} else {
+		if h.ParentSplitParentID == nil {
+			h.ParentSplitParentID = new(refs.ObjectID)
+		}
+
+		err = h.ParentSplitParentID.FromGRPCMessage(parSplitParentID)
+		if err != nil {
+			return err
+		}
+	}
+
 	h.Index = v.GetIndex()
 	h.Total = v.GetTotal()
 	h.Header = v.GetHeader()
diff --git a/object/grpc/types.pb.go b/object/grpc/types.pb.go
index 254e76d54648f5eea7ac4d52b6fc05b6b1be79a5..3cb44a3dc5c5cc4e35e99aa51b929af2f8cf9940 100644
GIT binary patch
delta 1324
zcmZux-)~c87!ITD*4pWQlp+qgZ>HIB>AJS-j}<e<gk9h+m=U9en0jc>Y_aR9J!jbz
z%`hRxNw?5FbuH_l-9~i~m0=TzMdL`kCDaSK6Zi{odSi@<@%z3Womsf)`JVTEpXYhs
z_dBQg3p>Bb>|7rVP7fdMNeD?Xu5`(yb|6QO*wtfDPQ;>0uoe$S!z3ybSyV`LjQq#5
zk*Fezu`&9TiNJ^ok;cfYj7fxe*r4z2WdtEkq*JHGkV5rY0cFwRX=crsiKHmgqZqc6
z;}MaJMa5W{2(g$nDHBB^VNns2<I%WCBGM!?4@D;8?{H#F2#KmoT(ylv#iWo7Mc%U;
z^rL(_-cId!G)%hRP9{S3W3(NlPMUo_o0L#&aba8>P)FT1x9zkn#ns%F5*mZ;T26rR
zxE0m6H08g7pJ=t*22Q6FUyDzv=wZNIz9)9J)P<boKPF$=)8O~oh-1p(Di5XaXd2yN
zjs*7W#Enn85lk5|ykNnPGuAc_U9Mxw>$e&7^x@`3{hZ*#(Bd8x-Zh|_wPD}ni)cz}
zaecX?g_XK_smH|$eb|`UkNXR48mi?%V%CZiIU`!Lel4r@;rk^Er0hYgrZ+VG)C%io
zJ25(ML?T&_Yq?J3E<TUnbAxp>b?=-D*C#CKnSF-Af!QA1%n_VTwdi<{9-K(;#f3~8
z9E(=mOf}Q~j^OWeMx>K_F;J{Wb*>wAc@txAzyw=<1PA7JV=n)415<F&Rp3!R!1C#t
z=kVr2BMMm)-ar$rY0>nt23cbBGabHL8szhOoorGcpV#Nc<6JMbB~0SZ)DQ}nEbREx
zd4h+R_!PPV!J*6l8>pSHPm=Yxy=bPhw?bd&XQZKGCoD@kNQFM$o|CR0*9rk#oG@eh
z<1QR3T3Ow1ADQreab#<RyTt&?*$N&lH}D|4J!~!q_?kSf`IQ$iwc=t_=b7DDPw7z2
zXkf`0@$0-64_113p+mrp^ZPL?Ka0n*4zI87;$m(O6;oCN9C-RD_*n%G2E12l8NSQx
z71h&$!J-+)(l9gKD0Se^5<#Y9*%GOgYCNZdinM*M%Cp8lPysjoMFn2^cH-a{wK8vr
zg2KOm-pBkJzr!!b3C^tXRi`Brs%s-gcFi7YLElq9g0da2UG1Vhl|Q^1Xu=P->dnK4
z?N9g|(O&Mr=B?%({dnc8R^0#AXY|_${f{~6@*i;dF<RLNZ{_Lj!S3w=GnOjmCj||7
QP}#ME37N}=+s%#t0O<M0<p2Nx

delta 1050
zcmZ8f?MqWp9LChSt@)mB^JP~pO<mjF-KMihA@D<mVJ`$jVouv&q1UC?T%aTvI8ev*
zQKp;IO|48Lq(Kl)s(&DippQy@ixll!A0oQv+)?3|bMAAV=lT7f-#PcyOmfJdyxD9!
z(`N5;@IrMz<Kpi+JmSjSba%T1ol+q&6ydO4V{Fj&x&<w7?{QpoQ<JTqC~efJz1QE%
zC(fzmGAV~FTWN~)af<=dnG*Zl;Y~$HcO6Qcs%*k26~jtJpF<ev;~6&g+F6@(!p_FN
zdM*{oon|e=dRRkDJN-T-gX^NmPF4el@<}t;Kp8R?(-43f-hk?aQi1!cYG@|Q(F+A0
z`D7TL%S%-%SdR%)D3x;@ad(;UC6bHI@zcbSHgCnJ<#$OI%n3CZSyAD3@Em+086msH
zQZIrQ91Y5F_OTvEel_xZg%}N1;F>QDLWq-#73<AfQT#GwMI=CdhKW|R@;N{xA4kzN
zj4w1{Z<bOY7p%m>vBa`DTa3dg8GbI*U?`la5((BW65`f~t+5Kc2^+CLRs#8A3*B9d
zEjgs2fr=XFJPjs9gL-TRs-WX5aOf{ac!JKxP89=7O{5=dBK_V*)G*CxurpZocb@P>
zA)16Nqz7{mk64J<MCbVxp-BxE;=B{JV#!S>nDSOmud8qnt)+uF2(4MBS{fcB%T~0x
zWiSpEh^e&LjLJlBA!dfebn}KRn!3J`yhS~Y^#B*JyHbW7&<0*q<2O#Bd9{pmkOCZq
z3dGw@!N_XUNivUgO(tCDE3v<7{1?0W35{Yll3ZR1uoQet0Aj_Jr;?1m!$tydgi$^F
zuRxCk3{>_Z!O+n9H7hdLXkh;ub<{hF{YL_H5pd(V#E|zwOadI0g?Tk}>&@5==3{jI
zDtUS{X(HZ!BlhNXkZ)8cF)_o2H46t@4JwP4(d(IZ&T^i!fQ{E3KPWA7@$Lb^COmXI
flnU;cJRjfVN^Hkf$8Chrh(A9Y&ySUFXQ%%Gl>B6t

diff --git a/object/marshal.go b/object/marshal.go
index fa2de95..bf8fcb9 100644
--- a/object/marshal.go
+++ b/object/marshal.go
@@ -26,13 +26,13 @@ const (
 	splitHdrChildrenField        = 5
 	splitHdrSplitIDField         = 6
 
-	ecHdrParentField       = 1
-	ecHdrIndexField        = 2
-	ecHdrTotalField        = 3
-	ecHdrHeaderLengthField = 4
-	ecHdrHeaderField       = 5
-	ecHdrParentSplitID     = 6
-	ecHdrParentSplitIndex  = 7
+	ecHdrParentField         = 1
+	ecHdrIndexField          = 2
+	ecHdrTotalField          = 3
+	ecHdrHeaderLengthField   = 4
+	ecHdrHeaderField         = 5
+	ecHdrParentSplitID       = 6
+	ecHdrParentSplitParentID = 7
 
 	hdrVersionField         = 1
 	hdrContainerIDField     = 2
@@ -264,7 +264,7 @@ func (h *ECHeader) StableMarshal(buf []byte) []byte {
 	offset += proto.UInt32Marshal(ecHdrHeaderLengthField, buf[offset:], h.HeaderLength)
 	offset += proto.BytesMarshal(ecHdrHeaderField, buf[offset:], h.Header)
 	offset += proto.BytesMarshal(ecHdrParentSplitID, buf[offset:], h.ParentSplitID)
-	proto.UInt32Marshal(ecHdrParentSplitIndex, buf[offset:], h.ParentSplitIndex)
+	proto.NestedStructureMarshal(ecHdrParentSplitParentID, buf[offset:], h.ParentSplitParentID)
 	return buf
 }
 
@@ -279,7 +279,7 @@ func (h *ECHeader) StableSize() (size int) {
 	size += proto.UInt32Size(ecHdrHeaderLengthField, h.HeaderLength)
 	size += proto.BytesSize(ecHdrHeaderField, h.Header)
 	size += proto.BytesSize(ecHdrParentSplitID, h.ParentSplitID)
-	size += proto.UInt32Size(ecHdrParentSplitIndex, h.ParentSplitIndex)
+	size += proto.NestedStructureSize(ecHdrParentSplitParentID, h.ParentSplitParentID)
 
 	return size
 }
diff --git a/object/test/generate.go b/object/test/generate.go
index bb774cc..95c76e5 100644
--- a/object/test/generate.go
+++ b/object/test/generate.go
@@ -92,7 +92,7 @@ func GenerateECHeader(empty bool) *object.ECHeader {
 	if !empty {
 		ech.Parent = refstest.GenerateObjectID(empty)
 		ech.ParentSplitID = []byte{1, 2, 3}
-		ech.ParentSplitIndex = 1
+		ech.ParentSplitParentID = refstest.GenerateObjectID(empty)
 		ech.Index = 0
 		ech.Total = 2
 		ech.Header = []byte("chunk of ec-encoded parent header")
diff --git a/object/types.go b/object/types.go
index c9a0519..7916b1e 100644
--- a/object/types.go
+++ b/object/types.go
@@ -40,13 +40,13 @@ type SplitHeader struct {
 }
 
 type ECHeader struct {
-	Parent           *refs.ObjectID
-	ParentSplitID    []byte
-	ParentSplitIndex uint32
-	Index            uint32
-	Total            uint32
-	Header           []byte
-	HeaderLength     uint32
+	Parent              *refs.ObjectID
+	ParentSplitID       []byte
+	ParentSplitParentID *refs.ObjectID
+	Index               uint32
+	Total               uint32
+	Header              []byte
+	HeaderLength        uint32
 }
 
 type Header struct {