carpawell/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#85] get-service: Drop unused assemble flag

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2023-03-09 11:16:38 +03:00
parent b8e93d4c08
commit ac0a278a05
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/services/object/get/exec.go
View file

@ -115,7 +115,7 @@ func (exec execCtx) key() (*ecdsa.PrivateKey, error) {
} }
func (exec *execCtx) canAssemble() bool { func (exec *execCtx) canAssemble() bool {
return exec.svc.assembly && !exec.isRaw() && !exec.headOnly() && !exec.isLocal() return !exec.isRaw() && !exec.headOnly() && !exec.isLocal()
} }
func (exec *execCtx) splitInfo() *objectSDK.SplitInfo { func (exec *execCtx) splitInfo() *objectSDK.SplitInfo {

3
pkg/services/object/get/get_test.go
View file

@ -248,7 +248,6 @@ func TestGetLocalOnly(t *testing.T) {
svc := &Service{cfg: new(cfg)} svc := &Service{cfg: new(cfg)}
svc.log = test.NewLogger(false) svc.log = test.NewLogger(false)
svc.localStorage = storage svc.localStorage = storage
svc.assembly = true
return svc return svc
} }
@ -510,7 +509,6 @@ func TestGetRemoteSmall(t *testing.T) {
svc := &Service{cfg: new(cfg)} svc := &Service{cfg: new(cfg)}
svc.log = test.NewLogger(false) svc.log = test.NewLogger(false)
svc.localStorage = newTestStorage() svc.localStorage = newTestStorage()
svc.assembly = true
const curEpoch = 13 const curEpoch = 13
@ -1644,7 +1642,6 @@ func TestGetFromPastEpoch(t *testing.T) {
svc := &Service{cfg: new(cfg)} svc := &Service{cfg: new(cfg)}
svc.log = test.NewLogger(false) svc.log = test.NewLogger(false)
svc.localStorage = newTestStorage() svc.localStorage = newTestStorage()
svc.assembly = true
const curEpoch = 13 const curEpoch = 13

10
pkg/services/object/get/service.go
View file

@ -26,8 +26,6 @@ type getClient interface {
} }
type cfg struct { type cfg struct {
assembly bool
log *logger.Logger log *logger.Logger
localStorage interface { localStorage interface {
@ -51,7 +49,6 @@ type cfg struct {
func defaultCfg() *cfg { func defaultCfg() *cfg {
return &cfg{ return &cfg{
assembly: true,
log: &logger.Logger{Logger: zap.L()}, log: &logger.Logger{Logger: zap.L()},
localStorage: new(storageEngineWrapper), localStorage: new(storageEngineWrapper),
clientCache: new(clientCacheWrapper), clientCache: new(clientCacheWrapper),
@ -79,13 +76,6 @@ func WithLogger(l *logger.Logger) Option {
} }
} }
// WithoutAssembly returns option to disable object assembling.
func WithoutAssembly() Option {
return func(c *cfg) {
c.assembly = false
}
}
// WithLocalStorageEngine returns option to set local storage // WithLocalStorageEngine returns option to set local storage
// instance. // instance.
func WithLocalStorageEngine(e *engine.StorageEngine) Option { func WithLocalStorageEngine(e *engine.StorageEngine) Option {