Fix(OOM): Use z.Allocator again (#7068)

* Use z.Allocator again
* Update go.mod

go.mod

@@ -16,12 +16,12 @@ require (
 	github.com/OneOfOne/xxhash v1.2.5 // indirect
 	github.com/blevesearch/bleve v1.0.13
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd
-	github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201203233011-74f2e0277ca4
+	github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201204213844-b80c792be789
 	github.com/dgraph-io/dgo/v200 v200.0.0-20200805103119-a3544c464dd6
 	github.com/dgraph-io/gqlgen v0.13.2
 	github.com/dgraph-io/gqlparser/v2 v2.1.1
 	github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b
-	github.com/dgraph-io/ristretto v0.0.4-0.20201202085424-bc9300e7ef23
+	github.com/dgraph-io/ristretto v0.0.4-0.20201204194510-b7ca2e90f544
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13

go.sum

@@ -116,10 +116,10 @@ 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/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Evo=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201203033043-70088c6e3493 h1:fv+0PT5qLTY3T05PzsR7t8eeLpEFrZAPYm1XcUgS54E=
-github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201203033043-70088c6e3493/go.mod h1:9wxlY1rHS5WFCTV2se5DGZ5fc+wKotRHl4bWJkfqp7c=
-github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201203233011-74f2e0277ca4 h1:bkE7fHWqUank6v9oKMeEmVplK649BRolazhOE5ZHDZU=
-github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201203233011-74f2e0277ca4/go.mod h1:9wxlY1rHS5WFCTV2se5DGZ5fc+wKotRHl4bWJkfqp7c=
+github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201204205940-a75cb55b76c9 h1:bHe1GkpwUNklzURHih0/9k67NV2qVrkW1VTrITEy9bQ=
+github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201204205940-a75cb55b76c9/go.mod h1:BUmAYT5mbXqgTKEAwq+ilhtwuoRGbp09ZeT5FusoHq8=
+github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201204213844-b80c792be789 h1:/ebhYaE0CV7bmGmu7MAatVYuIICmnB/u+bnH/aMGnKs=
+github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201204213844-b80c792be789/go.mod h1:BUmAYT5mbXqgTKEAwq+ilhtwuoRGbp09ZeT5FusoHq8=
 github.com/dgraph-io/dgo/v200 v200.0.0-20200805103119-a3544c464dd6 h1:toHzMCdCUgYsjM0cW9+wafnKFXfp1HizIJUyzihN+vk=
 github.com/dgraph-io/dgo/v200 v200.0.0-20200805103119-a3544c464dd6/go.mod h1:rHa+h3kI4M8ASOirxyIyNeXBfHFgeskVUum2OrDMN3U=
 github.com/dgraph-io/gqlgen v0.13.2 h1:TNhndk+eHKj5qE7BenKKSYdSIdOGhLqxR1rCiMso9KM=
@@ -128,10 +128,8 @@ github.com/dgraph-io/gqlparser/v2 v2.1.1 h1:OBGI6VR+WcegjDB3JdNPMpKpEtITHWzgmiCX
 github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU=
 github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b h1:PDEhlwHpkEQ5WBfOOKZCNZTXFDGyCEWTYDhxGQbyIpk=
 github.com/dgraph-io/graphql-transport-ws v0.0.0-20200916064635-48589439591b/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ=
-github.com/dgraph-io/ristretto v0.0.4-0.20201125174811-766bca5e9938 h1:FdSJif9oUVeH+MpsScsrL6OAbdW0pUYvXmkdhDSWWcQ=
-github.com/dgraph-io/ristretto v0.0.4-0.20201125174811-766bca5e9938/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ=
-github.com/dgraph-io/ristretto v0.0.4-0.20201202085424-bc9300e7ef23 h1:qerTaVhpuO4IU2suPBGa50E6Dusyw3BkdWSvWb1mKXA=
-github.com/dgraph-io/ristretto v0.0.4-0.20201202085424-bc9300e7ef23/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ=
+github.com/dgraph-io/ristretto v0.0.4-0.20201204194510-b7ca2e90f544 h1:6vntPuznvHo+vxTe3KZYzJeorSUt5wkY+1ICtn1GEj0=
+github.com/dgraph-io/ristretto v0.0.4-0.20201204194510-b7ca2e90f544/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 h1:CaO/zOnF8VvUfEbhRatPcwKVWamvbYd8tQGRWacE9kU=

worker/backup_processor.go

@@ -132,7 +132,7 @@ func (pr *BackupProcessor) WriteBackup(ctx context.Context) (*pb.BackupResponse,
 
 	stream.KeyToList = func(key []byte, itr *badger.Iterator) (*bpb.KVList, error) {
 		tl := pr.threads[itr.ThreadId]
-		tl.alloc = nil
+		tl.alloc = itr.Alloc
 		kvList, dropOp, err := tl.toBackupList(key, itr)
 		if err != nil {
 			return nil, err

worker/predicate_move.go

@@ -313,7 +313,7 @@ func movePredicateHelper(ctx context.Context, in *pb.MovePredicatePayload) error
 		if err != nil {
 			return nil, err
 		}
-		kvs, err := l.Rollup(nil)
+		kvs, err := l.Rollup(itr.Alloc)
 		for _, kv := range kvs {
 			// Let's set all of them at this move timestamp.
 			kv.Version = in.TxnTs