deprecate quad.Raw type

cayleygraph · Dec 23, 2017 · 41bf496 · 41bf496
1 parent 4107f2f
commit 41bf496
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 149 deletions.
diff --git a/graph/bolt/bolt_test.go b/graph/bolt/bolt_test.go
@@ -100,14 +100,14 @@ func TestLoadDatabase(t *testing.T) {
 	}
 
 	w, _ := writer.NewSingleReplication(qs, nil)
-	w.AddQuad(quad.MakeRaw(
+	w.AddQuad(quad.Make(
 		"Something",
 		"points_to",
 		"Something Else",
 		"context",
 	))
 	for _, pq := range []string{"Something", "points_to", "Something Else", "context"} {
-		if got := qs.NameOf(qs.ValueOf(quad.Raw(pq))).String(); got != pq {
+		if got := quad.ToString(qs.NameOf(qs.ValueOf(quad.Raw(pq)))); got != pq {
 			t.Errorf("Failed to roundtrip %q, got:%q expect:%q", pq, got, pq)
 		}
 	}
@@ -139,11 +139,11 @@ func TestLoadDatabase(t *testing.T) {
 		t.Errorf("Unexpected quadstore size, got:%d expect:5", s)
 	}
 
-	w.RemoveQuad(quad.MakeRaw(
+	w.RemoveQuad(quad.Make(
 		"A",
 		"follows",
 		"B",
-		"",
+		nil,
 	))
 	if s := qs.Size(); s != 11 {
 		t.Errorf("Unexpected quadstore size after RemoveQuad, got:%d expect:11", s)

diff --git a/graph/gaedatastore/quadstore.go b/graph/gaedatastore/quadstore.go
@@ -461,11 +461,15 @@ func (qs *QuadStore) Quad(val graph.Value) quad.Quad {
 			clog.Errorf("Error: %v", err)
 		}
 	}
-	return quad.MakeRaw(
+	var label interface{}
+	if q.Label != "" {
+		label = q.Label
+	}
+	return quad.Make(
 		q.Subject,
 		q.Predicate,
 		q.Object,
-		q.Label,
+		label,
 	)
 }
 

diff --git a/graph/gaedatastore/quadstore_test.go b/graph/gaedatastore/quadstore_test.go
@@ -107,8 +107,8 @@ func TestIterators(t *testing.T) {
 	require.Equal(t, int64(11), qs.Size(), "Incorrect number of quads")
 
 	var expected = []quad.Quad{
-		quad.MakeRaw("C", "follows", "B", ""),
-		quad.MakeRaw("C", "follows", "D", ""),
+		quad.Make("C", "follows", "B", ""),
+		quad.Make("C", "follows", "D", ""),
 	}
 
 	it := qs.QuadIterator(quad.Subject, qs.ValueOf(quad.Raw("C")))
@@ -117,7 +117,7 @@ func TestIterators(t *testing.T) {
 	// Test contains
 	it = qs.QuadIterator(quad.Label, qs.ValueOf(quad.Raw("status_graph")))
 	gqs := qs.(*QuadStore)
-	key := gqs.createKeyForQuad(quad.MakeRaw("G", "status", "cool", "status_graph"))
+	key := gqs.createKeyForQuad(quad.Make("G", "status", "cool", "status_graph"))
 	token := &Token{quadKind, key.StringID()}
 
 	require.True(t, it.Contains(token), "Contains failed")

diff --git a/graph/graphmock/graphmock.go b/graph/graphmock/graphmock.go
@@ -44,7 +44,7 @@ func (qs *Oldstore) ValueOf(s quad.Value) graph.Value {
 		return nil
 	}
 	for i := range qs.Data {
-		if s.String() == qs.valueAt(i).String() {
+		if va := qs.valueAt(i); va != nil && s.String() == va.String() {
 			return iterator.Int64Node(i)
 		}
 	}
@@ -75,7 +75,7 @@ func (qs *Oldstore) NameOf(v graph.Value) quad.Value {
 		if qs.Parse {
 			return quad.String(v.(StringNode))
 		}
-		return quad.Raw(v.(StringNode))
+		return quad.Raw(string(v.(StringNode)))
 	default:
 		return nil
 	}