Merge branch 'main' into unsafe_slice

Author: matthewmcneely

README.md

@@ -13,6 +13,7 @@
 [![GitHub Repo stars](https://img.shields.io/github/stars/dgraph-io/dgraph)](https://github.com/dgraph-io/dgraph/stargazers)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/dgraph-io/dgraph)](https://github.com/dgraph-io/dgraph/commits/main/)
 [![Go Report Card](https://goreportcard.com/badge/github.com/dgraph-io/dgraph)](https://goreportcard.com/report/github.com/dgraph-io/dgraph)
+[![Docker Pulls](https://img.shields.io/docker/pulls/dgraph/dgraph)](https://hub.docker.com/r/dgraph/dgraph)
 
 Dgraph is a horizontally scalable and distributed GraphQL database with a graph backend. It provides
 ACID transactions, consistent replication, and linearizable reads. It's built from the ground up to
@@ -29,9 +30,7 @@ and [Protocol Buffers](https://developers.google.com/protocol-buffers/) over
 ## Status
 
 Dgraph is at [version v25][rel] and is production-ready. Apart from the vast open source community,
-it is being used in production at multiple Fortune 500 companies, and by
-[Intuit Katlas](https://github.com/intuit/katlas) and
-[VMware Purser](https://github.com/vmware/purser).
+it is being used in production at multiple Fortune 500 companies.
 
 [rel]: https://github.com/dgraph-io/dgraph/releases/tag/v25.0.0
 
@@ -84,6 +83,7 @@ the GOPATH environment variable is not set.
 ```bash
 git clone https://github.com/dgraph-io/dgraph.git
 cd dgraph
+make setup
 make install
 ```
 

worker/task.go

@@ -823,9 +823,9 @@ func (qs *queryState) handleUidPostings(
 	needFiltering := needsStringFiltering(srcFn, q.Langs, q.Attr)
 	isList := schema.State().IsList(q.Attr)
 
-	errCh := make(chan error, numGo)
 	outputs := make([]*pb.Result, numGo)
 
+	eg, egCtx := errgroup.WithContext(ctx)
 	calculate := func(start, end int) error {
 		x.AssertTrue(start%width == 0)
 		out := &pb.Result{}
@@ -834,8 +834,8 @@ func (qs *queryState) handleUidPostings(
 		for i := start; i < end; i++ {
 			if i%100 == 0 {
 				select {
-				case <-ctx.Done():
-					return ctx.Err()
+				case <-egCtx.Done():
+					return egCtx.Err()
 				default:
 				}
 			}
@@ -978,14 +978,12 @@ func (qs *queryState) handleUidPostings(
 		if end > srcFn.n {
 			end = srcFn.n
 		}
-		go func(start, end int) {
-			errCh <- calculate(start, end)
-		}(start, end)
+		eg.Go(func() error {
+			return calculate(start, end)
+		})
 	}
-	for range numGo {
-		if err := <-errCh; err != nil {
-			return err
-		}
+	if err := eg.Wait(); err != nil {
+		return err
 	}
 	// All goroutines are done. Now attach their results.
 	out := args.out
@@ -1635,11 +1633,20 @@ func (qs *queryState) filterGeoFunction(ctx context.Context, arg funcArgs) error
 		attribute.Int("num_go", numGo),
 		attribute.Int("width", width)))
 
+	eg, egCtx := errgroup.WithContext(ctx)
 	filtered := make([]*pb.List, numGo)
 	filter := func(idx, start, end int) error {
 		filtered[idx] = &pb.List{}
 		out := filtered[idx]
-		for _, uid := range uids.Uids[start:end] {
+		for i := start; i < end; i++ {
+			uid := uids.Uids[i]
+			if i%100 == 0 {
+				select {
+				case <-egCtx.Done():
+					return egCtx.Err()
+				default:
+				}
+			}
 			pl, err := qs.cache.Get(x.DataKey(attr, uid))
 			if err != nil {
 				return err
@@ -1661,21 +1668,19 @@ func (qs *queryState) filterGeoFunction(ctx context.Context, arg funcArgs) error
 		return nil
 	}
 
-	errCh := make(chan error, numGo)
 	for i := range numGo {
 		start := i * width
 		end := start + width
 		if end > len(uids.Uids) {
 			end = len(uids.Uids)
 		}
-		go func(idx, start, end int) {
-			errCh <- filter(idx, start, end)
-		}(i, start, end)
+		idx := i
+		eg.Go(func() error {
+			return filter(idx, start, end)
+		})
 	}
-	for range numGo {
-		if err := <-errCh; err != nil {
-			return err
-		}
+	if err := eg.Wait(); err != nil {
+		return err
 	}
 	final := &pb.List{}
 	for _, out := range filtered {

x/init.go

@@ -53,8 +53,8 @@ jemalloc enabled : %v
 GOMAXPROCS       : %v
 Num CPUs         : %v
 
-For Dgraph official documentation, visit https://dgraph.io/docs.
-For discussions about Dgraph     , visit https://discuss.dgraph.io.
+For Dgraph official documentation, visit https://docs.dgraph.io
+For discussions about Dgraph     , visit https://github.com/orgs/dgraph-io/discussions
 
 %s.
 © Istari Digital, Inc.