fix(ristretto): Update ristretto to 623d8ef1614b (#1472)

Update ristretto to hypermodeinc/ristretto@623d8ef1614b.
This PR contains the following changes
- Use `calloc` from `z` package and remove calloc from `y` package.
- Use `onExit` handler instead of the `onReject` and `onEvict` callbacks in ristretto.

Author: Ibrahim Jarif

db.go

@@ -324,12 +324,7 @@ func Open(opt Options) (db *DB, err error) {
 			MaxCost:     int64(float64(opt.MaxCacheSize) * 0.95),
 			BufferItems: 64,
 			Metrics:     true,
-			OnEvict: func(i *ristretto.Item) {
-				table.BlockEvictHandler(i.Value)
-			},
-			OnReject: func(i *ristretto.Item) {
-				table.BlockEvictHandler(i.Value)
-			},
+			OnExit:      table.BlockEvictHandler,
 		}
 		db.blockCache, err = ristretto.NewCache(&config)
 		if err != nil {

go.mod

@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/DataDog/zstd v1.4.1
 	github.com/cespare/xxhash v1.1.0
-	github.com/dgraph-io/ristretto v0.0.4-0.20200817124926-18e279725890
+	github.com/dgraph-io/ristretto v0.0.4-0.20200820164438-623d8ef1614b
 	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

go.sum

@@ -13,8 +13,8 @@ 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/ristretto v0.0.4-0.20200817124926-18e279725890 h1:/6pLcQq2GNdLPOotXztuLDXYRPraTIzZMPiJW8HzAwg=
-github.com/dgraph-io/ristretto v0.0.4-0.20200817124926-18e279725890/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
+github.com/dgraph-io/ristretto v0.0.4-0.20200820164438-623d8ef1614b h1:/g8jOqvD1UzHTOwENtkqcLmMLzTcN18P3ut8aSUZ45g=
+github.com/dgraph-io/ristretto v0.0.4-0.20200820164438-623d8ef1614b/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=

levels.go

@@ -32,6 +32,7 @@ import (
 	"github.com/dgraph-io/badger/v2/pb"
 	"github.com/dgraph-io/badger/v2/table"
 	"github.com/dgraph-io/badger/v2/y"
+	"github.com/dgraph-io/ristretto/z"
 	"github.com/pkg/errors"
 )
 
@@ -703,7 +704,7 @@ nextTable:
 			num := atomic.LoadInt32(&table.NumBlocks)
 			mu.Unlock()
 
-			s.kv.opt.Debugf("Num Blocks: %d. Num Allocs (MB): %.2f\n", num, y.NumAllocs.Value())
+			s.kv.opt.Debugf("Num Blocks: %d. Num Allocs (MB): %.2f\n", num, z.NumAllocsMB())
 		}(builder)
 	}
 

table/builder.go

