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

Revert "[#16] object: Allow set copy_number for every placement vector"

Browse source 
This reverts commit e022a2b831.
This commit is contained in:
Evgenii Stratonikov 2023-04-11 10:35:11 +03:00
parent d9c5b9c90e
commit dbcd514748
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
object/grpc/service.go
View file

@ -109,7 +109,7 @@ func (m *PutRequest_Body_Init) SetHeader(v *Header) {
}
// SetCopiesNumber sets number of the copies to save.
func (m *PutRequest_Body_Init) SetCopiesNumber(v []uint32) {
func (m *PutRequest_Body_Init) SetCopiesNumber(v uint32) {
m.CopiesNumber = v
}

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

Binary file not shown.

6
object/marshal.go
View file

@ -516,7 +516,7 @@ func (r *PutObjectPartInit) StableMarshal(buf []byte) []byte {
offset += proto.NestedStructureMarshal(putReqInitObjectIDField, buf[offset:], r.id)
offset += proto.NestedStructureMarshal(putReqInitSignatureField, buf[offset:], r.sig)
offset += proto.NestedStructureMarshal(putReqInitHeaderField, buf[offset:], r.hdr)
proto.RepeatedUInt32Marshal(putReqInitCopiesNumField, buf[offset:], r.copyNum)
proto.UInt32Marshal(putReqInitCopiesNumField, buf[offset:], r.copyNum)
return buf
}
@ -529,9 +529,7 @@ func (r *PutObjectPartInit) StableSize() (size int) {
size += proto.NestedStructureSize(putReqInitObjectIDField, r.id)
size += proto.NestedStructureSize(putReqInitSignatureField, r.sig)
size += proto.NestedStructureSize(putReqInitHeaderField, r.hdr)
arrSize, _ := proto.RepeatedUInt32Size(putReqInitCopiesNumField, r.copyNum)
size += arrSize
size += proto.UInt32Size(putReqInitCopiesNumField, r.copyNum)
return size
}

2
object/test/generate.go
View file

@ -216,7 +216,7 @@ func GeneratePutObjectPartInit(empty bool) *object.PutObjectPartInit {
m := new(object.PutObjectPartInit)
if !empty {
m.SetCopiesNumber([]uint32{234})
m.SetCopiesNumber(234)
m.SetObjectID(refstest.GenerateObjectID(false))
}

8
object/types.go
View file

@ -128,7 +128,7 @@ type PutObjectPartInit struct {
hdr *Header
copyNum []uint32
copyNum uint32
}
type PutObjectPartChunk struct {
@ -894,15 +894,15 @@ func (r *PutObjectPartInit) SetHeader(v *Header) {
r.hdr = v
}
func (r *PutObjectPartInit) GetCopiesNumber() []uint32 {
func (r *PutObjectPartInit) GetCopiesNumber() uint32 {
if r != nil {
return r.copyNum
}
return nil
return 0
}
func (r *PutObjectPartInit) SetCopiesNumber(v []uint32) {
func (r *PutObjectPartInit) SetCopiesNumber(v uint32) {
r.copyNum = v
}