diff --git a/graph/bolt/all_iterator.go b/graph/bolt/all_iterator.go index 66d8e8a..0047666 100644 --- a/graph/bolt/all_iterator.go +++ b/graph/bolt/all_iterator.go @@ -103,7 +103,7 @@ func (it *AllIterator) Next() bool { } else { k, _ := cur.Seek(last) if !bytes.Equal(k, last) { - return fmt.Errorf("could not pick up after", k) + return fmt.Errorf("could not pick up after %v", k) } } for i < bufferSize { diff --git a/graph/bolt/iterator.go b/graph/bolt/iterator.go index a310879..ad56a47 100644 --- a/graph/bolt/iterator.go +++ b/graph/bolt/iterator.go @@ -148,7 +148,7 @@ func (it *Iterator) Next() bool { } else { k, _ := cur.Seek(last) if !bytes.Equal(k, last) { - return fmt.Errorf("could not pick up after", k) + return fmt.Errorf("could not pick up after %v", k) } } for i < bufferSize { diff --git a/graph/iterator/fixed_iterator.go b/graph/iterator/fixed_iterator.go index 80eb769..a0298fc 100644 --- a/graph/iterator/fixed_iterator.go +++ b/graph/iterator/fixed_iterator.go @@ -100,7 +100,7 @@ func (it *Fixed) DebugString(indent int) string { if len(it.values) > 0 { value = fmt.Sprint(it.values[0]) } - return fmt.Sprintf("%s(%s %d tags: %s Size: %d id0: %d)", + return fmt.Sprintf("%s(%s %d tags: %s Size: %d id0: %s)", strings.Repeat(" ", indent), it.Type(), it.UID(), diff --git a/graph/iterator/value_comparison_iterator.go b/graph/iterator/value_comparison_iterator.go index 35465ae..a0beeb3 100644 --- a/graph/iterator/value_comparison_iterator.go +++ b/graph/iterator/value_comparison_iterator.go @@ -154,7 +154,7 @@ func (it *Comparison) NextPath() bool { return false } if it.doComparison(it.subIt.Result()) { - return true + break } } it.result = it.subIt.Result() diff --git a/graph/leveldb/leveldb_test.go b/graph/leveldb/leveldb_test.go index e13b468..e2757b7 100644 --- a/graph/leveldb/leveldb_test.go +++ b/graph/leveldb/leveldb_test.go @@ -137,7 +137,12 @@ func TestLoadDatabase(t *testing.T) { } w, _ := writer.NewSingleReplication(qs, nil) - w.AddQuad(quad.Quad{"Something", "points_to", "Something Else", "context"}) + w.AddQuad(quad.Quad{ + Subject: "Something", + Predicate: "points_to", + Object: "Something Else", + Label: "context", + }) for _, pq := range []string{"Something", "points_to", "Something Else", "context"} { if got := qs.NameOf(qs.ValueOf(pq)); got != pq { t.Errorf("Failed to roundtrip %q, got:%q expect:%q", pq, got, pq) @@ -171,7 +176,12 @@ func TestLoadDatabase(t *testing.T) { t.Errorf("Unexpected quadstore size, got:%d expect:5", s) } - w.RemoveQuad(quad.Quad{"A", "follows", "B", ""}) + w.RemoveQuad(quad.Quad{ + Subject: "A", + Predicate: "follows", + Object: "B", + Label: "", + }) if s := qs.Size(); s != 10 { t.Errorf("Unexpected quadstore size after RemoveQuad, got:%d expect:10", s) } diff --git a/graph/memstore/quadstore_test.go b/graph/memstore/quadstore_test.go index e37c4df..57e54f4 100644 --- a/graph/memstore/quadstore_test.go +++ b/graph/memstore/quadstore_test.go @@ -177,7 +177,12 @@ func TestLinksToOptimization(t *testing.T) { func TestRemoveQuad(t *testing.T) { qs, w, _ := makeTestStore(simpleGraph) - w.RemoveQuad(quad.Quad{"E", "follows", "F", ""}) + w.RemoveQuad(quad.Quad{ + Subject: "E", + Predicate: "follows", + Object: "F", + Label: "", + }) fixed := qs.FixedIterator() fixed.Add(qs.ValueOf("E")) diff --git a/quad/cquads/cquads_test.go b/quad/cquads/cquads_test.go index 1c50060..1ab35ba 100644 --- a/quad/cquads/cquads_test.go +++ b/quad/cquads/cquads_test.go @@ -644,7 +644,7 @@ func TestDecoder(t *testing.T) { q, err := dec.Unmarshal() if err != nil { if err != io.EOF { - t.Fatalf("Failed to read document:", err) + t.Fatalf("Failed to read document: %v", err) } break } diff --git a/quad/nquads/nquads_test.go b/quad/nquads/nquads_test.go index 6c210be..0019120 100644 --- a/quad/nquads/nquads_test.go +++ b/quad/nquads/nquads_test.go @@ -483,7 +483,7 @@ func TestDecoder(t *testing.T) { q, err := dec.Unmarshal() if err != nil { if err != io.EOF { - t.Fatalf("Failed to read document:", err) + t.Fatalf("Failed to read document: %v", err) } break } diff --git a/query/mql/build_iterator.go b/query/mql/build_iterator.go index 94e393a..d1469d7 100644 --- a/query/mql/build_iterator.go +++ b/query/mql/build_iterator.go @@ -68,7 +68,7 @@ func (q *Query) buildIteratorTreeInternal(query interface{}, path Path) (it grap // Damn you, Javascript, and your lack of integer values. if math.Floor(t) == t { // Treat it like an integer. - it = q.buildFixed(fmt.Sprintf("%d", t)) + it = q.buildFixed(fmt.Sprintf("%0.f", t)) } else { it = q.buildFixed(fmt.Sprintf("%f", t)) } diff --git a/query/mql/mql_test.go b/query/mql/mql_test.go index 023e4c3..1f1b3e9 100644 --- a/query/mql/mql_test.go +++ b/query/mql/mql_test.go @@ -186,7 +186,7 @@ func TestMQL(t *testing.T) { if !reflect.DeepEqual(got, expect) { b, err := json.MarshalIndent(got, "", " ") if err != nil { - t.Fatalf("unexpected JSON marshal error", err) + t.Fatalf("unexpected JSON marshal error: %v", err) } t.Errorf("Failed to %s, got: %s expected: %s", test.message, b, test.expect) } diff --git a/query/sexp/parser.go b/query/sexp/parser.go index 43bbe0e..71e80d7 100644 --- a/query/sexp/parser.go +++ b/query/sexp/parser.go @@ -269,5 +269,4 @@ func buildIteratorTree(tree *peg.ExpressionTree, qs graph.QuadStore) graph.Itera default: return &iterator.Null{} } - panic("Not reached") } diff --git a/query/sexp/parser_test.go b/query/sexp/parser_test.go index e3dcb3a..d00823d 100644 --- a/query/sexp/parser_test.go +++ b/query/sexp/parser_test.go @@ -89,7 +89,7 @@ func TestTreeConstraintParse(t *testing.T) { "($a (:is :good))))" it := BuildIteratorTreeForQuery(qs, query) if it.Type() != graph.And { - t.Error("Odd iterator tree. Got: %s", it.DebugString(0)) + t.Errorf("Odd iterator tree. Got: %s", it.DebugString(0)) } if !graph.Next(it) { t.Error("Got no results") @@ -137,7 +137,7 @@ func TestMultipleConstraintParse(t *testing.T) { )` it := BuildIteratorTreeForQuery(qs, query) if it.Type() != graph.And { - t.Error("Odd iterator tree. Got: %s", it.DebugString(0)) + t.Errorf("Odd iterator tree. Got: %s", it.DebugString(0)) } if !graph.Next(it) { t.Error("Got no results")