realloc/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move version and signature structures to refs package

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-08-20 12:43:47 +03:00 • committed by Stanislav Bogatyrev
parent f1addc4cc5
commit db12420c99
16 changed files with 363 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

24
v2/object/convert.go
View file

@ -33,7 +33,7 @@ func ShortHeaderToGRPCMessage(h *ShortHeader) *object.ShortHeader {
m := new(object.ShortHeader)
m.SetVersion(
service.VersionToGRPCMessage(h.GetVersion()),
refs.VersionToGRPCMessage(h.GetVersion()),
)
m.SetCreationEpoch(h.GetCreationEpoch())
@ -59,7 +59,7 @@ func ShortHeaderFromGRPCMessage(m *object.ShortHeader) *ShortHeader {
h := new(ShortHeader)
h.SetVersion(
service.VersionFromGRPCMessage(m.GetVersion()),
refs.VersionFromGRPCMessage(m.GetVersion()),
)
h.SetCreationEpoch(m.GetCreationEpoch())
@ -119,7 +119,7 @@ func SplitHeaderToGRPCMessage(h *SplitHeader) *object.Header_Split {
)
m.SetParentSignature(
service.SignatureToGRPCMessage(h.GetParentSignature()),
refs.SignatureToGRPCMessage(h.GetParentSignature()),
)
m.SetParentHeader(
@ -154,7 +154,7 @@ func SplitHeaderFromGRPCMessage(m *object.Header_Split) *SplitHeader {
)
h.SetParentSignature(
service.SignatureFromGRPCMessage(m.GetParentSignature()),
refs.SignatureFromGRPCMessage(m.GetParentSignature()),
)
h.SetParentHeader(
@ -181,7 +181,7 @@ func HeaderToGRPCMessage(h *Header) *object.Header {
m := new(object.Header)
m.SetVersion(
service.VersionToGRPCMessage(h.GetVersion()),
refs.VersionToGRPCMessage(h.GetVersion()),
)
m.SetContainerId(
@ -236,7 +236,7 @@ func HeaderFromGRPCMessage(m *object.Header) *Header {
h := new(Header)
h.SetVersion(
service.VersionFromGRPCMessage(m.GetVersion()),
refs.VersionFromGRPCMessage(m.GetVersion()),
)
h.SetContainerID(
@ -295,7 +295,7 @@ func ObjectToGRPCMessage(o *Object) *object.Object {
)
m.SetSignature(
service.SignatureToGRPCMessage(o.GetSignature()),
refs.SignatureToGRPCMessage(o.GetSignature()),
)
m.SetHeader(
@ -319,7 +319,7 @@ func ObjectFromGRPCMessage(m *object.Object) *Object {
)
o.SetSignature(
service.SignatureFromGRPCMessage(m.GetSignature()),
refs.SignatureFromGRPCMessage(m.GetSignature()),
)
o.SetHeader(
@ -407,7 +407,7 @@ func GetObjectPartInitToGRPCMessage(r *GetObjectPartInit) *object.GetResponse_Bo
)
m.SetSignature(
service.SignatureToGRPCMessage(r.GetSignature()),
refs.SignatureToGRPCMessage(r.GetSignature()),
)
m.SetHeader(
@ -429,7 +429,7 @@ func GetObjectPartInitFromGRPCMessage(m *object.GetResponse_Body_Init) *GetObjec
)
r.SetSignature(
service.SignatureFromGRPCMessage(m.GetSignature()),
refs.SignatureFromGRPCMessage(m.GetSignature()),
)
r.SetHeader(
@ -555,7 +555,7 @@ func PutObjectPartInitToGRPCMessage(r *PutObjectPartInit) *object.PutRequest_Bod
)
m.SetSignature(
service.SignatureToGRPCMessage(r.GetSignature()),
refs.SignatureToGRPCMessage(r.GetSignature()),
)
m.SetHeader(
@ -579,7 +579,7 @@ func PutObjectPartInitFromGRPCMessage(m *object.PutRequest_Body_Init) *PutObject
)
r.SetSignature(
service.SignatureFromGRPCMessage(m.GetSignature()),
refs.SignatureFromGRPCMessage(m.GetSignature()),
)
r.SetHeader(

4
v2/object/grpc/service.go
View file

@ -48,7 +48,7 @@ func (m *GetResponse_Body_Init) SetObjectId(v *refs.ObjectID) {
}
// SetSignature sets signature of the object identifier.
func (m *GetResponse_Body_Init) SetSignature(v *service.Signature) {
func (m *GetResponse_Body_Init) SetSignature(v *refs.Signature) {
if m != nil {
m.Signature = v
}
@ -122,7 +122,7 @@ func (m *PutRequest_Body_Init) SetObjectId(v *refs.ObjectID) {
}
// SetSignature sets signature of the object identifier.
func (m *PutRequest_Body_Init) SetSignature(v *service.Signature) {
func (m *PutRequest_Body_Init) SetSignature(v *refs.Signature) {
if m != nil {
m.Signature = v
}

8
v2/object/grpc/types.go
View file

@ -34,7 +34,7 @@ func (m *Header_Split) SetPrevious(v *refs.ObjectID) {
}
// SetParentSignature sets signature of the parent object header.
func (m *Header_Split) SetParentSignature(v *service.Signature) {
func (m *Header_Split) SetParentSignature(v *refs.Signature) {
if m != nil {
m.ParentSignature = v
}
@ -76,7 +76,7 @@ func (m *Header) SetCreationEpoch(v uint64) {
}
// SetVersion sets version of the object format.
func (m *Header) SetVersion(v *service.Version) {
func (m *Header) SetVersion(v *refs.Version) {
if m != nil {
m.Version = v
}
@ -139,7 +139,7 @@ func (m *Object) SetObjectId(v *refs.ObjectID) {
}
// SetSignature sets signature of the object identifier.
func (m *Object) SetSignature(v *service.Signature) {
func (m *Object) SetSignature(v *refs.Signature) {
if m != nil {
m.Signature = v
}
@ -160,7 +160,7 @@ func (m *Object) SetPayload(v []byte) {
}
// SetVersion sets version of the object.
func (m *ShortHeader) SetVersion(v *service.Version) {
func (m *ShortHeader) SetVersion(v *refs.Version) {
if m != nil {
m.Version = v
}

8
v2/object/marshal_test.go
View file

@ -381,16 +381,16 @@ func generateContainerID(id string) *refs.ContainerID {
return cid
}
func generateSignature(k, v string) *service.Signature {
sig := new(service.Signature)
func generateSignature(k, v string) *refs.Signature {
sig := new(refs.Signature)
sig.SetKey([]byte(k))
sig.SetSign([]byte(v))
return sig
}
func generateVersion(maj, min uint32) *service.Version {
version := new(service.Version)
func generateVersion(maj, min uint32) *refs.Version {
version := new(refs.Version)
version.SetMajor(maj)
version.SetMinor(min)

36
v2/object/types.go
View file

@ -10,7 +10,7 @@ type Type uint32
type MatchType uint32
type ShortHeader struct {
version *service.Version
version *refs.Version
creatEpoch uint64
@ -28,7 +28,7 @@ type Attribute struct {
type SplitHeader struct {
par, prev *refs.ObjectID
parSig *service.Signature
parSig *refs.Signature
parHdr *Header
@ -36,7 +36,7 @@ type SplitHeader struct {
}
type Header struct {
version *service.Version
version *refs.Version
cid *refs.ContainerID
@ -60,7 +60,7 @@ type Header struct {
type Object struct {
objectID *refs.ObjectID
idSig *service.Signature
idSig *refs.Signature
header *Header
@ -88,7 +88,7 @@ type GetObjectPart interface {
type GetObjectPartInit struct {
id *refs.ObjectID
sig *service.Signature
sig *refs.Signature
hdr *Header
}
@ -116,7 +116,7 @@ type PutObjectPart interface {
type PutObjectPartInit struct {
id *refs.ObjectID
sig *service.Signature
sig *refs.Signature
hdr *Header
@ -318,7 +318,7 @@ const (
MatchStringEqual
)
func (h *ShortHeader) GetVersion() *service.Version {
func (h *ShortHeader) GetVersion() *refs.Version {
if h != nil {
return h.version
}
@ -326,7 +326,7 @@ func (h *ShortHeader) GetVersion() *service.Version {
return nil
}
func (h *ShortHeader) SetVersion(v *service.Version) {
func (h *ShortHeader) SetVersion(v *refs.Version) {
if h != nil {
h.version = v
}
@ -444,7 +444,7 @@ func (h *SplitHeader) SetPrevious(v *refs.ObjectID) {
}
}
func (h *SplitHeader) GetParentSignature() *service.Signature {
func (h *SplitHeader) GetParentSignature() *refs.Signature {
if h != nil {
return h.parSig
}
@ -452,7 +452,7 @@ func (h *SplitHeader) GetParentSignature() *service.Signature {
return nil
}
func (h *SplitHeader) SetParentSignature(v *service.Signature) {
func (h *SplitHeader) SetParentSignature(v *refs.Signature) {
if h != nil {
h.parSig = v
}
@ -486,7 +486,7 @@ func (h *SplitHeader) SetChildren(v []*refs.ObjectID) {
}
}
func (h *Header) GetVersion() *service.Version {
func (h *Header) GetVersion() *refs.Version {
if h != nil {
return h.version
}
@ -494,7 +494,7 @@ func (h *Header) GetVersion() *service.Version {
return nil
}
func (h *Header) SetVersion(v *service.Version) {
func (h *Header) SetVersion(v *refs.Version) {
if h != nil {
h.version = v
}
@ -654,7 +654,7 @@ func (o *Object) SetObjectID(v *refs.ObjectID) {
}
}
func (o *Object) GetSignature() *service.Signature {
func (o *Object) GetSignature() *refs.Signature {
if o != nil {
return o.idSig
}
@ -662,7 +662,7 @@ func (o *Object) GetSignature() *service.Signature {
return nil
}
func (o *Object) SetSignature(v *service.Signature) {
func (o *Object) SetSignature(v *refs.Signature) {
if o != nil {
o.idSig = v
}
@ -780,7 +780,7 @@ func (r *GetObjectPartInit) SetObjectID(v *refs.ObjectID) {
}
}
func (r *GetObjectPartInit) GetSignature() *service.Signature {
func (r *GetObjectPartInit) GetSignature() *refs.Signature {
if r != nil {
return r.sig
}
@ -788,7 +788,7 @@ func (r *GetObjectPartInit) GetSignature() *service.Signature {
return nil
}
func (r *GetObjectPartInit) SetSignature(v *service.Signature) {
func (r *GetObjectPartInit) SetSignature(v *refs.Signature) {
if r != nil {
r.sig = v
}
@ -896,7 +896,7 @@ func (r *PutObjectPartInit) SetObjectID(v *refs.ObjectID) {
}
}
func (r *PutObjectPartInit) GetSignature() *service.Signature {
func (r *PutObjectPartInit) GetSignature() *refs.Signature {
if r != nil {
return r.sig
}
@ -904,7 +904,7 @@ func (r *PutObjectPartInit) GetSignature() *service.Signature {
return nil
}
func (r *PutObjectPartInit) SetSignature(v *service.Signature) {
func (r *PutObjectPartInit) SetSignature(v *refs.Signature) {
if r != nil {
r.sig = v
}