Skip to content

Commit

Permalink
Switch to go.etcd.io/bbolt dependency
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
artyom committed Mar 25, 2020
1 parent 17edb70 commit 8276e14
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: '1.13.x'
go-version: '1.14.x'
- uses: actions/checkout@v1
- name: Get dependencies
run: go mod download
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: '1.13.x'
go-version: '1.14.x'
- uses: actions/checkout@v1
- name: Get dependencies
run: go mod download
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ require (
github.com/artyom/autoflags v1.1.1
github.com/artyom/red v0.0.0-20170208121325-d6616c8bb9ec
github.com/artyom/resp v1.0.0
github.com/boltdb/bolt v1.3.1
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/snappy v0.0.1
github.com/mediocregopher/radix.v2 v0.0.0-20180603022615-94360be26253
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
go.etcd.io/bbolt v1.3.4
)

go 1.13
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ github.com/artyom/red v0.0.0-20170208121325-d6616c8bb9ec h1:QZeKfanvuWoZJ/bh8HcO
github.com/artyom/red v0.0.0-20170208121325-d6616c8bb9ec/go.mod h1:EEI3YwMIaopPkfZguw7QRpjFO22tAVZhBvh3ju5xVHs=
github.com/artyom/resp v1.0.0 h1:SVdA6KMZQ+NshbKtVd/gckbO4YIkZov8NhqL1QJbLXg=
github.com/artyom/resp v1.0.0/go.mod h1:bPgkZ66JCWLt9ZBLfyiJExQw2zsN6DpNG17ZuBfUtFw=
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -36,8 +34,10 @@ github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc=
github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
Expand Down
2 changes: 1 addition & 1 deletion internal/bitmapist/bitmapist.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/RoaringBitmap/roaring"
"github.com/artyom/red"
"github.com/artyom/resp"
"github.com/boltdb/bolt"
"github.com/golang/snappy"
"github.com/mediocregopher/radix.v2/redis"
bolt "go.etcd.io/bbolt"
)

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

0 comments on commit 8276e14

Please sign in to comment.