Remove changes that returned response for upsert

dgraph/cmd/alpha/http.go

@@ -21,7 +21,6 @@ import (
 	"compress/gzip"
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -388,14 +387,7 @@ func mutationHandler(w http.ResponseWriter, r *http.Request) {
 	mp["code"] = x.Success
 	mp["message"] = "Done"
 	mp["uids"] = resp.Uids
-	if len(resp.Vars) > 0 {
-		vars := make(map[string][]string)
-		// Flatten the mutated map so that it is easier to parse for the client.
-		for v, uids := range resp.Vars {
-			vars[fmt.Sprintf("uid(%s)", v)] = uids.GetUids()
-		}
-		mp["vars"] = vars
-	}
+	mp["result"] = json.RawMessage(resp.Json)
 	response["data"] = mp
 
 	js, err := json.Marshal(response)

dgraph/cmd/alpha/http_test.go

@@ -162,11 +162,21 @@ func queryWithTs(queryText, contentType, debug string, ts uint64) (string, uint6
 	return string(output), startTs, err
 }
 
+type muRes struct {
+	Data struct {
+		Uids   map[string]string `json:"uids,omitempty"`
+		Result json.RawMessage   `json:"result,omitempty"`
+	} `json:"data,omitempty"`
+	Extensions *query.Extensions `json:"extensions,omitempty"`
+	Errors     []x.GqlError      `json:"errors,omitempty"`
+}
+
 type mutationResponse struct {
 	keys    []string
 	preds   []string
 	startTs uint64
-	vars    map[string][]string
+	uids    map[string]string
+	result  json.RawMessage
 }
 
 func mutationWithTs(m, t string, isJson bool, commitNow bool, ts uint64) (
@@ -188,23 +198,16 @@ func mutationWithTs(m, t string, isJson bool, commitNow bool, ts uint64) (
 		return mr, err
 	}
 
-	var r res
+	var r muRes
 	if err := json.Unmarshal(body, &r); err != nil {
 		return mr, err
 	}
 
-	type resData struct {
-		MutationVars map[string][]string `json:"vars"`
-	}
-	var rd resData
-	if err := json.Unmarshal(r.Data, &rd); err != nil {
-		return mr, err
-	}
-
-	mr.vars = rd.MutationVars
 	mr.keys = r.Extensions.Txn.Keys
 	mr.preds = r.Extensions.Txn.Preds
 	mr.startTs = r.Extensions.Txn.StartTs
+	mr.uids = r.Data.Uids
+	mr.result = r.Data.Result
 	return mr, nil
 }