TrueCloudLab/frostfs-node
19
1
Fork 27
Code Issues 91 Pull requests 8 Projects Releases 1 Activity Actions

pilorama: Fix TreeDrop #805

Merged
fyrchik merged 1 commit from aarifullin/frostfs-node:fix/bforest_tree_drop into master 2023-11-17 10:21:39 +00:00
Conversation 0 Commits 1 Files changed 1 +2 -1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8d5300c41a - Show all commits

3
pkg/local_object_storage/pilorama/boltdb.go
View file

@ -1115,11 +1115,12 @@ func (t *boltForest) TreeDrop(ctx context.Context, cid cidSDK.ID, treeID string)
c := tx.Cursor()
prefix := make([]byte, 32)
cid.Encode(prefix)
for k, _ := c.Seek(prefix); k != nil && bytes.HasPrefix(k, prefix); k, _ = c.Next() {
for k, _ := c.Seek(prefix); k != nil && bytes.HasPrefix(k, prefix); k, _ = c.Seek(prefix) {
err := tx.DeleteBucket(k)
if err != nil {
fyrchik commented 2023-11-15 09:28:36 +00:00
Outdated
Review
Copy link

There is no need to create an intermediate slice, I believe we can just replace c.Next() with c.Seek(prefix)

There is no need to create an intermediate slice, I believe we can just replace `c.Next()` with `c.Seek(prefix)`
aarifullin commented 2023-11-15 10:32:32 +00:00
Outdated
Review
Copy link

Agree. But it is needed to add cursor rewind: https://github.com/boltdb/bolt/issues/357#issuecomment-97851571: added it at the end of for body

Agree. But it is needed to add cursor rewind: https://github.com/boltdb/bolt/issues/357#issuecomment-97851571: added it at the end of `for` body
dstepanov-yadro commented 2023-11-15 14:55:59 +00:00
Outdated
Review
Copy link

Now it looks too complex IMHO. If I see this code in a week, I will be confused. @fyrchik , what's wrong with slice?

Now it looks too complex IMHO. If I see this code in a week, I will be confused. @fyrchik , what's wrong with slice?
fyrchik commented 2023-11-15 15:18:46 +00:00
Outdated
Review
Copy link

Nothing wrong, it bugs me when I see 2 iterations instead of 1.
In this case buckets slice will generally be of size 1-2, may be nothing bad.

Nothing wrong, it bugs me when I see 2 iterations instead of 1. In this case `buckets` slice will generally be of size 1-2, may be nothing bad.
return err
}
_, _ = c.First() // rewind the cursor to the root page
}
return nil
}