Rename type predicate to dgraph.type (dgraph-io#3204)

dna2fork · Jul 19, 2019 · 6bb9aea · 6bb9aea
1 parent 4a32006
commit 6bb9aea
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/dgraph/cmd/alpha/run_test.go b/dgraph/cmd/alpha/run_test.go
@@ -276,7 +276,7 @@ func TestDeletePredicate(t *testing.T) {
 		`{"predicate":"age","type":"default"},`+
 		`{"predicate":"name","type":"string","index":true, "tokenizer":["term"]},`+
 		x.AclPredicates+","+
-		`{"predicate":"type","type":"string","index":true, "tokenizer":["exact"]}`+
+		`{"predicate":"dgraph.type","type":"string","index":true, "tokenizer":["exact"]}`+
 		`]}}`, output)
 
 	output, err = runQuery(q1)
@@ -1350,7 +1350,7 @@ func TestListTypeSchemaChange(t *testing.T) {
 		x.AclPredicates+","+
 		`{"predicate":"_predicate_","type":"string","list":true},`+
 		`{"predicate":"occupations","type":"string"},`+
-		`{"predicate":"type", "type":"string", "index":true, "tokenizer": ["exact"]}]}}`, res)
+		`{"predicate":"dgraph.type", "type":"string", "index":true, "tokenizer": ["exact"]}]}}`, res)
 }
 
 func TestDeleteAllSP2(t *testing.T) {
@@ -1507,7 +1507,7 @@ func TestDropAll(t *testing.T) {
 	z.CompareJSON(t,
 		`{"data":{"schema":[{"predicate":"_predicate_","type":"string","list":true},`+
 			x.AclPredicates+","+
-			`{"predicate":"type", "type":"string", "index":true, "tokenizer":["exact"]}]}}`, output)
+			`{"predicate":"dgraph.type", "type":"string", "index":true, "tokenizer":["exact"]}]}}`, output)
 
 	// Reinstate schema so that we can re-run the original query.
 	err = alterSchemaWithRetry(s)
@@ -1613,11 +1613,11 @@ func TestTypeMutationAndQuery(t *testing.T) {
 		"set": [
 			{
 				"name": "Alice",
-				"type": "Employee"
+				"dgraph.type": "Employee"
 			},
 			{
 				"name": "Bob",
-				"type": "Employer"
+				"dgraph.type": "Employer"
 			}
 		]
 	}

diff --git a/ee/acl/acl.go b/ee/acl/acl.go
@@ -159,7 +159,7 @@ func groupAdd(conf *viper.Viper, groupId string) error {
 		},
 		{
 			Subject:     "_:newgroup",
-			Predicate:   "type",
+			Predicate:   "dgraph.type",
 			ObjectValue: &api.Value{Val: &api.Value_StrVal{StrVal: "Group"}},
 		},
 	}

diff --git a/ee/acl/utils.go b/ee/acl/utils.go
@@ -247,7 +247,7 @@ func CreateUserNQuads(userId string, password string) []*api.NQuad {
 		},
 		{
 			Subject:     "_:newuser",
-			Predicate:   "type",
+			Predicate:   "dgraph.type",
 			ObjectValue: &api.Value{Val: &api.Value_StrVal{StrVal: "User"}},
 		},
 	}

