diff --git a/backup.go b/backup.go index 6e8c778e3..aa0333916 100644 --- a/backup.go +++ b/backup.go @@ -23,8 +23,8 @@ import ( "encoding/binary" "io" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/golang/protobuf/proto" ) diff --git a/backup_test.go b/backup_test.go index fc8d2b8db..b9b79006a 100644 --- a/backup_test.go +++ b/backup_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/dgraph-io/badger/pb" + "github.com/dgraph-io/badger/v2/pb" "github.com/stretchr/testify/require" ) diff --git a/badger/cmd/backup.go b/badger/cmd/backup.go index 567eecccd..79fa9fd49 100644 --- a/badger/cmd/backup.go +++ b/badger/cmd/backup.go @@ -20,8 +20,8 @@ import ( "bufio" "os" - "github.com/dgraph-io/badger" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2" + "github.com/dgraph-io/badger/v2/y" "github.com/spf13/cobra" ) diff --git a/badger/cmd/bank.go b/badger/cmd/bank.go index 5abfec1fc..c4426dd5a 100644 --- a/badger/cmd/bank.go +++ b/badger/cmd/bank.go @@ -30,10 +30,10 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/spf13/cobra" ) diff --git a/badger/cmd/flatten.go b/badger/cmd/flatten.go index f2375d77e..1882cb99c 100644 --- a/badger/cmd/flatten.go +++ b/badger/cmd/flatten.go @@ -17,7 +17,7 @@ package cmd import ( - "github.com/dgraph-io/badger" + "github.com/dgraph-io/badger/v2" "github.com/spf13/cobra" ) diff --git a/badger/cmd/info.go b/badger/cmd/info.go index eb1e16c11..6a06f1b63 100644 --- a/badger/cmd/info.go +++ b/badger/cmd/info.go @@ -29,10 +29,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/badger" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" humanize "github.com/dustin/go-humanize" "github.com/spf13/cobra" ) diff --git a/badger/cmd/read_bench.go b/badger/cmd/read_bench.go index abe5d4e23..b26a1fb27 100644 --- a/badger/cmd/read_bench.go +++ b/badger/cmd/read_bench.go @@ -27,10 +27,10 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/spf13/cobra" - "github.com/dgraph-io/badger" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" ) var readBenchCmd = &cobra.Command{ diff --git a/badger/cmd/restore.go b/badger/cmd/restore.go index af7364b09..d5ee8f5f4 100644 --- a/badger/cmd/restore.go +++ b/badger/cmd/restore.go @@ -21,7 +21,7 @@ import ( "os" "path" - "github.com/dgraph-io/badger" + "github.com/dgraph-io/badger/v2" "github.com/spf13/cobra" ) diff --git a/badger/cmd/write_bench.go b/badger/cmd/write_bench.go index 4656bfe22..fb669ea32 100644 --- a/badger/cmd/write_bench.go +++ b/badger/cmd/write_bench.go @@ -28,9 +28,9 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/spf13/cobra" - "github.com/dgraph-io/badger" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" ) var writeBenchCmd = &cobra.Command{ diff --git a/badger/main.go b/badger/main.go index e03affc24..7542f1e17 100644 --- a/badger/main.go +++ b/badger/main.go @@ -22,7 +22,7 @@ import ( _ "net/http/pprof" "runtime" - "github.com/dgraph-io/badger/badger/cmd" + "github.com/dgraph-io/badger/v2/badger/cmd" ) func main() { diff --git a/batch.go b/batch.go index 76230a0b1..c6de88123 100644 --- a/batch.go +++ b/batch.go @@ -19,7 +19,7 @@ package badger import ( "sync" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" ) // WriteBatch holds the necessary info to perform batched writes. diff --git a/compaction.go b/compaction.go index 375e40be2..0372b8b7b 100644 --- a/compaction.go +++ b/compaction.go @@ -25,8 +25,8 @@ import ( "golang.org/x/net/trace" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" ) type keyRange struct { diff --git a/db.go b/db.go index aa2e4fac4..dbd7ee811 100644 --- a/db.go +++ b/db.go @@ -30,11 +30,11 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/skl" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/skl" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/dgraph-io/ristretto" humanize "github.com/dustin/go-humanize" "github.com/pkg/errors" diff --git a/db2_test.go b/db2_test.go index aaae97fa0..96280f445 100644 --- a/db2_test.go +++ b/db2_test.go @@ -29,10 +29,10 @@ import ( "regexp" "testing" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/db_test.go b/db_test.go index 01cb092ff..7cdae8c52 100644 --- a/db_test.go +++ b/db_test.go @@ -37,10 +37,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/skl" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/skl" + "github.com/dgraph-io/badger/v2/y" ) var mmap = flag.Bool("vlog_mmap", true, "Specify if value log must be memory-mapped") diff --git a/dir_unix.go b/dir_unix.go index d56e6e821..db64d44ef 100644 --- a/dir_unix.go +++ b/dir_unix.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" "golang.org/x/sys/unix" ) diff --git a/go.mod b/go.mod index f7d86401e..f7f1fb0d3 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,19 @@ -module github.com/dgraph-io/badger +module github.com/dgraph-io/badger/v2 go 1.12 require ( github.com/DataDog/zstd v1.4.1 github.com/cespare/xxhash v1.1.0 - github.com/cespare/xxhash/v2 v2.1.0 // indirect github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 github.com/dustin/go-humanize v1.0.0 github.com/golang/protobuf v1.3.1 github.com/golang/snappy v0.0.1 + github.com/kr/pretty v0.1.0 // indirect github.com/pkg/errors v0.8.1 github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/cobra v0.0.5 - github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.4.0 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb diff --git a/go.sum b/go.sum index 0df881bcf..60e673a75 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,11 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= -github.com/VictoriaMetrics/fastcache v1.5.1/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= -github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= -github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= -github.com/coocood/freecache v1.1.0/go.mod h1:ePwxCDzOYvARfHdr1pByNct1at3CoKnsipOHwKlNbzI= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -19,15 +13,6 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc 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/dgraph-io/benchmarks v0.0.0-20190916053105-b4dc990401e4/go.mod h1:4EWiC2KSKhXmQxnwRWH8vwBk4f0FOOLyWag/5Tkrsb4= -github.com/dgraph-io/ristretto v0.0.0-20190903064322-eb48d2f7ca30 h1:FkdGlqxPjfHKdVUzS5dOSMeOkGjEG7PnR1RLbcEqw88= -github.com/dgraph-io/ristretto v0.0.0-20190903064322-eb48d2f7ca30/go.mod h1:UvZmzj8odp3S1nli6yEb1vLME8iJFBrRcw8rAJEiu9Q= -github.com/dgraph-io/ristretto v0.0.0-20190916120426-cd2835491e0e h1:6ryPDbNhRiZ7Hbh8G3IxUaw3utIzI2FZEP5FBl8x8n0= -github.com/dgraph-io/ristretto v0.0.0-20190916120426-cd2835491e0e/go.mod h1:3dYWm7+Szhwp+wbqGQ5w8o8H1eBkPJEjIEAR5fXCCfs= -github.com/dgraph-io/ristretto v0.0.0-20191010170704-2ba187ef9534 h1:9G6fVccQriMJu4nXwpwLDoy9y31t/KUSLAbPcoBgv+4= -github.com/dgraph-io/ristretto v0.0.0-20191010170704-2ba187ef9534/go.mod h1:edzKIzGvqUCMzhTVWbiTSe75zD9Xxq0GtSBtFmaUTZs= -github.com/dgraph-io/ristretto v0.0.0-20191023190035-3cc39b3d7c56 h1:P9bbRTJ5EM9O9SFJ7an5DJXcR4sIYHOONS0yG5scdb8= -github.com/dgraph-io/ristretto v0.0.0-20191023190035-3cc39b3d7c56/go.mod h1:edzKIzGvqUCMzhTVWbiTSe75zD9Xxq0GtSBtFmaUTZs= github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e h1:aeUNgwup7PnDOBAD1BOKAqzb/W/NksOj6r3dwKKuqfg= github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e/go.mod h1:edzKIzGvqUCMzhTVWbiTSe75zD9Xxq0GtSBtFmaUTZs= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= @@ -35,14 +20,18 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/goburrow/cache v0.1.0/go.mod h1:8oxkfud4hvjO4tNjEKZfEd+LrpDVDlBIauGYsWGEzio= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -53,7 +42,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -64,9 +53,7 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -81,6 +68,7 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSF golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/integration/testgc/main.go b/integration/testgc/main.go index 20aff5b9e..4afc46cd4 100644 --- a/integration/testgc/main.go +++ b/integration/testgc/main.go @@ -12,9 +12,9 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/y" ) var maxValue int64 = 10000000 diff --git a/iterator.go b/iterator.go index 7b719e126..e475af4aa 100644 --- a/iterator.go +++ b/iterator.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/table" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/table" "github.com/dgryski/go-farm" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" ) type prefetchStatus uint8 diff --git a/iterator_test.go b/iterator_test.go index e6e16f460..f9fddf913 100644 --- a/iterator_test.go +++ b/iterator_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/key_registry.go b/key_registry.go index 87dc9acf2..d1ecbae45 100644 --- a/key_registry.go +++ b/key_registry.go @@ -28,8 +28,8 @@ import ( "sync" "time" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" ) const ( diff --git a/level_handler.go b/level_handler.go index 310afaa24..2cd106248 100644 --- a/level_handler.go +++ b/level_handler.go @@ -23,8 +23,8 @@ import ( "github.com/dgryski/go-farm" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" ) diff --git a/levels.go b/levels.go index b983424eb..3fb35a2e8 100644 --- a/levels.go +++ b/levels.go @@ -29,9 +29,9 @@ import ( "golang.org/x/net/trace" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" ) diff --git a/managed_db_test.go b/managed_db_test.go index 3ef8f7b1a..f0c47b39c 100644 --- a/managed_db_test.go +++ b/managed_db_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/manifest.go b/manifest.go index f7a73294e..fc3ceb424 100644 --- a/manifest.go +++ b/manifest.go @@ -27,9 +27,9 @@ import ( "path/filepath" "sync" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/golang/protobuf/proto" "github.com/pkg/errors" ) diff --git a/manifest_test.go b/manifest_test.go index bbc95e132..f28270f3b 100644 --- a/manifest_test.go +++ b/manifest_test.go @@ -27,10 +27,10 @@ import ( "golang.org/x/net/trace" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/merge.go b/merge.go index 02ad4bcde..569b297d7 100644 --- a/merge.go +++ b/merge.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" ) diff --git a/options.go b/options.go index 098343a19..7e09c45e1 100644 --- a/options.go +++ b/options.go @@ -19,9 +19,9 @@ package badger import ( "time" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" ) // Note: If you add a new option X make sure you also add a WithX method on Options. diff --git a/publisher.go b/publisher.go index caf23b5c9..a2df351a9 100644 --- a/publisher.go +++ b/publisher.go @@ -19,9 +19,9 @@ package badger import ( "sync" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/trie" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/trie" + "github.com/dgraph-io/badger/v2/y" ) type subscriber struct { diff --git a/publisher_test.go b/publisher_test.go index 18127e388..b0433db70 100644 --- a/publisher_test.go +++ b/publisher_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/badger/pb" + "github.com/dgraph-io/badger/v2/pb" ) func TestPublisherOrdering(t *testing.T) { diff --git a/skl/arena.go b/skl/arena.go index 5aecb7962..9267b1588 100644 --- a/skl/arena.go +++ b/skl/arena.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "unsafe" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" ) const ( diff --git a/skl/skl.go b/skl/skl.go index 61e262cf4..cdfc599be 100644 --- a/skl/skl.go +++ b/skl/skl.go @@ -38,7 +38,7 @@ import ( "sync/atomic" "unsafe" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" ) const ( diff --git a/skl/skl_test.go b/skl/skl_test.go index df97c07fa..6bd075862 100644 --- a/skl/skl_test.go +++ b/skl/skl_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" ) const arenaSize = 1 << 20 diff --git a/stream.go b/stream.go index d89a4af86..2467467d2 100644 --- a/stream.go +++ b/stream.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" humanize "github.com/dustin/go-humanize" "github.com/golang/protobuf/proto" ) diff --git a/stream_test.go b/stream_test.go index 05a16d3fc..92ebcecf7 100644 --- a/stream_test.go +++ b/stream_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - bpb "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + bpb "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/stream_writer.go b/stream_writer.go index 7bea6568a..120beddc4 100644 --- a/stream_writer.go +++ b/stream_writer.go @@ -21,9 +21,9 @@ import ( "math" "sync" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" humanize "github.com/dustin/go-humanize" "github.com/pkg/errors" ) diff --git a/stream_writer_test.go b/stream_writer_test.go index 7b7300a20..e10acc74d 100644 --- a/stream_writer_test.go +++ b/stream_writer_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" ) func getSortedKVList(valueSize, listSize int) *pb.KVList { diff --git a/table/builder.go b/table/builder.go index 134d58f3a..544fa56ab 100644 --- a/table/builder.go +++ b/table/builder.go @@ -27,9 +27,9 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/dgraph-io/ristretto/z" ) diff --git a/table/builder_test.go b/table/builder_test.go index c2b7b5ddc..26886633c 100644 --- a/table/builder_test.go +++ b/table/builder_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" ) func TestTableIndex(t *testing.T) { diff --git a/table/iterator.go b/table/iterator.go index 4bbbc8944..29acb9a94 100644 --- a/table/iterator.go +++ b/table/iterator.go @@ -21,7 +21,7 @@ import ( "io" "sort" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" ) diff --git a/table/merge_iterator.go b/table/merge_iterator.go index 579b61408..676773ab6 100644 --- a/table/merge_iterator.go +++ b/table/merge_iterator.go @@ -17,7 +17,7 @@ package table import ( - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" ) diff --git a/table/merge_iterator_test.go b/table/merge_iterator_test.go index 9733e2392..aaf8102a0 100644 --- a/table/merge_iterator_test.go +++ b/table/merge_iterator_test.go @@ -20,7 +20,7 @@ import ( "sort" "testing" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/table/table.go b/table/table.go index 691332e46..73b48c041 100644 --- a/table/table.go +++ b/table/table.go @@ -34,9 +34,9 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/dgraph-io/ristretto" "github.com/dgraph-io/ristretto/z" ) diff --git a/table/table_test.go b/table/table_test.go index 8c8de96b4..56f9b3032 100644 --- a/table/table_test.go +++ b/table/table_test.go @@ -29,8 +29,8 @@ import ( "time" "github.com/cespare/xxhash" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/y" "github.com/dgraph-io/ristretto" "github.com/stretchr/testify/require" ) diff --git a/txn.go b/txn.go index 7cb2299f7..7af80daef 100644 --- a/txn.go +++ b/txn.go @@ -26,7 +26,7 @@ import ( "sync" "sync/atomic" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/y" "github.com/dgraph-io/ristretto/z" "github.com/pkg/errors" ) diff --git a/txn_test.go b/txn_test.go index 0062288bd..c0b6d7841 100644 --- a/txn_test.go +++ b/txn_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/y" "github.com/stretchr/testify/require" ) diff --git a/util.go b/util.go index c5173e26c..b7f173dd3 100644 --- a/util.go +++ b/util.go @@ -23,8 +23,8 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger/table" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/table" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" ) diff --git a/value.go b/value.go index 9a8d78484..880f2c4b2 100644 --- a/value.go +++ b/value.go @@ -38,9 +38,9 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/pb" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/pb" + "github.com/dgraph-io/badger/v2/y" "github.com/pkg/errors" "golang.org/x/net/trace" ) diff --git a/value_test.go b/value_test.go index 790dc3a81..9f142e369 100644 --- a/value_test.go +++ b/value_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/dgraph-io/badger/options" - "github.com/dgraph-io/badger/y" + "github.com/dgraph-io/badger/v2/options" + "github.com/dgraph-io/badger/v2/y" humanize "github.com/dustin/go-humanize" "github.com/stretchr/testify/require" "golang.org/x/net/trace" diff --git a/y/checksum.go b/y/checksum.go index d7993542c..ab2024842 100644 --- a/y/checksum.go +++ b/y/checksum.go @@ -19,7 +19,7 @@ package y import ( "hash/crc32" - "github.com/dgraph-io/badger/pb" + "github.com/dgraph-io/badger/v2/pb" "github.com/cespare/xxhash" "github.com/pkg/errors"