Skip to content

Commit 8276e14

Browse files
committed
Switch to go.etcd.io/bbolt dependency
This includes fix to boltdb unsafe pointer conversions discovered by extra checks added in Go 1.14 enabled in -race mode. Also changes CI to use Go 1.14. See etcd-io/bbolt#201 for background.
1 parent 17edb70 commit 8276e14

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/setup-go@v1
1616
with:
17-
go-version: '1.13.x'
17+
go-version: '1.14.x'
1818
- uses: actions/checkout@v1
1919
- name: Get dependencies
2020
run: go mod download

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
steps:
88
- uses: actions/setup-go@v1
99
with:
10-
go-version: '1.13.x'
10+
go-version: '1.14.x'
1111
- uses: actions/checkout@v1
1212
- name: Get dependencies
1313
run: go mod download

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ require (
55
github.com/artyom/autoflags v1.1.1
66
github.com/artyom/red v0.0.0-20170208121325-d6616c8bb9ec
77
github.com/artyom/resp v1.0.0
8-
github.com/boltdb/bolt v1.3.1
98
github.com/davecgh/go-spew v1.1.1 // indirect
109
github.com/golang/snappy v0.0.1
1110
github.com/mediocregopher/radix.v2 v0.0.0-20180603022615-94360be26253
12-
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
11+
go.etcd.io/bbolt v1.3.4
1312
)
1413

1514
go 1.13

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ github.com/artyom/red v0.0.0-20170208121325-d6616c8bb9ec h1:QZeKfanvuWoZJ/bh8HcO
66
github.com/artyom/red v0.0.0-20170208121325-d6616c8bb9ec/go.mod h1:EEI3YwMIaopPkfZguw7QRpjFO22tAVZhBvh3ju5xVHs=
77
github.com/artyom/resp v1.0.0 h1:SVdA6KMZQ+NshbKtVd/gckbO4YIkZov8NhqL1QJbLXg=
88
github.com/artyom/resp v1.0.0/go.mod h1:bPgkZ66JCWLt9ZBLfyiJExQw2zsN6DpNG17ZuBfUtFw=
9-
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
10-
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
119
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1210
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1311
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -36,8 +34,10 @@ github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
3634
github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
3735
github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc=
3836
github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
39-
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
40-
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
37+
go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
38+
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
39+
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
40+
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4141
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4242
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4343
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

internal/bitmapist/bitmapist.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"github.com/RoaringBitmap/roaring"
2121
"github.com/artyom/red"
2222
"github.com/artyom/resp"
23-
"github.com/boltdb/bolt"
2423
"github.com/golang/snappy"
2524
"github.com/mediocregopher/radix.v2/redis"
25+
bolt "go.etcd.io/bbolt"
2626
)
2727

2828
// New returns initialized Server that loads/saves its data in dbFile

0 commit comments

Comments
 (0)