Merge remote-tracking branch 'origin/master' into feature/embedded

hypermodeinc · Jul 11, 2017 · 2ecae7e · 2ecae7e
2 parents a8b69e3 + 8ecb978
commit 2ecae7e
Show file tree

Hide file tree

Showing 24 changed files with 380 additions and 276 deletions.
diff --git a/client/mutations.go b/client/mutations.go
@@ -448,7 +448,7 @@ func (d *Dgraph) NodeXid(xid string, storeXid bool) (Node, error) {
 	}
 	n := Node{uid: uid}
 	if storeXid && isNew {
-		e := n.Edge("_xid_")
+		e := n.Edge("xid")
 		x.Check(e.SetValueString(xid))
 		d.BatchSet(e)
 	}

diff --git a/cmd/dgraphloader/main.go b/cmd/dgraphloader/main.go
@@ -27,8 +27,10 @@ import (
 	"google.golang.org/grpc/credentials"
 
 	"github.com/dgraph-io/dgraph/client"
+	"github.com/dgraph-io/dgraph/protos"
 	"github.com/dgraph-io/dgraph/rdf"
 	"github.com/dgraph-io/dgraph/schema"
+	"github.com/dgraph-io/dgraph/types"
 	"github.com/dgraph-io/dgraph/x"
 
 	"github.com/pkg/profile"
@@ -40,7 +42,7 @@ var (
 	dgraph     = flag.String("d", "127.0.0.1:9080", "Dgraph gRPC server address")
 	concurrent = flag.Int("c", 100, "Number of concurrent requests to make to Dgraph")
 	numRdf     = flag.Int("m", 1000, "Number of RDF N-Quads to send as part of a mutation.")
-	storeXid   = flag.Bool("x", false, "Store xids by adding corresponding _xid_ edges")
+	storeXid   = flag.Bool("x", false, "Store xids by adding corresponding xid edges")
 	mode       = flag.String("profile.mode", "", "enable profiling mode, one of [cpu, mem, mutex, block]")
 	clientDir  = flag.String("cd", "c", "Directory to store xid to uid mapping")
 	blockRate  = flag.Int("block", 0, "Block profiling rate")
@@ -242,6 +244,16 @@ func main() {
 
 	filesList := strings.Split(*files, ",")
 	x.AssertTrue(len(filesList) > 0)
+	if *storeXid {
+		if err := dgraphClient.AddSchema(protos.SchemaUpdate{
+			Predicate: "xid",
+			ValueType: uint32(types.StringID),
+			Tokenizer: []string{"hash"},
+			Directive: protos.SchemaUpdate_INDEX,
+		}); err != nil {
+			log.Fatal("While adding schema to batch ", err)
+		}
+	}
 	if len(*schemaFile) > 0 {
 		processSchemaFile(*schemaFile, dgraphClient)
 	}

diff --git a/contrib/freebase/spielberg_test.go b/contrib/freebase/spielberg_test.go
@@ -26,7 +26,7 @@ import (
 func TestSpielberg(t *testing.T) {
 	q := `
     {
-			me(func:eq(_xid_,"m.06pj8")) {
+			me(func:eq(xid,"m.06pj8")) {
         name@en
 				director.film (first: 4, orderasc: initial_release_date)  {
             name@en

diff --git a/contrib/indextest/allof_the.in b/contrib/indextest/allof_the.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film @filter(allofterms(name, "the")) {

diff --git a/contrib/indextest/allof_the_a.in b/contrib/indextest/allof_the_a.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film @filter(allofterms(name, "the") and allofterms(name, "a")) {

diff --git a/contrib/indextest/allof_the_first.in b/contrib/indextest/allof_the_first.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film(first: 10) @filter(allofterms(name, "the")) {

diff --git a/contrib/indextest/basic.in b/contrib/indextest/basic.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film {

diff --git a/contrib/indextest/releasedate.in b/contrib/indextest/releasedate.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film {

diff --git a/contrib/indextest/releasedate_geq.in b/contrib/indextest/releasedate_geq.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film @filter(ge(initial_release_date, "2000-01-05")) {

diff --git a/contrib/indextest/releasedate_sort.in b/contrib/indextest/releasedate_sort.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film(orderasc: initial_release_date) {

diff --git a/contrib/indextest/releasedate_sort_first_offset.in b/contrib/indextest/releasedate_sort_first_offset.in
@@ -1,5 +1,5 @@
 {
- me(func:eq(_xid_,"m.07mv_h")) {
+ me(func:eq(xid,"m.07mv_h")) {
   director.film {
    directed_by {
     director.film(orderasc: initial_release_date, first: 5, offset: 10) {

diff --git a/gql/parser.go b/gql/parser.go
@@ -482,11 +482,11 @@ func Parse(r Request) (res Result, rerr error) {
 		return res, err
 	}
 
-	l := lex.Lexer{Input: query}
-	l.Run(lexTopLevel)
+	lexer := lex.Lexer{Input: query}
+	lexer.Run(lexTopLevel)
 
 	var qu *GraphQuery
-	it := l.NewIterator()
+	it := lexer.NewIterator()
 	fmap := make(fragmentMap)
 	for it.Next() {
 		item := it.Item()

diff --git a/rdf/parse.go b/rdf/parse.go
@@ -321,24 +321,26 @@ func isNewline(r rune) bool {
 }
 
 var typeMap = map[string]types.TypeID{
-	"xs:string":                                   types.StringID,
-	"xs:date":                                     types.DateTimeID,
-	"xs:dateTime":                                 types.DateTimeID,
-	"xs:int":                                      types.IntID,
-	"xs:boolean":                                  types.BoolID,
-	"xs:double":                                   types.FloatID,
-	"xs:float":                                    types.FloatID,
-	"xs:base64Binary":                             types.BinaryID,
-	"geo:geojson":                                 types.GeoID,
-	"pwd:password":                                types.PasswordID,
-	"http://www.w3.org/2001/XMLSchema#string":     types.StringID,
-	"http://www.w3.org/2001/XMLSchema#dateTime":   types.DateTimeID,
-	"http://www.w3.org/2001/XMLSchema#date":       types.DateTimeID,
-	"http://www.w3.org/2001/XMLSchema#int":        types.IntID,
-	"http://www.w3.org/2001/XMLSchema#integer":    types.IntID,
-	"http://www.w3.org/2001/XMLSchema#boolean":    types.BoolID,
-	"http://www.w3.org/2001/XMLSchema#double":     types.FloatID,
-	"http://www.w3.org/2001/XMLSchema#float":      types.FloatID,
-	"http://www.w3.org/2001/XMLSchema#gYear":      types.DateTimeID,
-	"http://www.w3.org/2001/XMLSchema#gYearMonth": types.DateTimeID,
+	"xs:string":                                        types.StringID,
+	"xs:date":                                          types.DateTimeID,
+	"xs:dateTime":                                      types.DateTimeID,
+	"xs:int":                                           types.IntID,
+	"xs:positiveInteger":                               types.IntID,
+	"xs:boolean":                                       types.BoolID,
+	"xs:double":                                        types.FloatID,
+	"xs:float":                                         types.FloatID,
+	"xs:base64Binary":                                  types.BinaryID,
+	"geo:geojson":                                      types.GeoID,
+	"pwd:password":                                     types.PasswordID,
+	"http://www.w3.org/2001/XMLSchema#string":          types.StringID,
+	"http://www.w3.org/2001/XMLSchema#dateTime":        types.DateTimeID,
+	"http://www.w3.org/2001/XMLSchema#date":            types.DateTimeID,
+	"http://www.w3.org/2001/XMLSchema#int":             types.IntID,
+	"http://www.w3.org/2001/XMLSchema#positiveInteger": types.IntID,
+	"http://www.w3.org/2001/XMLSchema#integer":         types.IntID,
+	"http://www.w3.org/2001/XMLSchema#boolean":         types.BoolID,
+	"http://www.w3.org/2001/XMLSchema#double":          types.FloatID,
+	"http://www.w3.org/2001/XMLSchema#float":           types.FloatID,
+	"http://www.w3.org/2001/XMLSchema#gYear":           types.DateTimeID,
+	"http://www.w3.org/2001/XMLSchema#gYearMonth":      types.DateTimeID,
 }
diff --git a/worker/assign.go b/worker/assign.go
@@ -71,15 +71,15 @@ func AssignUidsOverNetwork(ctx context.Context, num *protos.Num) (*protos.Assign
 	if tr, ok := trace.FromContext(ctx); ok {
 		tr.LazyPrintf("Not leader of group: %d. Sending to: %d", leaseGid, lid)
 	}
-	p := pools().get(addr)
-	conn, err := p.Get()
+	p, err := pools().get(addr)
 	if err != nil {
 		if tr, ok := trace.FromContext(ctx); ok {
 			tr.LazyPrintf("Error while retrieving connection: %+v", err)
 		}
 		return &emptyAssignedIds, err
 	}
-	defer p.Put(conn)
+	defer pools().release(p)
+	conn := p.Get()
 	if tr, ok := trace.FromContext(ctx); ok {
 		tr.LazyPrintf("Calling AssignUids for group: %d, addr: %s", leaseGid, addr)
 	}