barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename triple entities were relevant

Browse source
This commit is contained in:
kortschak 2014-08-27 21:27:01 +09:30
parent ddf8849e60
commit 443a091b72
62 changed files with 664 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

6
quad/cquads/cquads.go
View file

@ -65,14 +65,14 @@ func (dec *Decoder) Unmarshal() (quad.Quad, error) {
}
dec.line = dec.line[:0]
}
triple, err := Parse(string(line))
q, err := Parse(string(line))
if err != nil {
return quad.Quad{}, fmt.Errorf("failed to parse %q: %v", dec.line, err)
}
if !triple.IsValid() {
if !q.IsValid() {
return dec.Unmarshal()
}
return triple, nil
return q, nil
}
func unEscape(r []rune, isQuoted, isEscaped bool) string {

12
quad/cquads/cquads_test.go
View file

@ -28,7 +28,7 @@ import (
"github.com/google/cayley/quad"
)
var testNTriples = []struct {
var testNQuads = []struct {
message string
input string
expect quad.Quad
@ -596,7 +596,7 @@ var testNTriples = []struct {
}
func TestParse(t *testing.T) {
for _, test := range testNTriples {
for _, test := range testNQuads {
got, err := Parse(test.input)
_ = err
if err != test.err && (err != nil && err.Error() != test.err.Error()) {
@ -641,20 +641,20 @@ func TestDecoder(t *testing.T) {
dec := NewDecoder(strings.NewReader(document))
var n int
for {
triple, err := dec.Unmarshal()
q, err := dec.Unmarshal()
if err != nil {
if err != io.EOF {
t.Fatalf("Failed to read document:", err)
}
break
}
if triple.Subject == "" || triple.Predicate == "" || triple.Object == "" {
t.Errorf("Unexpected triple, got:%v", triple)
if q.Subject == "" || q.Predicate == "" || q.Object == "" {
t.Errorf("Unexpected quad, got:%v", q)
}
n++
}
if n != 20 {
t.Errorf("Unexpected number of triples read, got:%d expect:20", n)
t.Errorf("Unexpected number of quads read, got:%d expect:20", n)
}
}

6
quad/nquads/nquads.go
View file

@ -65,14 +65,14 @@ func (dec *Decoder) Unmarshal() (quad.Quad, error) {
}
dec.line = dec.line[:0]
}
triple, err := Parse(string(line))
q, err := Parse(string(line))
if err != nil {
return quad.Quad{}, fmt.Errorf("failed to parse %q: %v", dec.line, err)
}
if !triple.IsValid() {
if !q.IsValid() {
return dec.Unmarshal()
}
return triple, nil
return q, nil
}
func unEscape(r []rune, isEscaped bool) string {

12
quad/nquads/nquads_test.go
View file

@ -28,7 +28,7 @@ import (
"github.com/google/cayley/quad"
)
var testNTriples = []struct {
var testNQuads = []struct {
message string
input string
expect quad.Quad
@ -436,7 +436,7 @@ var testNTriples = []struct {
}
func TestParse(t *testing.T) {
for _, test := range testNTriples {
for _, test := range testNQuads {
got, err := Parse(test.input)
if err != test.err && (err != nil && err.Error() != test.err.Error()) {
t.Errorf("Unexpected error when %s: got:%v expect:%v", test.message, err, test.err)
@ -480,20 +480,20 @@ func TestDecoder(t *testing.T) {
dec := NewDecoder(strings.NewReader(document))
var n int
for {
triple, err := dec.Unmarshal()
q, err := dec.Unmarshal()
if err != nil {
if err != io.EOF {
t.Fatalf("Failed to read document:", err)
}
break
}
if triple.Subject == "" || triple.Predicate == "" || triple.Object == "" {
t.Errorf("Unexpected triple, got:%v", triple)
if q.Subject == "" || q.Predicate == "" || q.Object == "" {
t.Errorf("Unexpected quad, got:%v", q)
}
n++
}
if n != 20 {
t.Errorf("Unexpected number of triples read, got:%d expect:20", n)
t.Errorf("Unexpected number of quads read, got:%d expect:20", n)
}
}

22
quad/quad.go
View file

@ -15,17 +15,17 @@
// Package quad defines quad and triple handling.
package quad
// Defines the struct which makes the TripleStore possible -- the triple.
// Defines the struct which makes the QuadStore possible -- the quad.
//
// At its heart, it consists of three fields -- Subject, Predicate, and Object.
// Three IDs that relate to each other. That's all there is to it. The triples
// Three IDs that relate to each other. That's all there is to it. The quads
// are the links in the graph, and the existence of node IDs is defined by the
// fact that some triple in the graph mentions them.
// fact that some quad in the graph mentions them.
//
// This means that a complete representation of the graph is equivalent to a
// list of triples. The rest is just indexing for speed.
// list of quads. The rest is just indexing for speed.
//
// Adding fields to the triple is not to be taken lightly. You'll see I mention
// Adding fields to the quad is not to be taken lightly. You'll see I mention
// label, but don't as yet use it in any backing store. In general, there
// can be features that can be turned on or off for any store, but I haven't
// decided how to allow/disallow them yet. Another such example would be to add
@ -46,7 +46,7 @@ var (
ErrIncomplete = errors.New("incomplete N-Quad")
)
// Our triple struct, used throughout.
// Our quad struct, used throughout.
type Quad struct {
Subject string `json:"subject"`
Predicate string `json:"predicate"`
@ -57,7 +57,7 @@ type Quad struct {
// Direction specifies an edge's type.
type Direction byte
// List of the valid directions of a triple.
// List of the valid directions of a quad.
const (
Any Direction = iota
Subject
@ -100,7 +100,7 @@ func (d Direction) String() string {
}
}
// Per-field accessor for triples
// Per-field accessor for quads.
func (q Quad) Get(d Direction) string {
switch d {
case Subject:
@ -116,7 +116,7 @@ func (q Quad) Get(d Direction) string {
}
}
// Pretty-prints a triple.
// Pretty-prints a quad.
func (q Quad) String() string {
return fmt.Sprintf("%s -- %s -> %s", q.Subject, q.Predicate, q.Object)
}
@ -125,8 +125,8 @@ func (q Quad) IsValid() bool {
return q.Subject != "" && q.Predicate != "" && q.Object != ""
}
// Prints a triple in N-Quad format.
func (q Quad) NTriple() string {
// Prints a quad in N-Quad format.
func (q Quad) NQuad() string {
if q.Label == "" {
//TODO(barakmich): Proper escaping.
return fmt.Sprintf("%s %s %s .", q.Subject, q.Predicate, q.Object)