@@ -97,7 +97,7 @@ func NewTableBuilder(opts Options) *Builder {
 	b := &Builder{
 		// Additional 16 MB to store index (approximate).
 		// We trim the additional space in table.Finish().
-		buf:        y.Calloc(int(opts.TableSize + 16*MB)),
+		buf:        z.Calloc(int(opts.TableSize + 16*MB)),
 		tableIndex: &pb.TableIndex{},
 		keyHashes:  make([]uint64, 0, 1024), // Avoid some malloc calls.
 		opt:        &opts,
@@ -157,14 +157,14 @@ func (b *Builder) handleBlock() {
 		item.end = item.start + uint32(len(blockBuf))
 
 		if doCompress {
-			y.Free(blockBuf)
+			z.Free(blockBuf)
 		}
 	}
 }
 
 // Close closes the TableBuilder.
 func (b *Builder) Close() {
-	y.Free(b.buf)
+	z.Free(b.buf)
 }
 
 // Empty returns whether it's empty.
@@ -228,12 +228,12 @@ func (b *Builder) grow(n uint32) {
 	if n < l/2 {
 		n = l / 2
 	}
-	newBuf := y.Calloc(int(l + n))
+	newBuf := z.Calloc(int(l + n))
 	y.AssertTrue(uint32(len(newBuf)) == l+n)
 
 	b.bufLock.Lock()
 	copy(newBuf, b.buf)
-	y.Free(b.buf)
+	z.Free(b.buf)
 	b.buf = newBuf
 	b.bufLock.Unlock()
 }
@@ -471,20 +471,20 @@ func (b *Builder) encrypt(data []byte, viaC bool) ([]byte, error) {
 	needSz := len(data) + len(iv)
 	var dst []byte
 	if viaC {
-		dst = y.Calloc(needSz)
+		dst = z.Calloc(needSz)
 	} else {
 		dst = make([]byte, needSz)
 	}
 	dst = dst[:len(data)]
 
 	if err = y.XORBlock(dst, data, b.DataKey().Data, iv); err != nil {
 		if viaC {
-			y.Free(dst)
+			z.Free(dst)
 		}
 		return data, y.Wrapf(err, "Error while encrypting in Builder.encrypt")
 	}
 	if viaC {
-		y.Free(data)
+		z.Free(data)
 	}
 
 	y.AssertTrue(cap(dst)-len(dst) >= len(iv))
@@ -504,11 +504,11 @@ func (b *Builder) compressData(data []byte) ([]byte, error) {
 		return data, nil
 	case options.Snappy:
 		sz := snappy.MaxEncodedLen(len(data))
-		dst := y.Calloc(sz)
+		dst := z.Calloc(sz)
 		return snappy.Encode(dst, data), nil
 	case options.ZSTD:
 		sz := zstd.CompressBound(len(data))
-		dst := y.Calloc(sz)
+		dst := z.Calloc(sz)
 		return y.ZSTDCompress(dst, data, b.opt.ZSTDCompressionLevel)
 	}
 	return nil, errors.New("Unsupported compression type")

table/table.go

@@ -243,7 +243,7 @@ func (b *block) decrRef() {
 	// will lead to SEGFAULT.
 	if atomic.AddInt32(&b.ref, -1) == 0 {
 		if b.freeMe {
-			y.Free(b.data)
+			z.Free(b.data)
 		}
 		atomic.AddInt32(&NumBlocks, -1)
 		// blockPool.Put(&b.data)
@@ -813,29 +813,29 @@ func (t *Table) decompress(b *block) error {
 		return nil
 	case options.Snappy:
 		if sz, err := snappy.DecodedLen(b.data); err == nil {
-			dst = y.Calloc(sz)
+			dst = z.Calloc(sz)
 		} else {
-			dst = y.Calloc(len(b.data) * 4) // Take a guess.
+			dst = z.Calloc(len(b.data) * 4) // Take a guess.
 		}
 		b.data, err = snappy.Decode(dst, b.data)
 		if err != nil {
-			y.Free(dst)
+			z.Free(dst)
 			return errors.Wrap(err, "failed to decompress")
 		}
 	case options.ZSTD:
 		sz := int(float64(t.opt.BlockSize) * 1.2)
-		dst = y.Calloc(sz)
+		dst = z.Calloc(sz)
 		b.data, err = y.ZSTDDecompress(dst, b.data)
 		if err != nil {
-			y.Free(dst)
+			z.Free(dst)
 			return errors.Wrap(err, "failed to decompress")
 		}
 	default:
 		return errors.New("Unsupported compression type")
 	}
 
 	if len(b.data) > 0 && len(dst) > 0 && &dst[0] != &b.data[0] {
-		y.Free(dst)
+		z.Free(dst)
 	} else {
 		b.freeMe = true
 	}

y/buffer.go

@@ -16,7 +16,11 @@
 
 package y
 
-import "encoding/binary"
+import (
+	"encoding/binary"
+
+	"github.com/dgraph-io/ristretto/z"
+)
 
 type Buffer struct {
 	buf    []byte
@@ -25,7 +29,7 @@ type Buffer struct {
 
 func NewBuffer(sz int) *Buffer {
 	return &Buffer{
-		buf:    Calloc(sz),
+		buf:    z.Calloc(sz),
 		offset: 0,
 	}
 }
@@ -44,20 +48,20 @@ const smallBufferSize = 64
 func (b *Buffer) Grow(n int) {
 	// In this case, len and cap are the same.
 	if len(b.buf) == 0 && n <= smallBufferSize {
-		b.buf = Calloc(smallBufferSize)
+		b.buf = z.Calloc(smallBufferSize)
 		return
 	} else if b.buf == nil {
-		b.buf = Calloc(n)
+		b.buf = z.Calloc(n)
 		return
 	}
 	if b.offset+n < len(b.buf) {
 		return
 	}
 
 	sz := 2*len(b.buf) + n
-	newBuf := Calloc(sz)
+	newBuf := z.Calloc(sz)
 	copy(newBuf, b.buf[:b.offset])
-	Free(b.buf)
+	z.Free(b.buf)
 	b.buf = newBuf
 }
 
@@ -108,5 +112,5 @@ func (b *Buffer) Reset() {
 }
 
 func (b *Buffer) Release() {
-	Free(b.buf)
+	z.Free(b.buf)
 }