From bc7b49eed23af4b5147745374bc1d9c94630440e Mon Sep 17 00:00:00 2001
From: Airat Arifullin <a.arifullin@yadro.com>
Date: Wed, 8 May 2024 15:03:29 +0300
Subject: [PATCH] [#82] object: Introduce new fields for EC header

* Regenerate protobufs as frostfs-api introduced `parent_split_id` and
  `parent_split_index` fields.
* Fix marshaller and converter for EC header.
* Extend v2 type `ECHeader` with `ParentSplitID` and `ParentSplitIndex` fields.
* Fix message_test for `Object`. Also generate EC headers and check it.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
---
 object/convert.go         |   4 ++++
 object/grpc/service.pb.go | Bin 148314 -> 148482 bytes
 object/grpc/types.pb.go   | Bin 49981 -> 51227 bytes
 object/marshal.go         |   8 ++++++-
 object/message_test.go    |   4 +++-
 object/test/generate.go   |  44 +++++++++++++++++++++++++++-----------
 object/types.go           |  14 ++++++------
 7 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/object/convert.go b/object/convert.go
index f19cc09d..5b4acda8 100644
--- a/object/convert.go
+++ b/object/convert.go
@@ -269,6 +269,8 @@ func (h *ECHeader) ToGRPCMessage() grpc.Message {
 		m = new(object.Header_EC)
 
 		m.Parent = h.Parent.ToGRPCMessage().(*refsGRPC.ObjectID)
+		m.ParentSplitId = h.ParentSplitID
+		m.ParentSplitIndex = h.ParentSplitIndex
 		m.Index = h.Index
 		m.Total = h.Total
 		m.Header = h.Header
@@ -300,6 +302,8 @@ func (h *ECHeader) FromGRPCMessage(m grpc.Message) error {
 		}
 	}
 
+	h.ParentSplitID = v.GetParentSplitId()
+	h.ParentSplitIndex = v.GetParentSplitIndex()
 	h.Index = v.GetIndex()
 	h.Total = v.GetTotal()
 	h.Header = v.GetHeader()
diff --git a/object/grpc/service.pb.go b/object/grpc/service.pb.go
index 2bfb50bc985ef472d9736ae98b1a7eae5cdcf766..75d359e9ab984896c3739f747c73fb16f8eb3b2f 100644
GIT binary patch
delta 185
zcmXwyu?oU46h(2YUvUR<(sp+h2PeT<ko5J{Mnh7P7r{wT5I@JwfAI%g`w6C^^Evn2
z*Dbr;v&XSJ1DIm8D)&q>W6E3Q*$OtpqDTl>){utbz5;YW5a+pqB67acb_a1-%+Wfd
z=``tO3#RR_qeQ$eqwv4i7g+j{XNi7np)7O-ql3WJP{t%;l%$W8r6$@#$giP$hHmg)
Fe*n;zK&=1(

delta 18
acmZqb;JnqwxuNVsv)sq+avvF=1OWh4@(CgU

diff --git a/object/grpc/types.pb.go b/object/grpc/types.pb.go
index 8f4f383cbac718b637f7954ac5a0bbc06faa5532..254e76d54648f5eea7ac4d52b6fc05b6b1be79a5 100644
GIT binary patch
delta 1417
zcmZ`%U2Icj7|u32*1GJEm32RE-*(uFSh}|CmrWD_k&uNMFiOa5&e~JjQO_wor?9|~
z7#4&X+S-S$uH8?&5$^=eOhh6mCjML)6K^zLEShkkiHV>WTnTvI?`*@wcysc-@AJOT
z&-b01=Zmt*q7Qx@I%{rkXFFA<1tq3LLq|h0Q-((*pT<He+p}w{8VQFqP4cslrm~P<
zlC@AEBt;25CMzdprYTGehb=_o3&!MQDic)}5u^H~lRY2PR?f69g#*kd%4}F-BDFQ9
z1cul_Qed0?ilj1G(O6Upi<(5dtMX4dIsHCeEU4@HL{(a0^>TaOke{hRB^LG*wJK@)
z{2+ILPYyoaZ<tvdb&RNr{EX4$+WU4pB2h(CwzV*VwzvFi0ZE6o)!?%0`DMQ}s(%g7
zYbu-tcaJn3>UJm*%^{1gODh7as<ilDVcz{;ZOzN|P;rRip15x5;n3gfz-r8J9bT_D
z)|<F5ynomUMJzTME{+EqS8<EsoBEg!I%ufI2u!*b^BIddDrvE(%v?+NhqqLfh%N_n
zjk?68&9VO4!a(OzApTvE)$MUu%&t*SmjUu`0OG|aTuYb>I|FdVTTGn+eF%f2R-{hb
z@aUaV{BWuYSL4-%di%jShSQ1CYMn{v_xK(Yxji~jC$`6JMD%T<wTujO^D!4OK1$TV
zd$F0M@YzH$OygE;N>^ezQCZ^QbiNJ@W@_->Ta2V)DFHXfnlY9(r{WeoH&a600&Oo6
z=WMuj;WaEQw&LzgDZa!uf^J`~!~XM4$c0PstbWc-I?;Zq9xqSW2$m=8xO2IOjt!Fn
zYE$(%GTBV!@e2dEG*U&!U*6t>CsK8EbcL(S+&zy2y1L<3ok&iV6PlY6(4*S%`;?W+
zg0z4GaWh6UR_sbQ!ZW@RC(`AHaT~5pRbk6`BYsSm7cl&m?kl5r=;o=rI~)vup4f_8
zZyd#|37$Qo+kTL?p>Em%N2UQ<vI!Mh+ghZ1(>5H)R_N(BVE6Qscrn9+jAR6zK9T7w
zCVH0}x8H2RUzuKV`2Dzmvu8FUkZq&#QdU4F<HXO|GAjSb(&mPlKJ0z>qYCb;tCzBO
zb<o>Y&I<S`VZ*@eCYt^xVaJYSHLe<^cd{O3$x3`U+la<FejhKT+HgH$gF45JP0kVh
zjk!MBzCS16)0`Q?Jb$)V<_Q~{=h$^#EE`2_j*uNWj-1K~5b_PUk>fWc=j<rT^VjUp
z3ozxah~@1>KbxnmFY<irAuoglUU(M>88?d07X%ai!U61GXt(%zRySpBUZklP7WvBZ
kNF8Pt&G=aV5x-unC;mGeFS%k|az`%)63(TQSH5ce2ehZ}Pyhe`

delta 778
zcmXYvT}V@L7{*a|VmpqVp&L`r{Ma0J(UQ%kx&DRT)RkmG5)@%2Nf&8;;_QQpWLB1)
z?U9^2({nbRTUSPl=sPMBgsgSZjZmzcq8rJZATsFu|LgAj-uHdp^SsYFvQ+duSak3E
zF;pHZMfSKZ^QUuDm-%q2u0-E;!d>GDc>I~aBfHBB{oNT7dS7H{XmIlePoT?(dc}r^
z6Sa69E63SsJwgLcypu}N8!Lln)`C}Ktymha)^%$Fc)~l-6Vc;zkAw61X+@3@T)ycn
zXh2S)0wXGCDv%4cVf!tAp*HYhhTv#OgfwNK_%&Jqf7Ah`pGS7O0(-93<5F-dT2&o#
z<NEvv!ONfkw``@jG2}+CEWk8n#-wbaC26P*E3&nq206Kw7TT2>+>u(0^d@gJJJ^eZ
zuxWx4@S$2fi?O#a#|T!h8wz*&upTLgJN^J`vnIOX$1FjyBBFIp^C;Q0OSFr|${<hj
zFoiqdoU1~e;=n%D!Fg$T=urqp0%kl`ED&yR_^33aFX+O`xDEWZVzjFweq9l8PGx6E
zD$)F|s?6_(O0Yj_{GWmedxN`Z$S@CZm>j6afp95uag!$a8E1l}unpT1F7&|wJ|SW~
zZpZC}18s1jJ;7rX0_G9|HWOCdpKx(Bh(`4H+OR&j1&8NFZPm~`TNRn7Mn2`?H-n}H
z);Y33JJWf1x<Is#Vudj&(0uGkg11RK-$=u4^wIz>Ch7Q-B-4IjATBa!S)`o{c~BXA
z&O<?pU@c`wHo$RB><2oTqO(eh3Exl%r`fYBP4MW9i1TR!h9gcS(;`Nr0<vkA=eIQB
UG%G$oItQz@(9M~SyUSJo09@B0_W%F@

diff --git a/object/marshal.go b/object/marshal.go
index a8d399cb..fa2de95a 100644
--- a/object/marshal.go
+++ b/object/marshal.go
@@ -31,6 +31,8 @@ const (
 	ecHdrTotalField        = 3
 	ecHdrHeaderLengthField = 4
 	ecHdrHeaderField       = 5
+	ecHdrParentSplitID     = 6
+	ecHdrParentSplitIndex  = 7
 
 	hdrVersionField         = 1
 	hdrContainerIDField     = 2
@@ -260,7 +262,9 @@ func (h *ECHeader) StableMarshal(buf []byte) []byte {
 	offset += proto.UInt32Marshal(ecHdrIndexField, buf[offset:], h.Index)
 	offset += proto.UInt32Marshal(ecHdrTotalField, buf[offset:], h.Total)
 	offset += proto.UInt32Marshal(ecHdrHeaderLengthField, buf[offset:], h.HeaderLength)
-	proto.BytesMarshal(ecHdrHeaderField, buf[offset:], h.Header)
+	offset += proto.BytesMarshal(ecHdrHeaderField, buf[offset:], h.Header)
+	offset += proto.BytesMarshal(ecHdrParentSplitID, buf[offset:], h.ParentSplitID)
+	proto.UInt32Marshal(ecHdrParentSplitIndex, buf[offset:], h.ParentSplitIndex)
 	return buf
 }
 
@@ -274,6 +278,8 @@ func (h *ECHeader) StableSize() (size int) {
 	size += proto.UInt32Size(ecHdrTotalField, h.Total)
 	size += proto.UInt32Size(ecHdrHeaderLengthField, h.HeaderLength)
 	size += proto.BytesSize(ecHdrHeaderField, h.Header)
+	size += proto.BytesSize(ecHdrParentSplitID, h.ParentSplitID)
+	size += proto.UInt32Size(ecHdrParentSplitIndex, h.ParentSplitIndex)
 
 	return size
 }
diff --git a/object/message_test.go b/object/message_test.go
index e675f498..749c3733 100644
--- a/object/message_test.go
+++ b/object/message_test.go
@@ -13,7 +13,9 @@ func TestMessageConvert(t *testing.T) {
 		func(empty bool) message.Message { return objecttest.GenerateShortHeader(empty) },
 		func(empty bool) message.Message { return objecttest.GenerateAttribute(empty) },
 		func(empty bool) message.Message { return objecttest.GenerateSplitHeader(empty) },
-		func(empty bool) message.Message { return objecttest.GenerateHeader(empty) },
+		func(empty bool) message.Message { return objecttest.GenerateHeaderWithSplitHeader(empty) },
+		func(empty bool) message.Message { return objecttest.GenerateHeaderWithECHeader(empty) },
+		func(empty bool) message.Message { return objecttest.GenerateECHeader(empty) },
 		func(empty bool) message.Message { return objecttest.GenerateObject(empty) },
 		func(empty bool) message.Message { return objecttest.GenerateSplitInfo(empty) },
 		func(empty bool) message.Message { return objecttest.GenerateECInfo(empty) },
diff --git a/object/test/generate.go b/object/test/generate.go
index b107023f..bb774cc2 100644
--- a/object/test/generate.go
+++ b/object/test/generate.go
@@ -68,17 +68,41 @@ func generateSplitHeader(empty, withPar bool) *object.SplitHeader {
 	m.SetParentSignature(refstest.GenerateSignature(empty))
 
 	if withPar {
-		m.SetParentHeader(generateHeader(empty, false))
+		m.SetParentHeader(GenerateHeaderWithSplitHeader(empty))
 	}
 
 	return m
 }
 
-func GenerateHeader(empty bool) *object.Header {
-	return generateHeader(empty, true)
+func GenerateHeaderWithSplitHeader(empty bool) *object.Header {
+	m := generateHeader(empty)
+	m.SetSplit(generateSplitHeader(empty, false))
+	return m
 }
 
-func generateHeader(empty, withSplit bool) *object.Header {
+func GenerateHeaderWithECHeader(empty bool) *object.Header {
+	m := generateHeader(empty)
+	m.SetEC(GenerateECHeader(empty))
+	return m
+}
+
+func GenerateECHeader(empty bool) *object.ECHeader {
+	ech := new(object.ECHeader)
+
+	if !empty {
+		ech.Parent = refstest.GenerateObjectID(empty)
+		ech.ParentSplitID = []byte{1, 2, 3}
+		ech.ParentSplitIndex = 1
+		ech.Index = 0
+		ech.Total = 2
+		ech.Header = []byte("chunk of ec-encoded parent header")
+		ech.HeaderLength = uint32(2 * len(ech.Header))
+	}
+
+	return ech
+}
+
+func generateHeader(empty bool) *object.Header {
 	m := new(object.Header)
 
 	if !empty {
@@ -95,10 +119,6 @@ func generateHeader(empty, withSplit bool) *object.Header {
 	m.SetHomomorphicHash(refstest.GenerateChecksum(empty))
 	m.SetSessionToken(sessiontest.GenerateSessionToken(empty))
 
-	if withSplit {
-		m.SetSplit(generateSplitHeader(empty, false))
-	}
-
 	return m
 }
 
@@ -106,7 +126,7 @@ func GenerateHeaderWithSignature(empty bool) *object.HeaderWithSignature {
 	m := new(object.HeaderWithSignature)
 
 	m.SetSignature(refstest.GenerateSignature(empty))
-	m.SetHeader(GenerateHeader(empty))
+	m.SetHeader(GenerateHeaderWithSplitHeader(empty))
 
 	return m
 }
@@ -120,7 +140,7 @@ func GenerateObject(empty bool) *object.Object {
 	}
 
 	m.SetSignature(refstest.GenerateSignature(empty))
-	m.SetHeader(GenerateHeader(empty))
+	m.SetHeader(GenerateHeaderWithSplitHeader(empty))
 
 	return m
 }
@@ -194,7 +214,7 @@ func GenerateGetObjectPartInit(empty bool) *object.GetObjectPartInit {
 	}
 
 	m.SetSignature(refstest.GenerateSignature(empty))
-	m.SetHeader(GenerateHeader(empty))
+	m.SetHeader(GenerateHeaderWithSplitHeader(empty))
 
 	return m
 }
@@ -248,7 +268,7 @@ func GeneratePutObjectPartInit(empty bool) *object.PutObjectPartInit {
 	}
 
 	m.SetSignature(refstest.GenerateSignature(empty))
-	m.SetHeader(GenerateHeader(empty))
+	m.SetHeader(GenerateHeaderWithSplitHeader(empty))
 
 	return m
 }
diff --git a/object/types.go b/object/types.go
index 4588f132..78c8d433 100644
--- a/object/types.go
+++ b/object/types.go
@@ -40,12 +40,14 @@ type SplitHeader struct {
 }
 
 type ECHeader struct {
-	Parent       *refs.ObjectID
-	Index        uint32
-	Total        uint32
-	Header       []byte
-	HeaderLength uint32
-	Signature    []byte
+	Parent           *refs.ObjectID
+	ParentSplitID    []byte
+	ParentSplitIndex uint32
+	Index            uint32
+	Total            uint32
+	Header           []byte
+	HeaderLength     uint32
+	Signature        []byte
 }
 
 type Header struct {