feat(DQL): Rename gql package to dql (#8429)

## Problem

GraphQL Spec uses the acronym GQL to reference its language in its
packages. Dgraph used this acronym in the past because the language was
called "GraphQL+-". But today as the name has been updated and we have
native support for GraphQL. This becomes a problem as it confuses
package names.


## Solution

Rename GQL package to DQL

Author: MichelDiz

.github/labeler.yml

@@ -8,7 +8,7 @@ area/bulk-loader:
 area/live-loader:
   - dgraph/cmd/live/**/*
 area/querylang:
-  - gql/**/*
+  - dql/**/*
 area/integrations:
   - contrib/**/*
   - .github/**/*

.gitignore

@@ -5,9 +5,9 @@
 /osx-docker-gopath
 
 # fuzzing output
-gql/gql-fuzz.zip
-gql/fuzz-data/crashers
-gql/fuzz-data/suppressions
+dql/dql-fuzz.zip
+dql/fuzz-data/crashers
+dql/fuzz-data/suppressions
 
 # goland project folder
 .idea

dgraph/cmd/alpha/http.go

@@ -35,8 +35,8 @@ import (
 	"github.com/dgraph-io/dgraph/graphql/admin"
 
 	"github.com/dgraph-io/dgo/v210/protos/api"
+	"github.com/dgraph-io/dgraph/dql"
 	"github.com/dgraph-io/dgraph/edgraph"
-	"github.com/dgraph-io/dgraph/gql"
 	"github.com/dgraph-io/dgraph/graphql/schema"
 	"github.com/dgraph-io/dgraph/query"
 	"github.com/dgraph-io/dgraph/x"
@@ -392,7 +392,7 @@ func mutationHandler(w http.ResponseWriter, r *http.Request) {
 
 	case "application/rdf":
 		// Parse N-Quads.
-		req, err = gql.ParseMutation(string(body))
+		req, err = dql.ParseMutation(string(body))
 		if err != nil {
 			x.SetStatus(w, x.ErrorInvalidRequest, err.Error())
 			return

dgraph/cmd/alpha/run_test.go

@@ -33,7 +33,7 @@ import (
 
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
-	"github.com/dgraph-io/dgraph/gql"
+	"github.com/dgraph-io/dgraph/dql"
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/query"
 	"github.com/dgraph-io/dgraph/schema"
@@ -66,7 +66,7 @@ func timestamp() uint64 {
 }
 
 func processToFastJSON(q string) string {
-	res, err := gql.Parse(gql.Request{Str: q})
+	res, err := dql.Parse(dql.Request{Str: q})
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -874,7 +874,7 @@ var q5 = `
 `
 
 func TestSchemaValidationError(t *testing.T) {
-	_, err := gql.Parse(gql.Request{Str: m5})
+	_, err := dql.Parse(dql.Request{Str: m5})
 	require.Error(t, err)
 	output, err := runGraphqlQuery(strings.Replace(q5, "<id>", "0x8", -1))
 	require.NoError(t, err)
@@ -1687,8 +1687,8 @@ type Token struct {
 	sync.RWMutex
 }
 
-//// the grootAccessJWT stores the access JWT extracted from the response
-//// of http login
+// // the grootAccessJWT stores the access JWT extracted from the response
+// // of http login
 var token *Token
 
 func (t *Token) getAccessJWTToken() string {

dgraph/cmd/bulk/mapper.go

@@ -31,7 +31,7 @@ import (
 
 	"github.com/dgraph-io/dgo/v210/protos/api"
 	"github.com/dgraph-io/dgraph/chunker"
-	"github.com/dgraph-io/dgraph/gql"
+	"github.com/dgraph-io/dgraph/dql"
 	"github.com/dgraph-io/dgraph/posting"
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/tok"
@@ -239,7 +239,7 @@ func (m *mapper) run(inputFormat chunker.InputFormat) {
 				}
 			}
 
-			m.processNQuad(gql.NQuad{NQuad: nq})
+			m.processNQuad(dql.NQuad{NQuad: nq})
 			atomic.AddInt64(&m.prog.nquadCount, 1)
 		}
 
@@ -285,7 +285,7 @@ func (m *mapper) addMapEntry(key []byte, p *pb.Posting, shard int) {
 	marshalMapEntry(dst, uid, key, p)
 }
 
-func (m *mapper) processNQuad(nq gql.NQuad) {
+func (m *mapper) processNQuad(nq dql.NQuad) {
 	if m.opt.Namespace != math.MaxUint64 {
 		// Use the specified namespace passed through '--force-namespace' flag.
 		nq.Namespace = m.opt.Namespace
@@ -359,7 +359,7 @@ func (m *mapper) lookupUid(xid string, ns uint64) uint64 {
 		// Don't store xids for blank nodes.
 		return uid
 	}
-	nq := gql.NQuad{NQuad: &api.NQuad{
+	nq := dql.NQuad{NQuad: &api.NQuad{
 		Subject:   xid,
 		Predicate: "xid",
 		ObjectValue: &api.Value{
@@ -371,7 +371,7 @@ func (m *mapper) lookupUid(xid string, ns uint64) uint64 {
 	return uid
 }
 
-func (m *mapper) createPostings(nq gql.NQuad,
+func (m *mapper) createPostings(nq dql.NQuad,
 	de *pb.DirectedEdge) (*pb.Posting, *pb.Posting) {
 
 	m.schema.validateType(de, nq.ObjectValue == nil)
@@ -407,7 +407,7 @@ func (m *mapper) createPostings(nq gql.NQuad,
 	return p, rp
 }
 
-func (m *mapper) addIndexMapEntries(nq gql.NQuad, de *pb.DirectedEdge) {
+func (m *mapper) addIndexMapEntries(nq dql.NQuad, de *pb.DirectedEdge) {
 	if nq.GetObjectValue() == nil {
 		return // Cannot index UIDs
 	}

dgraph/cmd/live/batch.go

@@ -34,7 +34,7 @@ import (
 	"github.com/dgraph-io/badger/v3"
 	"github.com/dgraph-io/dgo/v210"
 	"github.com/dgraph-io/dgo/v210/protos/api"
-	"github.com/dgraph-io/dgraph/gql"
+	"github.com/dgraph-io/dgraph/dql"
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/tok"
 	"github.com/dgraph-io/dgraph/types"
@@ -191,7 +191,7 @@ func (l *loader) request(req *request) {
 }
 
 func getTypeVal(val *api.Value) (types.Val, error) {
-	p := gql.TypeValFrom(val)
+	p := dql.TypeValFrom(val)
 	//Convert value to bytes
 
 	if p.Tid == types.GeoID || p.Tid == types.DateTimeID {

gql/README.md renamed to dql/README.md

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package gql
+package dql
 
 import (
 	"testing"

gql/bench_test.go renamed to dql/bench_test.go

@@ -18,7 +18,7 @@ wget -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/latest/download/fuzz
 chmod a+x fuzzit
 
 ## Create a target on fuzzit servers
-./fuzzit create target --skip-if-exists --seed ./gql/fuzz-data/corpus.tar.gz parser-fuzz-target
+./fuzzit create target --skip-if-exists --seed ./dql/fuzz-data/corpus.tar.gz parser-fuzz-target
 ## Start a job (${1} = [fuzzing][local-regression]).
 ./fuzzit create job --type "${1}" dgraph-io-gh/parser-fuzz-target parser-fuzz-target
 

gql/fuzz-data/corpus.tar.gz renamed to dql/fuzz-data/corpus.tar.gz

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package gql
+package dql
 
 import (
 	"bytes"

gql/fuzz-data/corpus/02e9b80a4f835ecd1fbffd3ca9c564f7d95e9cc0 renamed to dql/fuzz-data/corpus/02e9b80a4f835ecd1fbffd3ca9c564f7d95e9cc0

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package gql
+package dql
 
 import (
 	"strconv"

gql/fuzz-data/corpus/03f773418fcce70c93ad305c9bb36decddfa928a renamed to dql/fuzz-data/corpus/03f773418fcce70c93ad305c9bb36decddfa928a

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package gql
+package dql
 
 import (
 	"bytes"
@@ -174,7 +174,7 @@ type Arg struct {
 	IsGraphQLVar bool
 }
 
-// Function holds the information about gql functions.
+// Function holds the information about dql functions.
 type Function struct {
 	Attr       string
 	Lang       string // language of the attribute value
@@ -362,7 +362,7 @@ func substituteVar(f string, res *string, vmap varMap) error {
 
 func substituteVariables(gq *GraphQuery, vmap varMap) error {
 	for k, v := range gq.Args {
-		// v won't be empty as its handled in parseGqlVariables.
+		// v won't be empty as its handled in parseDqlVariables.
 		val := gq.Args[k]
 		if err := substituteVar(v, &val, vmap); err != nil {
 			return err
@@ -539,20 +539,21 @@ func Parse(r Request) (Result, error) {
 //
 // The needVars parameter is passed in the case of upsert block.
 // For example, when parsing the query block inside -
-// upsert {
-//   query {
-//     me(func: eq(email, "[email protected]"), first: 1) {
-//       v as uid
-//     }
-//   }
 //
-//   mutation {
-//     set {
-//       uid(v) <name> "Some One" .
-//       uid(v) <email> "[email protected]" .
-//     }
-//   }
-// }
+//	upsert {
+//	  query {
+//	    me(func: eq(email, "[email protected]"), first: 1) {
+//	      v as uid
+//	    }
+//	  }
+//
+//	  mutation {
+//	    set {
+//	      uid(v) <name> "Some One" .
+//	      uid(v) <email> "[email protected]" .
+//	    }
+//	  }
+//	}
 //
 // The variable name v needs to be passed through the needVars parameter. Otherwise, an error
 // is reported complaining that the variable v is defined but not used in the query block.
@@ -794,7 +795,7 @@ L2:
 				return nil, item.Errorf("Variables can be defined only in named queries.")
 			}
 
-			if rerr = parseGqlVariables(it, vmap); rerr != nil {
+			if rerr = parseDqlVariables(it, vmap); rerr != nil {
 				return nil, rerr
 			}
 
@@ -1150,8 +1151,8 @@ func getSchema(it *lex.ItemIterator) (*pb.SchemaRequest, error) {
 	return nil, it.Errorf("Invalid schema block.")
 }
 
-// parseGqlVariables parses the the graphQL variable declaration.
-func parseGqlVariables(it *lex.ItemIterator, vmap varMap) error {
+// parseDqlVariables parses the the graphQL variable declaration.
+func parseDqlVariables(it *lex.ItemIterator, vmap varMap) error {
 	expectArg := true
 	if item, ok := it.PeekOne(); ok && item.Typ == itemRightRound {
 		return nil
@@ -1557,7 +1558,7 @@ loop:
 }
 
 // parseFuncArgs will try to parse the arguments inside an array ([]). If the values
-// are prefixed with $ they are treated as Gql variables, otherwise they are used as scalar values.
+// are prefixed with $ they are treated as Dql variables, otherwise they are used as scalar values.
 // Returns nil on success while appending arguments to the function Args slice. Otherwise
 // returns an error, which can be a parsing or value error.
 func parseFuncArgs(it *lex.ItemIterator, g *Function) error {
@@ -2113,7 +2114,7 @@ func tryParseFacetList(it *lex.ItemIterator) (res facetRes, parseOk bool, err er
 
 // parseCascade parses the cascade directive.
 // Two formats:
-// 	1. @cascade
+//  1. @cascade
 //  2. @cascade(pred1, pred2, ...)
 func parseCascade(it *lex.ItemIterator, gq *GraphQuery) error {
 	item := it.Item()

gql/fuzz-data/corpus/10919f4425629e42fa6e643fc0840ad95b1f3bec renamed to dql/fuzz-data/corpus/10919f4425629e42fa6e643fc0840ad95b1f3bec

@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 /*
@@ -16,13 +17,13 @@
  * limitations under the License.
  */
 
-package gql
+package dql
 
 // GQL parser fuzzer for use with https://github.com/dvyukov/go-fuzz.
 //
-// Build: go-fuzz-build github.com/dgraph-io/dgraph/gql
+// Build: go-fuzz-build github.com/dgraph-io/dgraph/dql
 //
-// Run: go-fuzz -bin=./gql-fuzz.zip -workdir fuzz-data
+// Run: go-fuzz -bin=./dql-fuzz.zip -workdir fuzz-data
 
 const (
 	fuzzInteresting = 1

gql/fuzz-data/corpus/13b762a964b6b62debab41ae7d0be7297a422fac renamed to dql/fuzz-data/corpus/13b762a964b6b62debab41ae7d0be7297a422fac

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package gql
+package dql
 
 import (
 	"github.com/dgraph-io/dgo/v210/protos/api"