diff --git a/query/common_test.go b/query/common_test.go
@@ -474,11 +474,11 @@ func populateCluster() {
 		<23> <shadow_deep> "4" .
 		<24> <shadow_deep> "14" .
 
-		<2> <type> "Person" .
-		<3> <type> "Person" .
-		<4> <type> "Person" .
-		<5> <type> "Animal" .
-		<6> <type> "Animal" .
+		<2> <dgraph.type> "Person" .
+		<3> <dgraph.type> "Person" .
+		<4> <dgraph.type> "Person" .
+		<5> <dgraph.type> "Animal" .
+		<6> <dgraph.type> "Animal" .
 
 		<2> <pet> <5> .
 		<3> <pet> <6> .

diff --git a/query/query.go b/query/query.go
@@ -229,9 +229,9 @@ func (sg *SubGraph) createSrcFunction(gf *gql.Function) {
 		IsValueVar: gf.IsValueVar,
 	}
 
-	// type function is just an alias for eq(type, "type").
+	// type function is just an alias for eq(type, "dgraph.type").
 	if gf.Name == "type" {
-		sg.Attr = "type"
+		sg.Attr = "dgraph.type"
 		sg.SrcFunc.Name = "eq"
 		sg.SrcFunc.IsCount = false
 		sg.SrcFunc.IsValueVar = false

diff --git a/schema/schema.go b/schema/schema.go
@@ -421,7 +421,7 @@ func InitialSchema() []*pb.SchemaUpdate {
 	}
 
 	initialSchema = append(initialSchema, &pb.SchemaUpdate{
-		Predicate: "type",
+		Predicate: "dgraph.type",
 		ValueType: pb.Posting_STRING,
 		Directive: pb.SchemaUpdate_INDEX,
 		Tokenizer: []string{"exact"},

diff --git a/systest/mutations_test.go b/systest/mutations_test.go
@@ -685,7 +685,7 @@ func SchemaAfterDeleteNode(t *testing.T, c *dgo.Dgraph) {
 		`{"predicate":"friend","type":"uid","list":true},`+
 		`{"predicate":"married","type":"bool"},`+
 		`{"predicate":"name","type":"default"},`+
-		`{"predicate":"type","type":"string","index":true, "tokenizer":["exact"]}]`),
+		`{"predicate":"dgraph.type","type":"string","index":true, "tokenizer":["exact"]}]`),
 		string(resp.Json))
 
 	require.NoError(t, c.Alter(ctx, &api.Operation{DropAttr: "married"}))
@@ -706,7 +706,7 @@ func SchemaAfterDeleteNode(t *testing.T, c *dgo.Dgraph) {
 		`{"predicate":"_predicate_","type":"string","list":true},`+
 		`{"predicate":"friend","type":"uid","list":true},`+
 		`{"predicate":"name","type":"default"},`+
-		`{"predicate":"type","type":"string","index":true, "tokenizer":["exact"]}]`),
+		`{"predicate":"dgraph.type","type":"string","index":true, "tokenizer":["exact"]}]`),
 		string(resp.Json))
 }
 
@@ -1719,8 +1719,8 @@ func RestoreReservedPreds(t *testing.T, c *dgo.Dgraph) {
 	require.NoError(t, err)
 
 	// Verify that the reserved predicates were restored to the schema.
-	query := `schema(preds: type) {predicate}`
+	query := `schema(preds: dgraph.type) {predicate}`
 	resp, err := c.NewReadOnlyTxn().Query(ctx, query)
 	require.NoError(t, err)
-	CompareJSON(t, `{"schema": [{"predicate":"type"}]}`, string(resp.Json))
+	CompareJSON(t, `{"schema": [{"predicate":"dgraph.type"}]}`, string(resp.Json))
 }
diff --git a/systest/queries_test.go b/systest/queries_test.go
@@ -337,7 +337,7 @@ func SchemaQueryTest(t *testing.T, c *dgo.Dgraph) {
         "list": true
       },
       {
-        "predicate": "type",
+        "predicate": "dgraph.type",
         "type": "string",
         "index": true,
         "tokenizer": [
@@ -405,7 +405,7 @@ func SchemaQueryTestPredicate1(t *testing.T, c *dgo.Dgraph) {
         "predicate": "friends"
       },
       {
-        "predicate": "type"
+        "predicate": "dgraph.type"
       },
       {
         "predicate": "name"
@@ -533,7 +533,7 @@ func SchemaQueryTestHTTP(t *testing.T, c *dgo.Dgraph) {
       },
       {
         "index": true,
-        "predicate": "type",
+        "predicate": "dgraph.type",
         "type": "string",
         "tokenizer": ["exact"]
       },

diff --git a/x/keys.go b/x/keys.go
@@ -330,7 +330,7 @@ func Parse(key []byte) *ParsedKey {
 func IsReservedPredicate(pred string) bool {
 	var m = map[string]struct{}{
 		PredicateListAttr: {},
-		"type":            {},
+		"dgraph.type":     {},
 	}
 	_, ok := m[strings.ToLower(pred)]
 	return ok || IsAclPredicate(pred)