From ff570847a4dd18540a0fc3ffd19acff4c409225c Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Fri, 19 May 2023 13:08:13 +0300
Subject: [PATCH] [#381] go.mod: Update bbolt

Adopt new `ForEachBucket` function where possible.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 CHANGELOG.md                                  |   1 +
 go.mod                                        |   2 +-
 go.sum                                        | Bin 97269 -> 97348 bytes
 .../metabase/iterators.go                     |   6 +-----
 pkg/local_object_storage/metabase/select.go   |   6 +-----
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71f1a98b4..f79940f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Changelog for FrostFS Node
 - `neo-go` to `v0.101.1`
 - `google.golang.org/grpc` to `v1.55.0`
 - `paulmach/orb` to `v0.9.2`
+- `go.etcd.io/bbolt` to `v1.3.7`
 - `github.com/nats-io/nats.go` to `v1.25.0`
 - `golang.org/x/sync` to `v0.2.0`
 - `golang.org/x/term` to `v0.8.0`
diff --git a/go.mod b/go.mod
index ed92cc7b6..d90f45766 100644
--- a/go.mod
+++ b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.15.0
 	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/trace v1.15.1
 	go.uber.org/atomic v1.11.0
diff --git a/go.sum b/go.sum
index 913a57613a0848cdd73e89062df5411012606770..648afba0e2cb76ed7094c6bf088c1dad3adda763 100644
GIT binary patch
delta 166
zcmezRo%P5M)(ze#CQm+LU7uQ#oT8VRub-5ZpHrexW~gVZXReT8XqBa1<>jB3=bGiF
zpIzyZ<KmL;o)_k$@90_R=@n3D5t{F0<R0vomK~ZFXv>wJuZPVXeV}-5ehSDqKTF^2
ya?1#d3e&XGf=UBV@8aCj!myHjVRx6xisD3<oTO}%pcDgBPshOW%_mRjYz6?weLFk=

delta 65
zcmX@|gZ1lo)(ze#^b|4-t@Klq6TQ+5in9%KOmfV^OcKje%uLISoQ*wwD$RX^v$Tu#
VD-0c7oIQOf8=eT=EPGOYGXOMM7v=x}

diff --git a/pkg/local_object_storage/metabase/iterators.go b/pkg/local_object_storage/metabase/iterators.go
index 4c9dc782c..ba22566a3 100644
--- a/pkg/local_object_storage/metabase/iterators.go
+++ b/pkg/local_object_storage/metabase/iterators.go
@@ -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 b.ForEach(func(expKey, _ []byte) error {
+		return b.ForEachBucket(func(expKey []byte) error {
 			bktExpired := b.Bucket(expKey)
-			if bktExpired == nil {
-				return nil
-			}
-
 			expiresAfter, err := strconv.ParseUint(string(expKey), 10, 64)
 			if err != nil {
 				return fmt.Errorf("could not parse expiration epoch: %w", err)
diff --git a/pkg/local_object_storage/metabase/select.go b/pkg/local_object_storage/metabase/select.go
index a4b14f77c..2ced6c4b7 100644
--- a/pkg/local_object_storage/metabase/select.go
+++ b/pkg/local_object_storage/metabase/select.go
@@ -315,12 +315,8 @@ func selectOutsideFKBT(
 
 	bktExcl := tx.Bucket(name)
 	if bktExcl != nil {
-		_ = bktExcl.ForEach(func(k, _ []byte) error {
+		_ = bktExcl.ForEachBucket(func(k []byte) error {
 			exclBktLeaf := bktExcl.Bucket(k)
-			if exclBktLeaf == nil {
-				return nil
-			}
-
 			return exclBktLeaf.ForEach(func(k, _ []byte) error {
 				mExcl[string(k)] = struct{}{}