[#381] go.mod: Update bbolt

Adopt new `ForEachBucket` function where possible.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-05-19 13:08:13 +03:00
parent 7eb8fa6350
commit ff570847a4
5 changed files with 4 additions and 11 deletions

View file

@ -25,6 +25,7 @@ Changelog for FrostFS Node
- `neo-go` to `v0.101.1` - `neo-go` to `v0.101.1`
- `google.golang.org/grpc` to `v1.55.0` - `google.golang.org/grpc` to `v1.55.0`
- `paulmach/orb` to `v0.9.2` - `paulmach/orb` to `v0.9.2`
- `go.etcd.io/bbolt` to `v1.3.7`
- `github.com/nats-io/nats.go` to `v1.25.0` - `github.com/nats-io/nats.go` to `v1.25.0`
- `golang.org/x/sync` to `v0.2.0` - `golang.org/x/sync` to `v0.2.0`
- `golang.org/x/term` to `v0.8.0` - `golang.org/x/term` to `v0.8.0`

2
go.mod
View file

@ -29,7 +29,7 @@ require (
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.15.0 github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.3 github.com/stretchr/testify v1.8.3
go.etcd.io/bbolt v1.3.6 go.etcd.io/bbolt v1.3.7
go.opentelemetry.io/otel v1.15.1 go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/trace v1.15.1 go.opentelemetry.io/otel/trace v1.15.1
go.uber.org/atomic v1.11.0 go.uber.org/atomic v1.11.0

BIN
go.sum

Binary file not shown.

View file

@ -72,12 +72,8 @@ func (db *DB) iterateExpired(tx *bbolt.Tx, epoch uint64, h ExpiredObjectHandler)
return fmt.Errorf("could not parse container ID of expired bucket: %w", err) return fmt.Errorf("could not parse container ID of expired bucket: %w", err)
} }
return b.ForEach(func(expKey, _ []byte) error { return b.ForEachBucket(func(expKey []byte) error {
bktExpired := b.Bucket(expKey) bktExpired := b.Bucket(expKey)
if bktExpired == nil {
return nil
}
expiresAfter, err := strconv.ParseUint(string(expKey), 10, 64) expiresAfter, err := strconv.ParseUint(string(expKey), 10, 64)
if err != nil { if err != nil {
return fmt.Errorf("could not parse expiration epoch: %w", err) return fmt.Errorf("could not parse expiration epoch: %w", err)

View file

@ -315,12 +315,8 @@ func selectOutsideFKBT(
bktExcl := tx.Bucket(name) bktExcl := tx.Bucket(name)
if bktExcl != nil { if bktExcl != nil {
_ = bktExcl.ForEach(func(k, _ []byte) error { _ = bktExcl.ForEachBucket(func(k []byte) error {
exclBktLeaf := bktExcl.Bucket(k) exclBktLeaf := bktExcl.Bucket(k)
if exclBktLeaf == nil {
return nil
}
return exclBktLeaf.ForEach(func(k, _ []byte) error { return exclBktLeaf.ForEach(func(k, _ []byte) error {
mExcl[string(k)] = struct{}{} mExcl[string(k)] = struct{}{}