README.md

@@ -2,6 +2,7 @@
 **Scalable, Distributed, Low Latency, High Throughput Graph Database.**
 
 ![logo](https://img.shields.io/badge/status-alpha-red.svg)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fdgraph-io%2Fdgraph.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fdgraph-io%2Fdgraph?ref=badge_shield)
 [![Wiki](https://img.shields.io/badge/res-wiki-blue.svg)](https://docs.dgraph.io)
 [![Build Status](https://travis-ci.org/dgraph-io/dgraph.svg?branch=master)](https://travis-ci.org/dgraph-io/dgraph)
 [![Coverage Status](https://coveralls.io/repos/github/dgraph-io/dgraph/badge.svg?branch=master)](https://coveralls.io/github/dgraph-io/dgraph?branch=master)

algo/uidlist.go

@@ -256,6 +256,9 @@ func MergeSorted(lists []*taskp.List) *taskp.List {
 	maxSz := 0
 
 	for i, l := range lists {
+		if l == nil {
+			continue
+		}
 		lenList := len(l.Uids)
 		if lenList > 0 {
 			heap.Push(h, elem{

client/client.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/dgraph-io/dgraph/protos/graphp"
 	"github.com/dgraph-io/dgraph/types"
+	"github.com/dgraph-io/dgraph/types/facets"
 	"github.com/dgraph-io/dgraph/x"
 )
 
@@ -104,6 +105,15 @@ func (req *Req) AddMutation(nq graphp.NQuad, op Op) error {
 	return nil
 }
 
+func AddFacet(key string, val string, nq *graphp.NQuad) error {
+	facet, err := facets.FacetFor(key, val)
+	if err != nil {
+		return err
+	}
+	nq.Facets = append(nq.Facets, facet)
+	return nil
+}
+
 func checkSchema(schema graphp.SchemaUpdate) error {
 	typ := types.TypeID(schema.ValueType)
 	if typ == types.UidID && schema.Directive == graphp.SchemaUpdate_INDEX {
@@ -257,6 +267,11 @@ func (batch *BatchMutation) AddMutation(nq graphp.NQuad, op Op) error {
 	if err := checkNQuad(nq); err != nil {
 		return err
 	}
+	if op == SET &&
+		((nq.ObjectType == int32(types.DefaultID) && nq.ObjectValue.GetDefaultVal() == "*") ||
+			(nq.ObjectType == int32(types.StringID) && nq.ObjectValue.GetStrVal() == "*")) {
+		return x.Errorf("Cannot set the value as '*'")
+	}
 	batch.nquads <- nquadOp{nq: nq, op: op}
 	atomic.AddUint64(&batch.rdfs, 1)
 	return nil

client/examples_test.go

@@ -109,22 +109,50 @@ func ExampleReq_AddMutation_facets() {
 	dgraphClient := graphp.NewDgraphClient(conn)
 
 	req := client.Req{}
-	// Doing mutation and setting facets while using the raw query block.
-	req.SetQuery(`
-mutation {
- set {
-  <alice> <name> "alice" .
-  <alice> <mobile> "040123456" (since=2006-01-02T15:04:05) .
-  <alice> <car> "MA0123" (since=2006-02-02T13:01:09, first=true) .
- }
-}
-{
- data(id:alice) {
-  name
-  mobile @facets
-  car @facets
- }
-}`)
+	nq := graphp.NQuad{
+		Subject:   "person1",
+		Predicate: "name",
+	}
+	client.Str("Steven Spielberg", &nq)
+
+	if err := client.AddFacet("since", "2006-01-02T15:04:05", &nq); err != nil {
+		log.Fatal(err)
+	}
+
+	if err := client.AddFacet("alias", `"Steve"`, &nq); err != nil {
+		log.Fatal(err)
+	}
+
+	req.AddMutation(nq, client.SET)
+
+	nq = graphp.NQuad{
+		Subject:   "person2",
+		Predicate: "name",
+	}
+	client.Str("William Jones", &nq)
+	req.AddMutation(nq, client.SET)
+
+	// Lets connect the two nodes together and add a facet to the edge.
+	nq = graphp.NQuad{
+		Subject:   "person1",
+		Predicate: "friend",
+		ObjectId:  "person2",
+	}
+
+	if err := client.AddFacet("close", "true", &nq); err != nil {
+		log.Fatal(err)
+	}
+
+	req.AddMutation(nq, client.SET)
+	req.SetQuery(`{
+		me(id: person1) {
+			name @facets
+			friend @facets {
+				name
+			}
+		}
+	}`)
+
 	resp, err := dgraphClient.Run(context.Background(), req.Request())
 	if err != nil {
 		log.Fatalf("Error in getting response from server, %s", err)

client/value.go

@@ -70,8 +70,21 @@ func Datetime(dateTime time.Time, nq *graphp.NQuad) error {
 	return nil
 }
 
+func validateStr(val string) error {
+	for idx, c := range val {
+		if c == '"' && (idx == 0 || val[idx-1] != '\\') {
+			return fmt.Errorf(`" must be preceded by a \ in object value`)
+		}
+	}
+	return nil
+}
+
 // Str is a helper function to add a string to an NQuad.ObjectValue.
 func Str(val string, nq *graphp.NQuad) error {
+	if err := validateStr(val); err != nil {
+		return err
+	}
+
 	v, err := types.ObjectValue(types.StringID, val)
 	if err != nil {
 		return err

cmd/dgraph/dashboard.go

@@ -21,7 +21,6 @@ import (
 	"net/http"
 	"regexp"
 
-	"github.com/dgraph-io/dgraph/protos/graphp"
 	"github.com/dgraph-io/dgraph/x"
 )
 
@@ -73,11 +72,11 @@ func keywordHandler(w http.ResponseWriter, r *http.Request) {
 		"first",
 		"fulltext",
 		"func",
-		"geq",
+		"ge",
 		"id",
 		"index",
 		"intersects",
-		"leq",
+		"le",
 		"mutation",
 		"near",
 		"offset",
@@ -107,58 +106,3 @@ func keywordHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	w.Write(js)
 }
-
-func hasOnlySharePred(mutation *graphp.Mutation) bool {
-	for _, nq := range mutation.Set {
-		if nq.Predicate != INTERNAL_SHARE {
-			return false
-		}
-	}
-
-	for _, nq := range mutation.Del {
-		if nq.Predicate != INTERNAL_SHARE {
-			return false
-		}
-	}
-	return true
-}
-
-func hasSharePred(mutation *graphp.Mutation) bool {
-	for _, nq := range mutation.Set {
-		if nq.Predicate == INTERNAL_SHARE {
-			return true
-		}
-	}
-
-	for _, nq := range mutation.Del {
-		if nq.Predicate == INTERNAL_SHARE {
-			return true
-		}
-	}
-	return false
-}
-
-type dashboardState struct {
-	Share     bool   `json:"share"`
-	SharePred string `json:"share_pred"`
-}
-
-func initialState(w http.ResponseWriter, r *http.Request) {
-	addCorsHeaders(w)
-	if r.Method != "GET" {
-		http.Error(w, x.ErrorInvalidMethod, http.StatusBadRequest)
-		return
-	}
-
-	ds := dashboardState{
-		Share:     !*noshare,
-		SharePred: INTERNAL_SHARE,
-	}
-
-	js, err := json.Marshal(ds)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	w.Write(js)
-}