Skip to content

Commit 23f9543

Browse files
committed
go.mod: switch to nspcc-dev/bbolt completely
1. It updates to BoltDB 1.4.3 effectively with some fixes (but requires additional testing now). 2. We can't solve nspcc-dev/neo-go#3964 without using a module of our own and we want to use the same BoltDB version in all projects. 3. This is supposed to be temporary, but no one knows how long etcd-io/bbolt#998 (or some alternative) will take. Signed-off-by: Roman Khimov <[email protected]>
1 parent bb155f3 commit 23f9543

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+52
-50
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Changelog for NeoFS Node
1818
- Alphabet nodes send basic storage income based on the new Reports API from `container` contract (#3053)
1919
- Use stream API of FSTree for object service `Get` operation (#3466)
2020
- Use meta buckets to mark containers with GC (#3561)
21+
- Switched to local BoltDB fork based on go.etcd.io/bbolt version 1.4.3 (#3576)
2122

2223
### Removed
2324
- `neofs-cli object head --main-only` no-op flag (#3509)

cmd/neofs-lens/internal/meta/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os"
66
"time"
77

8+
"github.com/nspcc-dev/bbolt"
89
meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
910
"github.com/spf13/cobra"
10-
"go.etcd.io/bbolt"
1111
)
1212

1313
var (

cmd/neofs-lens/internal/storage/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"time"
66

7+
"github.com/nspcc-dev/bbolt"
78
"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
89
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common"
910
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
@@ -15,7 +16,6 @@ import (
1516
"github.com/nspcc-dev/neofs-node/pkg/util"
1617
"github.com/panjf2000/ants/v2"
1718
"github.com/spf13/cobra"
18-
"go.etcd.io/bbolt"
1919
)
2020

2121
var (

cmd/neofs-lens/internal/storage/sanity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"time"
99

1010
"github.com/mr-tron/base58"
11+
"github.com/nspcc-dev/bbolt"
1112
common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal"
1213
"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
1314
engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine"
@@ -20,7 +21,6 @@ import (
2021
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr"
2122
"github.com/nspcc-dev/neofs-sdk-go/object"
2223
"github.com/spf13/cobra"
23-
"go.etcd.io/bbolt"
2424
"go.uber.org/zap"
2525
)
2626

cmd/neofs-node/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"time"
55

6+
"github.com/nspcc-dev/bbolt"
67
engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine"
78
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common"
89
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
@@ -17,7 +18,6 @@ import (
1718
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
1819
"github.com/nspcc-dev/neofs-sdk-go/user"
1920
"github.com/panjf2000/ants/v2"
20-
"go.etcd.io/bbolt"
2121
"go.uber.org/zap"
2222
)
2323

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/nspcc-dev/neofs-node
22

33
go 1.23
44

5-
replace go.etcd.io/bbolt v1.4.0 => github.com/nspcc-dev/bbolt v0.0.0-20250612101626-5df2544a4a22
6-
75
require (
86
github.com/cenkalti/backoff/v4 v4.2.1
97
github.com/cheggaaa/pb v1.0.29
@@ -19,6 +17,7 @@ require (
1917
github.com/mr-tron/base58 v1.2.0
2018
github.com/multiformats/go-multiaddr v0.12.2
2119
github.com/mxschmitt/golang-combinations v1.2.0
20+
github.com/nspcc-dev/bbolt v0.0.0-20250911202005-807225ebb0c8
2221
github.com/nspcc-dev/hrw/v2 v2.0.3
2322
github.com/nspcc-dev/locode-db v0.6.0
2423
github.com/nspcc-dev/neo-go v0.111.0
@@ -34,7 +33,6 @@ require (
3433
github.com/spf13/pflag v1.0.6
3534
github.com/spf13/viper v1.18.2
3635
github.com/stretchr/testify v1.10.0
37-
go.etcd.io/bbolt v1.4.0
3836
go.uber.org/zap v1.27.0
3937
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
4038
golang.org/x/net v0.35.0
@@ -97,6 +95,7 @@ require (
9795
github.com/twmb/murmur3 v1.1.8 // indirect
9896
github.com/urfave/cli/v2 v2.27.6 // indirect
9997
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
98+
go.etcd.io/bbolt v1.4.0 // indirect
10099
go.uber.org/multierr v1.11.0 // indirect
101100
golang.org/x/crypto v0.33.0 // indirect
102101
golang.org/x/text v0.22.0 // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
187187
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
188188
github.com/mxschmitt/golang-combinations v1.2.0 h1:V5E7MncIK8Yr1SL/SpdqMuSquFsfoIs5auI7Y3n8z14=
189189
github.com/mxschmitt/golang-combinations v1.2.0/go.mod h1:RCm5eR03B+JrBOMRDLsKZWShluXdrHu+qwhPEJ0miBM=
190-
github.com/nspcc-dev/bbolt v0.0.0-20250612101626-5df2544a4a22 h1:M5Nmg1iCnbZngzIBDIlMr9vW+okFfcSMBvBlXG8r+14=
191-
github.com/nspcc-dev/bbolt v0.0.0-20250612101626-5df2544a4a22/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
190+
github.com/nspcc-dev/bbolt v0.0.0-20250911202005-807225ebb0c8 h1:lYMHisGPtL70vqCe/M+cU27HMZcV2PTYTaRmO7qxhMQ=
191+
github.com/nspcc-dev/bbolt v0.0.0-20250911202005-807225ebb0c8/go.mod h1:iYl+DCkSLXgVCeQWyC+kqS9V1fAQCA74JZtptwjNYpc=
192192
github.com/nspcc-dev/dbft v0.4.0 h1:4/atD4GrrMEtrYBDiZPrPzdKZ6ws7PR/cg0M4DEdVeI=
193193
github.com/nspcc-dev/dbft v0.4.0/go.mod h1:msYlF5GIGwOZ9jUIHttBAAtiqJ29jzV8PPKKv1avXAI=
194194
github.com/nspcc-dev/go-ordered-json v0.0.0-20250226190835-fb3f82b1f468 h1:qOd9/UANpXOME/3RTSa/dJoSzdVwYOkD32XQah0xj1E=
@@ -306,6 +306,8 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC
306306
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
307307
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
308308
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
309+
go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
310+
go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
309311
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
310312
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
311313
go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=

pkg/local_object_storage/engine/control_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99
"testing"
1010
"time"
1111

12+
"github.com/nspcc-dev/bbolt"
1213
"github.com/nspcc-dev/neofs-node/pkg/core/object"
1314
meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase"
1415
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard"
1516
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode"
1617
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache"
1718
cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
1819
"github.com/stretchr/testify/require"
19-
"go.etcd.io/bbolt"
2020
"go.uber.org/zap/zaptest"
2121
)
2222

pkg/local_object_storage/metabase/containers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"errors"
66
"fmt"
77

8+
"github.com/nspcc-dev/bbolt"
9+
bolterrors "github.com/nspcc-dev/bbolt/errors"
810
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
9-
"go.etcd.io/bbolt"
10-
bolterrors "go.etcd.io/bbolt/errors"
1111
)
1212

1313
const (

pkg/local_object_storage/metabase/control.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"fmt"
66
"path/filepath"
77

8+
"github.com/nspcc-dev/bbolt"
9+
bolterrors "github.com/nspcc-dev/bbolt/errors"
810
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode"
911
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr"
1012
"github.com/nspcc-dev/neofs-node/pkg/util"
11-
"go.etcd.io/bbolt"
12-
bolterrors "go.etcd.io/bbolt/errors"
1313
"go.uber.org/zap"
1414
)
1515

0 commit comments

Comments
 (0)