s.makhov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#128] metabase: Do not create leaves in indexed header bucket

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-10-29 14:38:50 +03:00 committed by Leonard Lyubich
parent 85aacbbb10
commit 5f78a18a4f
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/local_object_storage/metabase/put.go
View file

@ -61,11 +61,6 @@ func (db *DB) Put(obj *object.Object) error {
// 1. add prefix byte (0 if empty); // 1. add prefix byte (0 if empty);
v := []byte(indices[i].val) v := []byte(indices[i].val)
// put value to key bucket (it is needed for iteration over all values (Select))
if err := keyBucket.Put(keyWithPrefix(v, false), nil); err != nil {
return errors.Wrapf(err, "(%T) could not put header value", db)
}
// create address bucket for the value // create address bucket for the value
valBucket, err := keyBucket.CreateBucketIfNotExists(keyWithPrefix(v, true)) valBucket, err := keyBucket.CreateBucketIfNotExists(keyWithPrefix(v, true))
if err != nil { if err != nil {
@ -91,8 +86,8 @@ func keyWithPrefix(key []byte, bucket bool) []byte {
return append([]byte{b}, key...) return append([]byte{b}, key...)
} }
func keyWithoutPrefix(key []byte) ([]byte, bool) { func cutKeyBytes(key []byte) []byte {
return key[1:], key[0] == 1 return key[1:]
} }
func addressKey(addr *objectSDK.Address) []byte { func addressKey(addr *objectSDK.Address) []byte {

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

@ -39,16 +39,14 @@ func (db *DB) Select(fs object.SearchFilters) ([]*object.Address, error) {
// iterate over all existing values for the key // iterate over all existing values for the key
if err := keyBucket.ForEach(func(k, _ []byte) error { if err := keyBucket.ForEach(func(k, _ []byte) error {
if k, bucket := keyWithoutPrefix(k); !bucket { if !matchFunc(string(cutKeyBytes(k)), fVal) {
if !matchFunc(string(k), fVal) {
// exclude all addresses with this value // exclude all addresses with this value
return keyBucket.Bucket(keyWithPrefix(k, true)).ForEach(func(k, _ []byte) error { return keyBucket.Bucket(k).ForEach(func(k, _ []byte) error {
mAddr[string(k)] = struct{}{} mAddr[string(k)] = struct{}{}
return nil return nil
}) })
} }
}
return nil return nil
}); err != nil { }); err != nil {