achuprov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1094] metabase: move Select filters sanity check outside of transaction

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-01-19 16:21:31 +03:00 committed by Alex Vanin
parent 651adf46c6
commit 5a03a14940
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/local_object_storage/metabase/select.go
View file

@ -75,13 +75,15 @@ func Select(db *DB, cid *cid.ID, fs object.SearchFilters) ([]*object.Address, er
func (db *DB) Select(prm *SelectPrm) (res *SelectRes, err error) { func (db *DB) Select(prm *SelectPrm) (res *SelectRes, err error) {
res = new(SelectRes) res = new(SelectRes)
err = db.boltDB.View(func(tx *bbolt.Tx) error { if blindlyProcess(prm.filters) {
return res, nil
}
return res, db.boltDB.View(func(tx *bbolt.Tx) error {
res.addrList, err = db.selectObjects(tx, prm.cid, prm.filters) res.addrList, err = db.selectObjects(tx, prm.cid, prm.filters)
return err return err
}) })
return res, err
} }
func (db *DB) selectObjects(tx *bbolt.Tx, cid *cid.ID, fs object.SearchFilters) ([]*object.Address, error) { func (db *DB) selectObjects(tx *bbolt.Tx, cid *cid.ID, fs object.SearchFilters) ([]*object.Address, error) {
@ -89,11 +91,6 @@ func (db *DB) selectObjects(tx *bbolt.Tx, cid *cid.ID, fs object.SearchFilters)
return nil, ErrMissingContainerID return nil, ErrMissingContainerID
} }
// TODO: consider the option of moving this check to a level higher than the metabase
if blindlyProcess(fs) {
return nil, nil
}
group, err := groupFilters(fs) group, err := groupFilters(fs)
if err != nil { if err != nil {
return nil, err return nil, err