From 2f6d3209e1d3087b480f85a252ea5c9970e68e8e Mon Sep 17 00:00:00 2001
From: Airat Arifullin <a.arifullin@yadro.com>
Date: Mon, 27 May 2024 12:13:49 +0300
Subject: [PATCH] [#84] object: Regenerate EC-header type

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
---
 object/convert.go       |   5 +++++
 object/grpc/types.pb.go | Bin 51762 -> 52660 bytes
 object/marshal.go       |   9 ++++++++-
 object/test/generate.go |   1 +
 object/types.go         |   1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/object/convert.go b/object/convert.go
index 99047dc..6e8ecff 100644
--- a/object/convert.go
+++ b/object/convert.go
@@ -271,6 +271,7 @@ func (h *ECHeader) ToGRPCMessage() grpc.Message {
 		m.Parent = h.Parent.ToGRPCMessage().(*refsGRPC.ObjectID)
 		m.ParentSplitId = h.ParentSplitID
 		m.ParentSplitParentId = h.ParentSplitParentID.ToGRPCMessage().(*refsGRPC.ObjectID)
+		m.ParentAttributes = AttributesToGRPC(h.ParentAttributes)
 		m.Index = h.Index
 		m.Total = h.Total
 		m.Header = h.Header
@@ -318,6 +319,10 @@ func (h *ECHeader) FromGRPCMessage(m grpc.Message) error {
 		}
 	}
 
+	if h.ParentAttributes, err = AttributesFromGRPC(v.GetParentAttributes()); 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 3cb44a3dc5c5cc4e35e99aa51b929af2f8cf9940..16736e9f599d66bbc646f79c817aa20229aed7de 100644
GIT binary patch
delta 1156
zcmZWoOH30{6pcj+Gkj8hrF?{`QK34@bUL(!@CgcWp)r^cO?5$w6vb$1U{o|L2nre$
zrJfoB6ex&*_z7C0iK4hPaUm-g#)KGMm>54BjXQnsO+g}?$(;M{Ip>{s-+LI0c{Cg|
zx8UB+6%`3Jy9B?d)$3CW+60fPwl+7MQoU_Ec&?UJt5!;=vSi?=kRm(9R<B?5c}{xE
zHD>)ko_M^i#TPBFq8jRr{J$m`>I4W4>mzU7pJL%|%#3ATP%IUOHLljIw8+z@EvfM(
zvM5OHQbXi(ds&vw>xgW*9@eK@SygFbYaaTwT4C<XM+@|No|D>(o6y-)g}Sa(T<MNS
zT*#o4Wjq+zhPiP)#{3zm^>OHE%f*lJIJ~~J6+3&<bv%cm9zj<uBd2dO(c;!ADDN(d
zmzmuW1s}p`Xt-=bg=zpdxSta8Msu)u#u?Ss)6$223r4Qk*+wKM{GEm9yqSmtLj|ZA
zE<{3aKHUC9EDj|@x>$<u{W-}bL9vbIu$PEL;ZUE5eOKe44vX<Lj)QCfGs7;}Ix;ag
zAg-hcshe4X%ONLqHuq#>DO5v$zXfx!a3c}l1A6=pS<o@UF)7JPr20l&v?mZK!Mk1)
z?OX4lzJY*%=Fv*j!iX26dr)|x2tWF>Ng6G4(ohDjjg@K1Ja`h`2ql<L@@Fq6A+3ox
z7Rn`w(=Z>FHBUS7{1tXFp2LPWy_q;MUXAwyxnvHTNCGokvNz%WX(P5z)G%6cBcYv}
zaKSzJl9$Q;*zpJ$xyg248%)O%Y^a<x(J*3gH^P%9&5+y)yqt7tGW77ww=|$o&=mz%
ziGYvGfO4v*q8u^|+?rxOC#MT=cRCwY(|Jsfv5rnh^^TCnSIfXlfMsTtZEqB?0e*=B
zg^KUJt+mNC<h|Q2_{Vq{W)H^Fm<k?rXX5;<b`A<1+2X9$Zzq>NV!abKa1K!r$WxY`
zNV%T|;ZYnao^c7Qo+UaXCj5DvoWAlVdCp2kK}jWy^!1rN$wm%=R1VvuQkw*6e(Rdb
ohOB0v|CCy<p7ncq?*D!xzRdG@KA*6LM_2N6Ow<@LKTk>e3;RHe2><{9

delta 846
zcmZuvOH30{6iuK^p=k@WrY$Nss3Am~FrBtjMvQ_+Lt<h|qKk>qP!U{-c7Zl30TL5%
zL0fyO6`@~RD@qMGt~7BPHYO$pSFRgZVj_0wLWA?(bcdVw=G=SkIrrT=Zx`#|#Ov3T
zVYFYc$`1nH8|1C)U6#fXmy_i}TtK$pJ>FI)3i3r{7*rPBD33E>O9mWT8iIdPhxgdf
z^*Rkr$j)@Z@YI6a$xejBOr07^CnfySKG%ao7>t;aNOof~qDMI8#9ETFHc}FzMFwBO
zt*GDxqH`8hpPhy2ksh0AbEDdb;35vq2|NCzPvLyD9otWg=m3Ko8J-Y0N+@O|C^0Hp
zP3%P_)`q@p7g*FnEFNY>Lice*?^9N#Pcv{uY+zFyHs|-zr)@15k;$E*x&cD`nUm0;
zrXuS>zshSSuk$Bam8QqnWvvB)P+Rg6rVErB%uBIZ1}E>^Fm>}VQfWP`d6qFWaUp&b
zslq`>1vfGAUL%$9f`r_Z9Xp}k*sKGkdCAO^B?zLLRWA?vi~FI(JMsIuBQ~Mak*e6^
z0Z2s$%0+4!P~p3x!$>AVIwuzf7P?WL=&*BFwVl$_M@}zKjQd_lqzexPOB!&|0sXB3
zI)p1Ll;(Al8l?t21h6k@Myr|8fM<kczSY1e0jFPS0@Nq30Ureot6B$CdQ1a69m>a5
z3BwEYZJ)<k43<P4X%&~}97vYviad1nKT1?W7*n0(bFVWk^)A7Q?GJ6ZB^z;1Ibz~P
rC)?A*UgE`Lyodv38+H`+2UAS{%~*FukM4@FxKrL!r-{kS<yO-_>Cqsy

diff --git a/object/marshal.go b/object/marshal.go
index bf8fcb9..f96b098 100644
--- a/object/marshal.go
+++ b/object/marshal.go
@@ -33,6 +33,7 @@ const (
 	ecHdrHeaderField         = 5
 	ecHdrParentSplitID       = 6
 	ecHdrParentSplitParentID = 7
+	ecHdrParentAttributes    = 8
 
 	hdrVersionField         = 1
 	hdrContainerIDField     = 2
@@ -264,7 +265,10 @@ 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.NestedStructureMarshal(ecHdrParentSplitParentID, buf[offset:], h.ParentSplitParentID)
+	offset += proto.NestedStructureMarshal(ecHdrParentSplitParentID, buf[offset:], h.ParentSplitParentID)
+	for i := range h.ParentAttributes {
+		offset += proto.NestedStructureMarshal(ecHdrParentAttributes, buf[offset:], &h.ParentAttributes[i])
+	}
 	return buf
 }
 
@@ -280,6 +284,9 @@ func (h *ECHeader) StableSize() (size int) {
 	size += proto.BytesSize(ecHdrHeaderField, h.Header)
 	size += proto.BytesSize(ecHdrParentSplitID, h.ParentSplitID)
 	size += proto.NestedStructureSize(ecHdrParentSplitParentID, h.ParentSplitParentID)
+	for i := range h.ParentAttributes {
+		size += proto.NestedStructureSize(ecHdrParentAttributes, &h.ParentAttributes[i])
+	}
 
 	return size
 }
diff --git a/object/test/generate.go b/object/test/generate.go
index 95c76e5..b1931fc 100644
--- a/object/test/generate.go
+++ b/object/test/generate.go
@@ -93,6 +93,7 @@ func GenerateECHeader(empty bool) *object.ECHeader {
 		ech.Parent = refstest.GenerateObjectID(empty)
 		ech.ParentSplitID = []byte{1, 2, 3}
 		ech.ParentSplitParentID = refstest.GenerateObjectID(empty)
+		ech.ParentAttributes = GenerateAttributes(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 7916b1e..43caf80 100644
--- a/object/types.go
+++ b/object/types.go
@@ -43,6 +43,7 @@ type ECHeader struct {
 	Parent              *refs.ObjectID
 	ParentSplitID       []byte
 	ParentSplitParentID *refs.ObjectID
+	ParentAttributes    []Attribute
 	Index               uint32
 	Total               uint32
 	Header              []byte