merging upstream

.github/workflows/CI.yml

@@ -0,0 +1,67 @@
+name: CI
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - 'release/**'
+  pull_request:
+    branches: 
+      - '*'
+jobs:
+  CI:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
+      - name: Make OSS Build
+        run: make oss
+      - name: Make macOS build
+        run: make GOOS=darwin dgraph
+      - name: Make Windows Build
+        run: make GOOS=windows dgraph
+      - name: Make Linux Build 
+        run: make GOOS=linux dgraph
+      - name: Install protobuf-compiler
+        run: sudo apt-get install -y protobuf-compiler
+      - name: Check protobuf
+        run: |
+          cd ./protos
+          go mod tidy
+          make regenerate
+          git diff --exit-code -- .
+      - name: Run unit tests
+        run: |
+          #!/bin/bash
+          if [ -f go.mod ]; then
+            export GO111MODULE=on
+          fi
+
+
+          # Run the Go test script. Or, run test.sh if the Go test script doesn't exist.
+          if [ -d ./t ]; then
+            #docker rmi dgraph/dgraph-lambda:latest
+            export GOPATH=$HOME/go
+            ls -alrt ~/go || true # TODO: fix later
+            cd t; go build .
+            mkdir ~/go || true # TODO: fix later
+            mkdir ~/go/bin || true # TODO: fix later
+            cp ~/work/dgraph/dgraph/dgraph ~/go/bin || true # TODO: fix later $GOPATH issue
+            export GOPATH=~/go
+            ls -alrt $GOPATH/bin
+            ./t -r
+            ./t --skip tlstest,systest/backup,systest/online-restore,systest/loader || true
+          else # unwanted
+            # Stop running containers
+            docker ps --filter label="cluster=test" --format "{{.Names}}" \
+            | xargs -r docker stop | sed 's/^/Stopped /'
+            # Remove all containers
+            docker ps -a --filter label="cluster=test" --format "{{.Names}}" \
+            | xargs -r docker rm -f | sed 's/^/Removed /'
+
+            ./test.sh # this was the older way to run tests
+          fi

.github/workflows/golangci-lint.yml

@@ -0,0 +1,26 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - 'release/**'
+  pull_request:
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        env:
+          # prevent OOM
+          GOGC: 10
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.36
+          only-new-issues: true
+          args: --timeout=10m
+          skip-go-installation: true

.gitignore

@@ -4,6 +4,12 @@
 /dgraph-bulk-loader
 /osx-docker-gopath
 
+# test
+t/test*log
+
+# secrets
+compose/hmac_secret_file
+
 # fuzzing output
 gql/gql-fuzz.zip
 gql/fuzz-data/crashers
@@ -33,3 +39,4 @@ dgraph.iml
 .DS_Store
 
 vendor
+.minio.sys

CONTRIBUTING.md

@@ -133,7 +133,7 @@ Copyright 2015-2018 Dgraph Labs, Inc.
 ```
 
 For release images, follow [Doing a release](#doing-a-release). It creates
-Docker images that contains `dgraph`, `dgraph-ratel`, and `badger` commands.
+Docker images that contains `dgraph` and `badger` commands.
 
 ### Testing
 

Makefile

@@ -15,7 +15,7 @@
 #
 
 BUILD          ?= $(shell git rev-parse --short HEAD)
-BUILD_CODENAME  = unnamed
+BUILD_CODENAME  = zion
 BUILD_DATE     ?= $(shell git log -1 --format=%ci)
 BUILD_BRANCH   ?= $(shell git rev-parse --abbrev-ref HEAD)
 BUILD_VERSION  ?= $(shell git describe --always --tags)
@@ -64,7 +64,7 @@ test:
 
 image:
 	@GOOS=linux $(MAKE) dgraph
-	@mkdir linux
+	@mkdir -p linux
 	@mv ./dgraph/dgraph ./linux/dgraph
 	@docker build -f contrib/Dockerfile -t dgraph/dgraph:$(subst /,-,${BUILD_BRANCH}) .
 	@rm -r linux

README.md

@@ -7,25 +7,25 @@
 [![Coverage Status](https://coveralls.io/repos/github/dgraph-io/dgraph/badge.svg?branch=master)](https://coveralls.io/github/dgraph-io/dgraph?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/dgraph-io/dgraph)](https://goreportcard.com/report/github.com/dgraph-io/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 ground up to perform for
+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 perform for
 a rich set of queries. Being a native GraphQL database, it tightly controls how the
 data is arranged on disk to optimize for query performance and throughput,
 reducing disk seeks and network calls in a cluster.
 
 
 Dgraph's goal is to provide [Google](https://www.google.com) production level scale and throughput,
-with low enough latency to be serving real time user queries, over terabytes of structured data.
+with low enough latency to be serving real-time user queries, over terabytes of structured data.
 Dgraph supports [GraphQL query syntax](https://dgraph.io/docs/master/query-language/), and responds in [JSON](http://www.json.org/) and [Protocol Buffers](https://developers.google.com/protocol-buffers/) over [GRPC](http://www.grpc.io/) and HTTP.
 
 **Use [Discuss Issues](https://discuss.dgraph.io/c/issues/dgraph/38) for reporting issues about this repository.**
 
 ## Status
 
-Dgraph is [at version 20.07.2][rel] and is production ready. Apart from the vast open source community, it is being used in
+Dgraph is [at version v21.03.0][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).
 
-[rel]: https://github.com/dgraph-io/dgraph/releases
+[rel]: https://github.com/dgraph-io/dgraph/releases/tag/v21.03.0
 
 ## Quick Install
 
@@ -47,14 +47,16 @@ docker pull dgraph/dgraph:latest
 
 If you want to install from source, install Go 1.13+ or later and the following dependencies:
 
-Ubuntu:
+### Ubuntu
+
 ```bash
 sudo apt-get update
 sudo apt-get install gcc make
 ```
 
-Then clone the Dgraph repository and use `make install` to install the Dgraph binary to `$GOPATH/bin`.
+### Build and Install
 
+Then clone the Dgraph repository and use `make install` to install the Dgraph binary to `$GOPATH/bin`.
 
 ```bash
 git clone https://github.com/dgraph-io/dgraph.git
