Add support for JSON data for upsert block (#3412)

Author: mangalaman93

chunker/json/parse.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"github.com/dgraph-io/dgo/protos/api"
 	"github.com/dgraph-io/dgraph/query"
@@ -33,6 +34,16 @@ import (
 	"github.com/twpayne/go-geom/encoding/geojson"
 )
 
+func stripSpaces(str string) string {
+	return strings.Map(func(r rune) rune {
+		if unicode.IsSpace(r) {
+			return -1
+		}
+
+		return r
+	}, str)
+}
+
 func parseFacets(m map[string]interface{}, prefix string) ([]*api.Facet, error) {
 	// This happens at root.
 	if prefix == "" {
@@ -134,6 +145,13 @@ func handleBasicType(k string, v interface{}, op int, nq *api.NQuad) error {
 			return nil
 		}
 
+		// Handle the uid function in upsert block
+		s := stripSpaces(v)
+		if strings.HasPrefix(s, "uid(") {
+			nq.ObjectId = s
+			return nil
+		}
+
 		// In RDF, we assume everything is default (types.DefaultID), but in JSON we assume string
 		// (StringID). But this value will be checked against the schema so we don't overshadow a
 		// password value (types.PasswordID) - Issue#2623
@@ -222,10 +240,13 @@ func mapToNquads(m map[string]interface{}, idx *int, op int, parentPred string)
 			uid = uint64(ui)
 
 		case string:
+			s := stripSpaces(uidVal)
 			if len(uidVal) == 0 {
 				uid = 0
 			} else if ok := strings.HasPrefix(uidVal, "_:"); ok {
 				mr.uid = uidVal
+			} else if ok := strings.HasPrefix(s, "uid("); ok {
+				mr.uid = s
 			} else if u, err := strconv.ParseUint(uidVal, 0, 64); err == nil {
 				uid = u
 			} else {

dgraph/cmd/alpha/http.go

@@ -320,6 +320,13 @@ func mutationHandler(w http.ResponseWriter, r *http.Request) {
 		if delJSON, ok := ms["delete"]; ok && delJSON != nil {
 			mu.DeleteJson = delJSON.bs
 		}
+		if queryText, ok := ms["query"]; ok && queryText != nil {
+			mu.Query, err = strconv.Unquote(string(queryText.bs))
+			if err != nil {
+				x.SetStatus(w, x.ErrorInvalidRequest, err.Error())
+				return
+			}
+		}
 
 	case "application/rdf":
 		// Parse N-Quads.

dgraph/cmd/alpha/upsert_test.go

@@ -98,3 +98,61 @@ upsert {
 	require.NoError(t, err)
 	require.Contains(t, res, "Ashish")
 }
+
+func TestUpsertExample0JSON(t *testing.T) {
+	require.NoError(t, dropAll())
+	require.NoError(t, alterSchema(`email: string @index(exact) .`))
+
+	// Mutation with wrong name
+	m1 := `
+{
+  "query": "{me(func: eq(email, \"[email protected]\")) {v as uid}}",
+  "set": [
+    {
+      "uid": "uid(v)",
+      "name": "Wrong"
+    },
+    {
+      "uid": "uid(v)",
+      "email": "[email protected]"
+    }
+  ]
+}`
+	keys, _, _, err := mutationWithTs(m1, "application/json", false, true, true, 0)
+	require.NoError(t, err)
+	require.True(t, len(keys) == 0)
+
+	// query should return the wrong name
+	q1 := `
+{
+  q(func: has(email)) {
+    uid
+    name
+    email
+  }
+}`
+	res, _, err := queryWithTs(q1, "application/graphql+-", 0)
+	require.NoError(t, err)
+	require.Contains(t, res, "Wrong")
+
+	// mutation with correct name
+	m2 := `
+{
+  "query": "{me(func: eq(email, \"[email protected]\")) {v as uid}}",
+  "set": [
+    {
+      "uid": "uid(v)",
+      "name": "Ashish"
+    }
+  ]
+}`
+	keys, preds, _, err := mutationWithTs(m2, "application/json", false, true, true, 0)
+	require.NoError(t, err)
+	require.True(t, len(keys) == 0)
+	require.True(t, contains(preds, "name"))
+
+	// query should return correct name
+	res, _, err = queryWithTs(q1, "application/graphql+-", 0)
+	require.NoError(t, err)
+	require.Contains(t, res, "Ashish")
+}