Move patched raft-boltdb to internal

Author: Justin Fudally

go.mod

@@ -4,13 +4,14 @@ go 1.13
 
 require (
 	github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878
+	github.com/boltdb/bolt v1.3.1
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/go-sql-driver/mysql v1.5.0 // indirect
 	github.com/hashicorp/go-msgpack v0.5.5
 	github.com/hashicorp/raft v1.1.2
-	github.com/hashicorp/raft-boltdb v0.0.0-20191021154308-4207f1bf0617
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/outbrain/golib v0.0.0-20180830062331-ab954725f502
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563
+	golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed // indirect
 )

go.sum

@@ -9,6 +9,7 @@ github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQ
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 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=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -21,24 +22,24 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh
 github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
 github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
 github.com/hashicorp/raft v1.1.2 h1:oxEL5DDeurYxLd3UbcY/hccgSPhLLpiBZ1YxtWEq59c=
 github.com/hashicorp/raft v1.1.2/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
 github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
-github.com/hashicorp/raft-boltdb v0.0.0-20191021154308-4207f1bf0617 h1:CJDRE/2tBNFOrcoexD2nvTRbQEox3FDxl4NxIezp1b8=
-github.com/hashicorp/raft-boltdb v0.0.0-20191021154308-4207f1bf0617/go.mod h1:aUF6HQr8+t3FC/ZHAC+pZreUBhTaxumuu3L+d37uRxk=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/outbrain/golib v0.0.0-20180830062331-ab954725f502 h1:oS2s2j8GP70jE0IDMyA4BO4HgvkNcjHfR40h2fyhc7s=
 github.com/outbrain/golib v0.0.0-20180830062331-ab954725f502/go.mod h1:JDhu//MMvcPVPH889Xr7DyamEbTLumgDBALGUyXrz1g=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -48,6 +49,7 @@ github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 h1:dY6ETXrvDG7
 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

vendor/github.com/hashicorp/raft-boltdb/LICENSE renamed to internal/raft-boltdb/LICENSE

@@ -0,0 +1,88 @@
+package raftboltdb
+
+import (
+	"os"
+	"testing"
+
+	"github.com/hashicorp/raft/bench"
+)
+
+func BenchmarkBoltStore_FirstIndex(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.FirstIndex(b, store)
+}
+
+func BenchmarkBoltStore_LastIndex(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.LastIndex(b, store)
+}
+
+func BenchmarkBoltStore_GetLog(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.GetLog(b, store)
+}
+
+func BenchmarkBoltStore_StoreLog(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.StoreLog(b, store)
+}
+
+func BenchmarkBoltStore_StoreLogs(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.StoreLogs(b, store)
+}
+
+func BenchmarkBoltStore_DeleteRange(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.DeleteRange(b, store)
+}
+
+func BenchmarkBoltStore_Set(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.Set(b, store)
+}
+
+func BenchmarkBoltStore_Get(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.Get(b, store)
+}
+
+func BenchmarkBoltStore_SetUint64(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.SetUint64(b, store)
+}
+
+func BenchmarkBoltStore_GetUint64(b *testing.B) {
+	store := testBoltStore(b)
+	defer store.Close()
+	defer os.Remove(store.path)
+
+	raftbench.GetUint64(b, store)
+}

vendor/github.com/hashicorp/raft-boltdb/README.md renamed to internal/raft-boltdb/README.md

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/boltdb/bolt"
-	"github.com/hashicorp/raft"
+	"github.com/github/freno/internal/raft"
 )
 
 const (
@@ -33,56 +33,26 @@ type BoltStore struct {
 	path string
 }
 
-// Options contains all the configuration used to open the BoltDB
-type Options struct {
-	// Path is the file path to the BoltDB to use
-	Path string
-
-	// BoltOptions contains any specific BoltDB options you might
-	// want to specify [e.g. open timeout]
-	BoltOptions *bolt.Options
-
-	// NoSync causes the database to skip fsync calls after each
-	// write to the log. This is unsafe, so it should be used
-	// with caution.
-	NoSync bool
-}
-
-// readOnly returns true if the contained bolt options say to open
-// the DB in readOnly mode [this can be useful to tools that want
-// to examine the log]
-func (o *Options) readOnly() bool {
-	return o != nil && o.BoltOptions != nil && o.BoltOptions.ReadOnly
-}
-
 // NewBoltStore takes a file path and returns a connected Raft backend.
 func NewBoltStore(path string) (*BoltStore, error) {
-	return New(Options{Path: path})
-}
-
-// New uses the supplied options to open the BoltDB and prepare it for use as a raft backend.
-func New(options Options) (*BoltStore, error) {
 	// Try to connect
-	handle, err := bolt.Open(options.Path, dbFileMode, options.BoltOptions)
+	handle, err := bolt.Open(path, dbFileMode, nil)
 	if err != nil {
 		return nil, err
 	}
-	handle.NoSync = options.NoSync
 
 	// Create the new store
 	store := &BoltStore{
 		conn: handle,
-		path: options.Path,
+		path: path,
 	}
 
-	// If the store was opened read-only, don't try and create buckets
-	if !options.readOnly() {
-		// Set up our buckets
-		if err := store.initialize(); err != nil {
-			store.Close()
-			return nil, err
-		}
+	// Set up our buckets
+	if err := store.initialize(); err != nil {
+		store.Close()
+		return nil, err
 	}
+
 	return store, nil
 }
 
@@ -259,10 +229,3 @@ func (b *BoltStore) GetUint64(key []byte) (uint64, error) {
 	}
 	return bytesToUint64(val), nil
 }
-
-// Sync performs an fsync on the database file handle. This is not necessary
-// under normal operation unless NoSync is enabled, in which this forces the
-// database file to sync against the disk.
-func (b *BoltStore) Sync() error {
-	return b.conn.Sync()
-}