@@ -72,16 +74,16 @@ presentation videos on [YouTube channel](https://www.youtube.com/channel/UCghE41
 
 ## Is Dgraph the right choice for me?
 
-- Do you have more than 10 SQL tables, connected to each other via foreign keys?
+- Do you have more than 10 SQL tables connected via foreign keys?
 - Do you have sparse data, which doesn't elegantly fit into SQL tables?
 - Do you want a simple and flexible schema, which is readable and maintainable
   over time?
 - Do you care about speed and performance at scale?
 
 If the answers to the above are YES, then Dgraph would be a great fit for your
 application. Dgraph provides NoSQL like scalability while providing SQL like
-transactions and ability to select, filter and aggregate data points. It
-combines that with distributed joins, traversals and graph operations, which
+transactions and the ability to select, filter, and aggregate data points. It
+combines that with distributed joins, traversals, and graph operations, which
 makes it easy to build applications with it.
 
 ## Dgraph compared to other graph DBs
@@ -94,7 +96,7 @@ makes it easy to build applications with it.
 | Language | GraphQL inspired | Cypher, Gremlin | Gremlin |
 | Protocols | Grpc / HTTP + JSON / RDF | Bolt + Cypher | Websocket / HTTP |
 | Transactions | Distributed ACID transactions | Single server ACID transactions | Not typically ACID
-| Full Text Search | Native support | Native support | Via External Indexing System |
+| Full-Text Search | Native support | Native support | Via External Indexing System |
 | Regular Expressions | Native support | Native support | Via External Indexing System |
 | Geo Search | Native support | External support only | Via External Indexing System |
 | License | Apache 2.0 | GPL v3 | Apache 2.0 |
@@ -107,9 +109,9 @@ makes it easy to build applications with it.
   play.dgraph.io](http://play.dgraph.io/).
 - Please see [releases tab](https://github.com/dgraph-io/dgraph/releases) to
   find the latest release and corresponding release notes.
-- [See the Roadmap](https://discuss.dgraph.io/t/product-roadmap-2020/8479) for list of
+- [See the Roadmap](https://discuss.dgraph.io/t/dgraph-product-roadmap-2021/12284) for a list of
   working and planned features.
-- Read about the latest updates from Dgraph team [on our
+- Read about the latest updates from the Dgraph team [on our
   blog](https://open.dgraph.io/).
 - Watch tech talks on our [YouTube
   channel](https://www.youtube.com/channel/UCghE41LR8nkKFlR3IFTRO4w/featured).
@@ -119,7 +121,7 @@ makes it easy to build applications with it.
 - Please see [Contributing to Dgraph](https://github.com/dgraph-io/dgraph/blob/master/CONTRIBUTING.md) for guidelines on contributions.
 
 ## Client Libraries
-The Dgraph team maintain a number of [officially supported client libraries](https://dgraph.io/docs/clients/). There are also libraries contributed by the community [unofficial client libraries](https://dgraph.io/docs/clients#unofficial-dgraph-clients).
+The Dgraph team maintains several [officially supported client libraries](https://dgraph.io/docs/clients/). There are also libraries contributed by the community [unofficial client libraries](https://dgraph.io/docs/clients#unofficial-dgraph-clients).
 
 ## Contact
 - Please use [discuss.dgraph.io](https://discuss.dgraph.io) for documentation, questions, feature requests and discussions.