realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#1131] *: Adopt SDK changes

Browse source 
`object.Address` has been moved to `object/address`
`object.ID` has been moved to `object/id`

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-01-26 15:11:13 +03:00 • committed by Alex Vanin
parent 1c821d6c36
commit 1667ec9e6d
139 changed files with 652 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/services/object/delete/exec.go
View file

@ -10,6 +10,8 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
"go.uber.org/zap"
)
@ -59,7 +61,7 @@ func (exec execCtx) isLocal() bool {
return exec.prm.common.LocalOnly()
}
func (exec *execCtx) address() *objectSDK.Address {
func (exec *execCtx) address() *addressSDK.Address {
return exec.prm.addr
}
@ -71,8 +73,8 @@ func (exec *execCtx) commonParameters() *util.CommonPrm {
return exec.prm.common
}
func (exec *execCtx) newAddress(id *objectSDK.ID) *objectSDK.Address {
a := objectSDK.NewAddress()
func (exec *execCtx) newAddress(id *oidSDK.ID) *addressSDK.Address {
a := addressSDK.NewAddress()
a.SetObjectID(id)
a.SetContainerID(exec.containerID())
@ -123,7 +125,7 @@ func (exec *execCtx) collectMembers() (ok bool) {
func (exec *execCtx) collectChain() bool {
var (
err error
chain []*objectSDK.ID
chain []*oidSDK.ID
)
exec.log.Debug("assembling chain...")
@ -204,7 +206,7 @@ func (exec *execCtx) supplementBySplitID() bool {
}
}
func (exec *execCtx) addMembers(incoming []*objectSDK.ID) {
func (exec *execCtx) addMembers(incoming []*oidSDK.ID) {
members := exec.tombstone.Members()
for i := range members {

3
pkg/services/object/delete/local.go
View file

@ -2,6 +2,7 @@ package deletesvc
import (
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
"go.uber.org/zap"
)
@ -42,7 +43,7 @@ func (exec *execCtx) formTombstone() (ok bool) {
exec.tombstone.SetExpirationEpoch(
exec.svc.netInfo.CurrentEpoch() + tsLifetime,
)
exec.addMembers([]*objectSDK.ID{exec.address().ObjectID()})
exec.addMembers([]*oidSDK.ID{exec.address().ObjectID()})
exec.log.Debug("forming split info...")

8
pkg/services/object/delete/prm.go
View file

@ -2,19 +2,19 @@ package deletesvc
import (
"github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
)
// TombstoneAddressWriter is an interface of tombstone address setter.
type TombstoneAddressWriter interface {
SetAddress(*object.Address)
SetAddress(*addressSDK.Address)
}
// Prm groups parameters of Delete service call.
type Prm struct {
common *util.CommonPrm
addr *object.Address
addr *addressSDK.Address
tombAddrWriter TombstoneAddressWriter
}
@ -25,7 +25,7 @@ func (p *Prm) SetCommonParameters(common *util.CommonPrm) {
}
// WithAddress sets address of the object to be removed.
func (p *Prm) WithAddress(addr *object.Address) {
func (p *Prm) WithAddress(addr *addressSDK.Address) {
p.addr = addr
}

9
pkg/services/object/delete/service.go
View file

@ -7,6 +7,7 @@ import (
searchsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/search"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
"github.com/nspcc-dev/neofs-sdk-go/owner"
"go.uber.org/zap"
)
@ -39,18 +40,18 @@ type cfg struct {
// must return (nil, nil) for PHY objects
splitInfo(*execCtx) (*objectSDK.SplitInfo, error)
children(*execCtx) ([]*objectSDK.ID, error)
children(*execCtx) ([]*oidSDK.ID, error)
// must return (nil, nil) for 1st object in chain
previous(*execCtx, *objectSDK.ID) (*objectSDK.ID, error)
previous(*execCtx, *oidSDK.ID) (*oidSDK.ID, error)
}
searcher interface {
splitMembers(*execCtx) ([]*objectSDK.ID, error)
splitMembers(*execCtx) ([]*oidSDK.ID, error)
}
placer interface {
put(*execCtx, bool) (*objectSDK.ID, error)
put(*execCtx, bool) (*oidSDK.ID, error)
}
netInfo NetworkInfo

16
pkg/services/object/delete/util.go
View file

@ -9,6 +9,8 @@ import (
searchsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/search"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
)
type headSvcWrapper getsvc.Service
@ -18,10 +20,10 @@ type searchSvcWrapper searchsvc.Service
type putSvcWrapper putsvc.Service
type simpleIDWriter struct {
ids []*objectSDK.ID
ids []*oidSDK.ID
}
func (w *headSvcWrapper) headAddress(exec *execCtx, addr *objectSDK.Address) (*object.Object, error) {
func (w *headSvcWrapper) headAddress(exec *execCtx, addr *addressSDK.Address) (*object.Object, error) {
wr := getsvc.NewSimpleObjectWriter()
p := getsvc.HeadPrm{}
@ -53,7 +55,7 @@ func (w *headSvcWrapper) splitInfo(exec *execCtx) (*objectSDK.SplitInfo, error)
}
}
func (w *headSvcWrapper) children(exec *execCtx) ([]*objectSDK.ID, error) {
func (w *headSvcWrapper) children(exec *execCtx) ([]*oidSDK.ID, error) {
a := exec.newAddress(exec.splitInfo.Link())
linking, err := w.headAddress(exec, a)
@ -64,7 +66,7 @@ func (w *headSvcWrapper) children(exec *execCtx) ([]*objectSDK.ID, error) {
return linking.Children(), nil
}
func (w *headSvcWrapper) previous(exec *execCtx, id *objectSDK.ID) (*objectSDK.ID, error) {
func (w *headSvcWrapper) previous(exec *execCtx, id *oidSDK.ID) (*oidSDK.ID, error) {
a := exec.newAddress(id)
h, err := w.headAddress(exec, a)
@ -75,7 +77,7 @@ func (w *headSvcWrapper) previous(exec *execCtx, id *objectSDK.ID) (*objectSDK.I
return h.PreviousID(), nil
}
func (w *searchSvcWrapper) splitMembers(exec *execCtx) ([]*objectSDK.ID, error) {
func (w *searchSvcWrapper) splitMembers(exec *execCtx) ([]*oidSDK.ID, error) {
fs := objectSDK.SearchFilters{}
fs.AddSplitIDFilter(objectSDK.MatchStringEqual, exec.splitInfo.SplitID())
@ -95,13 +97,13 @@ func (w *searchSvcWrapper) splitMembers(exec *execCtx) ([]*objectSDK.ID, error)
return wr.ids, nil
}
func (s *simpleIDWriter) WriteIDs(ids []*objectSDK.ID) error {
func (s *simpleIDWriter) WriteIDs(ids []*oidSDK.ID) error {
s.ids = append(s.ids, ids...)
return nil
}
func (w *putSvcWrapper) put(exec *execCtx, broadcast bool) (*objectSDK.ID, error) {
func (w *putSvcWrapper) put(exec *execCtx, broadcast bool) (*oidSDK.ID, error) {
streamer, err := (*putsvc.Service)(w).Put(exec.context())
if err != nil {
return nil, err

6
pkg/services/object/delete/v2/util.go
View file

@ -4,7 +4,7 @@ import (
objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object"
deletesvc "github.com/nspcc-dev/neofs-node/pkg/services/object/delete"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
)
type tombstoneBodyWriter struct {
@ -21,7 +21,7 @@ func (s *Service) toPrm(req *objectV2.DeleteRequest, respBody *objectV2.DeleteRe
p.SetCommonParameters(commonPrm)
body := req.GetBody()
p.WithAddress(object.NewAddressFromV2(body.GetAddress()))
p.WithAddress(addressSDK.NewAddressFromV2(body.GetAddress()))
p.WithTombstoneAddressTarget(&tombstoneBodyWriter{
body: respBody,
})
@ -29,6 +29,6 @@ func (s *Service) toPrm(req *objectV2.DeleteRequest, respBody *objectV2.DeleteRe
return p, nil
}
func (w *tombstoneBodyWriter) SetAddress(addr *object.Address) {
func (w *tombstoneBodyWriter) SetAddress(addr *addressSDK.Address) {
w.body.SetTombstone(addr.ToV2())
}