opt(sroar): upgrade sroar to use optimised IsEmpty API (#8010)

ahsanbarkati · web-flow · commit a092dc0da025 · 2021-09-02T20:52:15.000+05:30
Upgrade sroar to use an optimized version of IsEmpty API.
diff --git a/codec/codec.go b/codec/codec.go
@@ -134,7 +134,7 @@ func Merge(matrix []*pb.List) *sroar.Bitmap {
 
 func FromList(l *pb.List) *sroar.Bitmap {
 	if l == nil {
-		return nil
+		return sroar.NewBitmap()
 	}
 	// Keep the check for bitmap before sortedUids because we expect to have bitmap very often
 	if len(l.Bitmap) > 0 {
@@ -145,13 +145,12 @@ func FromList(l *pb.List) *sroar.Bitmap {
 		bm.SetMany(l.SortedUids)
 		return bm
 	}
-	// TODO: Return nil here and handle nil for all the APIs in sroar itself.
 	return sroar.NewBitmap()
 }
 
 func FromListNoCopy(l *pb.List) *sroar.Bitmap {
 	if l == nil {
-		return nil
+		return sroar.NewBitmap()
 	}
 	// Keep the check for bitmap before sortedUids because we expect to have bitmap very often
 	if len(l.Bitmap) > 0 {
@@ -162,7 +161,7 @@ func FromListNoCopy(l *pb.List) *sroar.Bitmap {
 		bm.SetMany(l.SortedUids)
 		return bm
 	}
-	return nil
+	return sroar.NewBitmap()
 }
 
 func FromBytes(buf []byte) *sroar.Bitmap {
diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15
 	github.com/dgraph-io/ristretto v0.1.1-0.20210824115121-89e99415887a
 	github.com/dgraph-io/simdjson-go v0.3.0
-	github.com/dgraph-io/sroar v0.0.0-20210830053543-c5aff93143f7
+	github.com/dgraph-io/sroar v0.0.0-20210831151133-ad6554cce45c
 	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
diff --git a/go.sum b/go.sum
@@ -182,8 +182,8 @@ github.com/dgraph-io/ristretto v0.1.1-0.20210824115121-89e99415887a h1:2+hTlwc5y
 github.com/dgraph-io/ristretto v0.1.1-0.20210824115121-89e99415887a/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
 github.com/dgraph-io/simdjson-go v0.3.0 h1:h71LO7vR4LHMPUhuoGN8bqGm1VNfGOlAG8BI6iDUKw0=
 github.com/dgraph-io/simdjson-go v0.3.0/go.mod h1:Otpysdjaxj9OGaJusn4pgQV7OFh2bELuHANq0I78uvY=
-github.com/dgraph-io/sroar v0.0.0-20210830053543-c5aff93143f7 h1:GUNuYUk6Owo1GIxwDxiIDXSn/T3fgpxWbiXmnKFq5Ig=
-github.com/dgraph-io/sroar v0.0.0-20210830053543-c5aff93143f7/go.mod h1:bdNPtQmcxoIQVkZEWZvX0n0/IDlHFab397xdBlP4OoE=
+github.com/dgraph-io/sroar v0.0.0-20210831151133-ad6554cce45c h1:bHaFPV/3WghTvYa3deF8atHQWk85yfEwFlRgMu89SSo=
+github.com/dgraph-io/sroar v0.0.0-20210831151133-ad6554cce45c/go.mod h1:bdNPtQmcxoIQVkZEWZvX0n0/IDlHFab397xdBlP4OoE=
 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=
diff --git a/query/recurse.go b/query/recurse.go
@@ -129,7 +129,7 @@ func (start *SubGraph) expandRecurse(ctx context.Context, maxDepth uint64) error
 				} else {
 					ul := sg.uidMatrix[mIdx]
 					ur := codec.FromListNoCopy(ul)
-					if ur == nil {
+					if ur.IsEmpty() {
 						continue
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func Merge(matrix []pb.List) sroar.Bitmap {`
`134`	`134`
`135`	`135`	`func FromList(l pb.List) sroar.Bitmap {`
`136`	`136`	`if l == nil {`
`137`		`- return nil`
	`137`	`+ return sroar.NewBitmap()`
`138`	`138`	`}`
`139`	`139`	`// Keep the check for bitmap before sortedUids because we expect to have bitmap very often`
`140`	`140`	`if len(l.Bitmap) > 0 {`
`@@ -145,13 +145,12 @@ func FromList(l pb.List) sroar.Bitmap {`
`145`	`145`	`bm.SetMany(l.SortedUids)`
`146`	`146`	`return bm`
`147`	`147`	`}`
`148`		`- // TODO: Return nil here and handle nil for all the APIs in sroar itself.`
`149`	`148`	`return sroar.NewBitmap()`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`func FromListNoCopy(l pb.List) sroar.Bitmap {`
`153`	`152`	`if l == nil {`
`154`		`- return nil`
	`153`	`+ return sroar.NewBitmap()`
`155`	`154`	`}`
`156`	`155`	`// Keep the check for bitmap before sortedUids because we expect to have bitmap very often`
`157`	`156`	`if len(l.Bitmap) > 0 {`
`@@ -162,7 +161,7 @@ func FromListNoCopy(l pb.List) sroar.Bitmap {`
`162`	`161`	`bm.SetMany(l.SortedUids)`
`163`	`162`	`return bm`
`164`	`163`	`}`
`165`		`- return nil`
	`164`	`+ return sroar.NewBitmap()`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`func FromBytes(buf []byte) *sroar.Bitmap {`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func (start *SubGraph) expandRecurse(ctx context.Context, maxDepth uint64) error`
`129`	`129`	`} else {`
`130`	`130`	`ul := sg.uidMatrix[mIdx]`
`131`	`131`	`ur := codec.FromListNoCopy(ul)`
`132`		`- if ur == nil {`
	`132`	`+ if ur.IsEmpty() {`
`133`	`133`	`continue`
`134`	`134`	`}`
`135`	`135`