TrueCloudLab/frostfs-api-go
20
0
Fork 16
Code Issues 10 Pull requests 1 Projects Releases Activity Actions

[#84] object: Regenerate EC-header type

Browse source 
Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
This commit is contained in:
Airat Arifullin 2024-05-27 12:13:49 +03:00 committed by Evgenii Stratonikov
parent 9e825239ac
commit 2f6d3209e1
5 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
object/convert.go
View file

@ -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()

BIN
object/grpc/types.pb.go generated
View file

Binary file not shown.

9
object/marshal.go
View file

@ -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
}

1
object/test/generate.go
View file

@ -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")

1
object/types.go
View file

@ -43,6 +43,7 @@ type ECHeader struct {
Parent *refs.ObjectID
ParentSplitID []byte
ParentSplitParentID *refs.ObjectID
ParentAttributes []Attribute
Index uint32
Total uint32
Header []byte