forked from TrueCloudLab/frostfs-sdk-go
[#317] api: Revert easyproto marshaler usage
It has caused a noticeable degradation in node. Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
bab4d5a692
commit
328d214d2d
110 changed files with 47773 additions and 37555 deletions
|
@ -142,24 +142,24 @@ func (a *Attribute) FromGRPCMessage(m grpc.Message) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func AttributesToGRPC(xs []Attribute) (res []object.Header_Attribute) {
|
||||
func AttributesToGRPC(xs []Attribute) (res []*object.Header_Attribute) {
|
||||
if xs != nil {
|
||||
res = make([]object.Header_Attribute, 0, len(xs))
|
||||
res = make([]*object.Header_Attribute, 0, len(xs))
|
||||
|
||||
for i := range xs {
|
||||
res = append(res, *xs[i].ToGRPCMessage().(*object.Header_Attribute))
|
||||
res = append(res, xs[i].ToGRPCMessage().(*object.Header_Attribute))
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func AttributesFromGRPC(xs []object.Header_Attribute) (res []Attribute, err error) {
|
||||
func AttributesFromGRPC(xs []*object.Header_Attribute) (res []Attribute, err error) {
|
||||
if xs != nil {
|
||||
res = make([]Attribute, len(xs))
|
||||
|
||||
for i := range xs {
|
||||
err = res[i].FromGRPCMessage(&xs[i])
|
||||
err = res[i].FromGRPCMessage(xs[i])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
@ -266,14 +266,14 @@ func (h *ECHeader) ToGRPCMessage() grpc.Message {
|
|||
if h != nil {
|
||||
m = new(object.Header_EC)
|
||||
|
||||
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
|
||||
m.HeaderLength = h.HeaderLength
|
||||
m.SetParent(h.Parent.ToGRPCMessage().(*refsGRPC.ObjectID))
|
||||
m.SetParentSplitId(h.ParentSplitID)
|
||||
m.SetParentSplitParentId(h.ParentSplitParentID.ToGRPCMessage().(*refsGRPC.ObjectID))
|
||||
m.SetParentAttributes(AttributesToGRPC(h.ParentAttributes))
|
||||
m.SetIndex(h.Index)
|
||||
m.SetTotal(h.Total)
|
||||
m.SetHeader(h.Header)
|
||||
m.SetHeaderLength(h.HeaderLength)
|
||||
}
|
||||
|
||||
return m
|
||||
|
@ -681,9 +681,9 @@ func (s *ECInfo) ToGRPCMessage() grpc.Message {
|
|||
m = new(object.ECInfo)
|
||||
|
||||
if s.Chunks != nil {
|
||||
chunks := make([]object.ECInfo_Chunk, len(s.Chunks))
|
||||
chunks := make([]*object.ECInfo_Chunk, len(s.Chunks))
|
||||
for i := range chunks {
|
||||
chunks[i] = *s.Chunks[i].ToGRPCMessage().(*object.ECInfo_Chunk)
|
||||
chunks[i] = s.Chunks[i].ToGRPCMessage().(*object.ECInfo_Chunk)
|
||||
}
|
||||
m.Chunks = chunks
|
||||
}
|
||||
|
@ -704,7 +704,7 @@ func (s *ECInfo) FromGRPCMessage(m grpc.Message) error {
|
|||
} else {
|
||||
s.Chunks = make([]ECChunk, len(chunks))
|
||||
for i := range chunks {
|
||||
if err := s.Chunks[i].FromGRPCMessage(&chunks[i]); err != nil {
|
||||
if err := s.Chunks[i].FromGRPCMessage(chunks[i]); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -718,9 +718,9 @@ func (c *ECChunk) ToGRPCMessage() grpc.Message {
|
|||
if c != nil {
|
||||
m = new(object.ECInfo_Chunk)
|
||||
|
||||
m.Total = c.Total
|
||||
m.Index = c.Index
|
||||
m.Id = c.ID.ToGRPCMessage().(*refsGRPC.ObjectID)
|
||||
m.SetTotal(c.Total)
|
||||
m.SetIndex(c.Index)
|
||||
m.SetId(c.ID.ToGRPCMessage().(*refsGRPC.ObjectID))
|
||||
}
|
||||
|
||||
return m
|
||||
|
@ -735,8 +735,8 @@ func (c *ECChunk) FromGRPCMessage(m grpc.Message) error {
|
|||
if err := c.ID.FromGRPCMessage(v.GetId()); err != nil {
|
||||
return err
|
||||
}
|
||||
c.Index = v.Index
|
||||
c.Total = v.Total
|
||||
c.Index = v.GetIndex()
|
||||
c.Total = v.GetTotal()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -888,8 +888,7 @@ func (r *GetObjectPartChunk) ToGRPCMessage() grpc.Message {
|
|||
|
||||
if r != nil {
|
||||
m = new(object.GetResponse_Body_Chunk)
|
||||
|
||||
m.SetChunk(r.chunk)
|
||||
m.Chunk = r.chunk
|
||||
}
|
||||
|
||||
return m
|
||||
|
@ -901,7 +900,7 @@ func (r *GetObjectPartChunk) FromGRPCMessage(m grpc.Message) error {
|
|||
return message.NewUnexpectedMessageType(m, v)
|
||||
}
|
||||
|
||||
r.chunk = v.GetChunk()
|
||||
r.chunk = v.Chunk
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -918,7 +917,7 @@ func (r *GetResponseBody) ToGRPCMessage() grpc.Message {
|
|||
case *GetObjectPartInit:
|
||||
m.SetInit(t.ToGRPCMessage().(*object.GetResponse_Body_Init))
|
||||
case *GetObjectPartChunk:
|
||||
m.SetChunk(t.ToGRPCMessage().(*object.GetResponse_Body_Chunk))
|
||||
m.SetChunk(t.ToGRPCMessage().(*object.GetResponse_Body_Chunk).Chunk)
|
||||
case *SplitInfo:
|
||||
m.SetSplitInfo(t.ToGRPCMessage().(*object.SplitInfo))
|
||||
case *ECInfo:
|
||||
|
@ -1088,7 +1087,7 @@ func (r *PutObjectPartChunk) ToGRPCMessage() grpc.Message {
|
|||
if r != nil {
|
||||
m = new(object.PutRequest_Body_Chunk)
|
||||
|
||||
m.SetChunk(r.chunk)
|
||||
m.Chunk = r.chunk
|
||||
}
|
||||
|
||||
return m
|
||||
|
@ -1100,7 +1099,7 @@ func (r *PutObjectPartChunk) FromGRPCMessage(m grpc.Message) error {
|
|||
return message.NewUnexpectedMessageType(m, v)
|
||||
}
|
||||
|
||||
r.chunk = v.GetChunk()
|
||||
r.chunk = v.Chunk
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -1117,7 +1116,7 @@ func (r *PutRequestBody) ToGRPCMessage() grpc.Message {
|
|||
case *PutObjectPartInit:
|
||||
m.SetInit(t.ToGRPCMessage().(*object.PutRequest_Body_Init))
|
||||
case *PutObjectPartChunk:
|
||||
m.SetChunk(t.ToGRPCMessage().(*object.PutRequest_Body_Chunk))
|
||||
m.SetChunk(t.ToGRPCMessage().(*object.PutRequest_Body_Chunk).Chunk)
|
||||
default:
|
||||
panic(fmt.Sprintf("unknown put object part %T", t))
|
||||
}
|
||||
|
@ -1624,24 +1623,24 @@ func (f *SearchFilter) FromGRPCMessage(m grpc.Message) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func SearchFiltersToGRPC(fs []SearchFilter) (res []object.SearchRequest_Body_Filter) {
|
||||
func SearchFiltersToGRPC(fs []SearchFilter) (res []*object.SearchRequest_Body_Filter) {
|
||||
if fs != nil {
|
||||
res = make([]object.SearchRequest_Body_Filter, 0, len(fs))
|
||||
res = make([]*object.SearchRequest_Body_Filter, 0, len(fs))
|
||||
|
||||
for i := range fs {
|
||||
res = append(res, *fs[i].ToGRPCMessage().(*object.SearchRequest_Body_Filter))
|
||||
res = append(res, fs[i].ToGRPCMessage().(*object.SearchRequest_Body_Filter))
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func SearchFiltersFromGRPC(fs []object.SearchRequest_Body_Filter) (res []SearchFilter, err error) {
|
||||
func SearchFiltersFromGRPC(fs []*object.SearchRequest_Body_Filter) (res []SearchFilter, err error) {
|
||||
if fs != nil {
|
||||
res = make([]SearchFilter, len(fs))
|
||||
|
||||
for i := range fs {
|
||||
err = res[i].FromGRPCMessage(&fs[i])
|
||||
err = res[i].FromGRPCMessage(fs[i])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
@ -1823,24 +1822,24 @@ func (r *Range) FromGRPCMessage(m grpc.Message) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func RangesToGRPC(rs []Range) (res []object.Range) {
|
||||
func RangesToGRPC(rs []Range) (res []*object.Range) {
|
||||
if rs != nil {
|
||||
res = make([]object.Range, 0, len(rs))
|
||||
res = make([]*object.Range, 0, len(rs))
|
||||
|
||||
for i := range rs {
|
||||
res = append(res, *rs[i].ToGRPCMessage().(*object.Range))
|
||||
res = append(res, rs[i].ToGRPCMessage().(*object.Range))
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func RangesFromGRPC(rs []object.Range) (res []Range, err error) {
|
||||
func RangesFromGRPC(rs []*object.Range) (res []Range, err error) {
|
||||
if rs != nil {
|
||||
res = make([]Range, len(rs))
|
||||
|
||||
for i := range rs {
|
||||
err = res[i].FromGRPCMessage(&rs[i])
|
||||
err = res[i].FromGRPCMessage(rs[i])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
@ -1949,7 +1948,7 @@ func (r *GetRangePartChunk) ToGRPCMessage() grpc.Message {
|
|||
if r != nil {
|
||||
m = new(object.GetRangeResponse_Body_Chunk)
|
||||
|
||||
m.SetChunk(r.chunk)
|
||||
m.Chunk = r.chunk
|
||||
}
|
||||
|
||||
return m
|
||||
|
@ -1961,7 +1960,7 @@ func (r *GetRangePartChunk) FromGRPCMessage(m grpc.Message) error {
|
|||
return message.NewUnexpectedMessageType(m, v)
|
||||
}
|
||||
|
||||
r.chunk = v.GetChunk()
|
||||
r.chunk = v.Chunk
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -1976,7 +1975,7 @@ func (r *GetRangeResponseBody) ToGRPCMessage() grpc.Message {
|
|||
case nil:
|
||||
m.RangePart = nil
|
||||
case *GetRangePartChunk:
|
||||
m.SetChunk(v.ToGRPCMessage().(*object.GetRangeResponse_Body_Chunk))
|
||||
m.SetChunk(v.ToGRPCMessage().(*object.GetRangeResponse_Body_Chunk).Chunk)
|
||||
case *SplitInfo:
|
||||
m.SetSplitInfo(v.ToGRPCMessage().(*object.SplitInfo))
|
||||
case *ECInfo:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue