retract v4.3.0 due to #2121 and #2113, upgrade to Go v1.23, use ristretto v2 (#2122)

mangalaman93 · web-flow · commit 7f657f862cbd · 2024-10-25T22:03:34.000+05:30
Fixes #2121
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.19
+1.23
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ For more details on our version naming schema please read [Choosing a version](#
 ## Getting Started
 
 ### Installing
-To start using Badger, install Go 1.19 or above. Badger v3 and above needs go modules. From your project, run the following command
+To start using Badger, install Go 1.23 or above. Badger v3 and above needs go modules. From your project, run the following command
 
 ```sh
 $ go get github.com/dgraph-io/badger/v4
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/backup.go b/backup.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // flushThreshold determines when a buffer will be flushed. When performing a
diff --git a/badger/cmd/bank.go b/badger/cmd/bank.go
@@ -36,7 +36,7 @@ import (
 	"github.com/dgraph-io/badger/v4"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 var testCmd = &cobra.Command{
diff --git a/badger/cmd/read_bench.go b/badger/cmd/read_bench.go
@@ -31,7 +31,7 @@ import (
 	"github.com/dgraph-io/badger/v4"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 var readBenchCmd = &cobra.Command{
diff --git a/badger/cmd/write_bench.go b/badger/cmd/write_bench.go
@@ -36,7 +36,7 @@ import (
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 var writeBenchCmd = &cobra.Command{
diff --git a/badger/main.go b/badger/main.go
@@ -26,7 +26,7 @@ import (
 	"go.opencensus.io/zpages"
 
 	"github.com/dgraph-io/badger/v4/badger/cmd"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 func main() {
diff --git a/batch.go b/batch.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // WriteBatch holds the necessary info to perform batched writes.
diff --git a/db.go b/db.go
@@ -41,8 +41,8 @@ import (
 	"github.com/dgraph-io/badger/v4/skl"
 	"github.com/dgraph-io/badger/v4/table"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 var (
diff --git a/db2_test.go b/db2_test.go
@@ -39,7 +39,7 @@ import (
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/table"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 func TestTruncateVlogWithClose(t *testing.T) {
diff --git a/db_test.go b/db_test.go
@@ -37,7 +37,7 @@ import (
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // waitForMessage(ch, expected, count, timeout, t) will block until either
diff --git a/discard.go b/discard.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // discardStats keeps track of the amount of data that could be discarded for
diff --git a/docs/content/get-started/index.md b/docs/content/get-started/index.md
@@ -1,11 +1,11 @@
-+++ 
-title = "Get Started - Quickstart Guide" 
-aliases = ["/get-started"] 
++++
+title = "Get Started - Quickstart Guide"
+aliases = ["/get-started"]
 +++
 
 
 ## Installing
-To start using Badger, install Go 1.19 or above. Run the following command to retrieve the library.
+To start using Badger, install Go 1.23 or above. Run the following command to retrieve the library.
 
 ```sh
 $ go get github.com/dgraph-io/badger/v4
diff --git a/go.mod b/go.mod
@@ -1,10 +1,10 @@
 module github.com/dgraph-io/badger/v4
 
-go 1.19
+go 1.23
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0
-	github.com/dgraph-io/ristretto v1.0.0
+	github.com/dgraph-io/ristretto/v2 v2.0.0-alpha
 	github.com/dustin/go-humanize v1.0.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.4
@@ -31,3 +31,5 @@ require (
 )
 
 retract v4.0.0 // see #1888 and #1889
+
+retract v4.3.0 // see #2113 and #2121
diff --git a/go.sum b/go.sum
@@ -9,9 +9,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 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/ristretto v1.0.0 h1:SYG07bONKMlFDUYu5pEu3DGAh8c2OFNzKm6G9J4Si84=
-github.com/dgraph-io/ristretto v1.0.0/go.mod h1:jTi2FiYEhQ1NsMmA7DeBykizjOuY88NhKBkepyu1jPc=
+github.com/dgraph-io/ristretto/v2 v2.0.0-alpha h1:JBy5Mm/z1HBj3hyDLFBS2uHalL971q3yjUaKcia0Sgo=
+github.com/dgraph-io/ristretto/v2 v2.0.0-alpha/go.mod h1:7bFGBdXzLfFFjKCN8YDQ7+98m/AEYcrdqH7s0En96Qg=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
+github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -44,6 +45,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -108,6 +110,7 @@ golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
diff --git a/integration/testgc/main.go b/integration/testgc/main.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 var maxValue int64 = 10000000
diff --git a/iterator.go b/iterator.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4/table"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 type prefetchStatus uint8
diff --git a/levels.go b/levels.go
@@ -37,7 +37,7 @@ import (
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/table"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 type levelsController struct {
diff --git a/managed_db_test.go b/managed_db_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 func val(large bool) []byte {
diff --git a/memtable.go b/memtable.go
@@ -38,7 +38,7 @@ import (
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/skl"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // memTable structure stores a skiplist and a corresponding WAL. Writes to memTable are written
diff --git a/merge.go b/merge.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // MergeOperator represents a Badger merge operator.
diff --git a/options.go b/options.go
@@ -29,7 +29,7 @@ import (
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/table"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // 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
@@ -23,7 +23,7 @@ import (
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/trie"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 type subscriber struct {
diff --git a/skl/skl.go b/skl/skl.go
@@ -38,7 +38,7 @@ import (
 	"unsafe"
 
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 const (
diff --git a/stream.go b/stream.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 const batchSize = 16 << 20 // 16 MB
diff --git a/stream_test.go b/stream_test.go
@@ -30,7 +30,7 @@ import (
 
 	bpb "github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 func keyWithPrefix(prefix string, k int) []byte {
diff --git a/stream_writer.go b/stream_writer.go
@@ -27,7 +27,7 @@ import (
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/table"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 // StreamWriter is used to write data coming from multiple streams. The streams must not have any
diff --git a/stream_writer_test.go b/stream_writer_test.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 func getSortedKVList(valueSize, listSize int) *z.Buffer {
diff --git a/table/builder.go b/table/builder.go
@@ -33,7 +33,7 @@ import (
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 const (
diff --git a/table/builder_test.go b/table/builder_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto"
+	"github.com/dgraph-io/ristretto/v2"
 )
 
 func TestTableIndex(t *testing.T) {
diff --git a/table/table.go b/table/table.go
@@ -40,8 +40,8 @@ import (
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 const fileSuffix = ".sst"
diff --git a/table/table_test.go b/table/table_test.go
@@ -34,7 +34,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4/options"
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto"
+	"github.com/dgraph-io/ristretto/v2"
 )
 
 func key(prefix string, i int) string {
diff --git a/txn.go b/txn.go
@@ -29,7 +29,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 type oracle struct {
diff --git a/txn_test.go b/txn_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/dgraph-io/badger/v4/y"
-	"github.com/dgraph-io/ristretto/z"
+	"github.com/dgraph-io/ristretto/v2/z"
 )
 
 func TestTxnSimple(t *testing.T) {
diff --git a/value.go b/value.go
diff --git a/y/watermark.go b/y/watermark.go
diff --git a/y/y.go b/y/y.go
diff --git a/y/y_test.go b/y/y_test.go

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`
`29`	`29`	`"github.com/dgraph-io/badger/v4/pb"`
`30`	`30`	`"github.com/dgraph-io/badger/v4/y"`
`31`		`- "github.com/dgraph-io/ristretto/z"`
	`31`	`+ "github.com/dgraph-io/ristretto/v2/z"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`// flushThreshold determines when a buffer will be flushed. When performing a`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`	`"github.com/dgraph-io/badger/v4"`
`37`	`37`	`"github.com/dgraph-io/badger/v4/pb"`
`38`	`38`	`"github.com/dgraph-io/badger/v4/y"`
`39`		`- "github.com/dgraph-io/ristretto/z"`
	`39`	`+ "github.com/dgraph-io/ristretto/v2/z"`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`var testCmd = &cobra.Command{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"github.com/dgraph-io/badger/v4"`
`32`	`32`	`"github.com/dgraph-io/badger/v4/pb"`
`33`	`33`	`"github.com/dgraph-io/badger/v4/y"`
`34`		`- "github.com/dgraph-io/ristretto/z"`
	`34`	`+ "github.com/dgraph-io/ristretto/v2/z"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`var readBenchCmd = &cobra.Command{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"go.opencensus.io/zpages"`
`27`	`27`
`28`	`28`	`"github.com/dgraph-io/badger/v4/badger/cmd"`
`29`		`- "github.com/dgraph-io/ristretto/z"`
	`29`	`+ "github.com/dgraph-io/ristretto/v2/z"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`"github.com/dgraph-io/badger/v4/pb"`
`26`	`26`	`"github.com/dgraph-io/badger/v4/y"`
`27`		`- "github.com/dgraph-io/ristretto/z"`
	`27`	`+ "github.com/dgraph-io/ristretto/v2/z"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// WriteBatch holds the necessary info to perform batched writes.`