From 447a835b93f76ae699d9da3151bbe48019e6e26e Mon Sep 17 00:00:00 2001 From: kortschak Date: Wed, 2 Jul 2014 12:17:33 +0930 Subject: [PATCH] Rename AddValue --- graph/iterator.go | 2 +- graph/iterator/and_iterator_optimize_test.go | 2 +- graph/iterator/and_iterator_test.go | 30 ++++++++++++------------ graph/iterator/fixed_iterator.go | 4 ++-- graph/iterator/linksto_iterator_test.go | 4 ++-- graph/iterator/or_iterator_test.go | 28 +++++++++++----------- graph/iterator/query_shape_test.go | 6 ++--- graph/iterator/value_comparison_iterator_test.go | 10 ++++---- graph/leveldb/leveldb_test.go | 2 +- graph/memstore/triplestore_test.go | 10 ++++---- graph/sexp/parser.go | 2 +- query/gremlin/build_iterator.go | 18 +++++++------- query/mql/build_iterator.go | 4 ++-- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/graph/iterator.go b/graph/iterator.go index 709b7d3..ec680b8 100644 --- a/graph/iterator.go +++ b/graph/iterator.go @@ -117,7 +117,7 @@ type Iterator interface { type FixedIterator interface { Iterator - AddValue(Value) + Add(Value) } type IteratorStats struct { diff --git a/graph/iterator/and_iterator_optimize_test.go b/graph/iterator/and_iterator_optimize_test.go index cb8030ab..846f781 100644 --- a/graph/iterator/and_iterator_optimize_test.go +++ b/graph/iterator/and_iterator_optimize_test.go @@ -26,7 +26,7 @@ import ( func TestIteratorPromotion(t *testing.T) { all := NewInt64(1, 3) fixed := newFixed() - fixed.AddValue(3) + fixed.Add(3) a := NewAnd() a.AddSubIterator(all) a.AddSubIterator(fixed) diff --git a/graph/iterator/and_iterator_test.go b/graph/iterator/and_iterator_test.go index ef76903..60633e1 100644 --- a/graph/iterator/and_iterator_test.go +++ b/graph/iterator/and_iterator_test.go @@ -23,7 +23,7 @@ import ( // Make sure that tags work on the And. func TestTag(t *testing.T) { fix1 := newFixed() - fix1.AddValue(234) + fix1.Add(234) fix1.AddTag("foo") and := NewAnd() and.AddSubIterator(fix1) @@ -56,14 +56,14 @@ func TestTag(t *testing.T) { // Do a simple itersection of fixed values. func TestAndAndFixedIterators(t *testing.T) { fix1 := newFixed() - fix1.AddValue(1) - fix1.AddValue(2) - fix1.AddValue(3) - fix1.AddValue(4) + fix1.Add(1) + fix1.Add(2) + fix1.Add(3) + fix1.Add(4) fix2 := newFixed() - fix2.AddValue(3) - fix2.AddValue(4) - fix2.AddValue(5) + fix2.Add(3) + fix2.Add(4) + fix2.Add(5) and := NewAnd() and.AddSubIterator(fix1) and.AddSubIterator(fix2) @@ -97,14 +97,14 @@ func TestAndAndFixedIterators(t *testing.T) { // but there should be nothing to Next() func TestNonOverlappingFixedIterators(t *testing.T) { fix1 := newFixed() - fix1.AddValue(1) - fix1.AddValue(2) - fix1.AddValue(3) - fix1.AddValue(4) + fix1.Add(1) + fix1.Add(2) + fix1.Add(3) + fix1.Add(4) fix2 := newFixed() - fix2.AddValue(5) - fix2.AddValue(6) - fix2.AddValue(7) + fix2.Add(5) + fix2.Add(6) + fix2.Add(7) and := NewAnd() and.AddSubIterator(fix1) and.AddSubIterator(fix2) diff --git a/graph/iterator/fixed_iterator.go b/graph/iterator/fixed_iterator.go index 8dd7190..8eca523 100644 --- a/graph/iterator/fixed_iterator.go +++ b/graph/iterator/fixed_iterator.go @@ -71,7 +71,7 @@ func (it *Fixed) Close() {} func (it *Fixed) Clone() graph.Iterator { out := NewFixedIteratorWithCompare(it.cmp) for _, val := range it.values { - out.AddValue(val) + out.Add(val) } out.CopyTagsFrom(it) return out @@ -79,7 +79,7 @@ func (it *Fixed) Clone() graph.Iterator { // Add a value to the iterator. The array now contains this value. // TODO(barakmich): This ought to be a set someday, disallowing repeated values. -func (it *Fixed) AddValue(v graph.Value) { +func (it *Fixed) Add(v graph.Value) { it.values = append(it.values, v) } diff --git a/graph/iterator/linksto_iterator_test.go b/graph/iterator/linksto_iterator_test.go index d350e52..8850871 100644 --- a/graph/iterator/linksto_iterator_test.go +++ b/graph/iterator/linksto_iterator_test.go @@ -23,11 +23,11 @@ import ( func TestLinksTo(t *testing.T) { ts := new(TestTripleStore) tsFixed := newFixed() - tsFixed.AddValue(2) + tsFixed.Add(2) ts.On("ValueOf", "cool").Return(1) ts.On("TripleIterator", graph.Object, 1).Return(tsFixed) fixed := newFixed() - fixed.AddValue(ts.ValueOf("cool")) + fixed.Add(ts.ValueOf("cool")) lto := NewLinksTo(ts, fixed, graph.Object) val, ok := lto.Next() if !ok { diff --git a/graph/iterator/or_iterator_test.go b/graph/iterator/or_iterator_test.go index 76d16d6..3542149 100644 --- a/graph/iterator/or_iterator_test.go +++ b/graph/iterator/or_iterator_test.go @@ -40,14 +40,14 @@ func TestOrIteratorBasics(t *testing.T) { Convey("Given an Or Iterator of two fixed iterators", t, func() { orIt = NewOr() fixed1 := newFixed() - fixed1.AddValue(1) - fixed1.AddValue(2) - fixed1.AddValue(3) + fixed1.Add(1) + fixed1.Add(2) + fixed1.Add(3) fixed2 := newFixed() - fixed2.AddValue(3) - fixed2.AddValue(9) - fixed2.AddValue(20) - fixed2.AddValue(21) + fixed2.Add(3) + fixed2.Add(9) + fixed2.Add(20) + fixed2.Add(21) orIt.AddSubIterator(fixed1) orIt.AddSubIterator(fixed2) @@ -88,14 +88,14 @@ func TestShortCircuitingOrBasics(t *testing.T) { Convey("Given a short-circuiting Or of two fixed iterators", t, func() { orIt = NewShortCircuitOr() fixed1 := newFixed() - fixed1.AddValue(1) - fixed1.AddValue(2) - fixed1.AddValue(3) + fixed1.Add(1) + fixed1.Add(2) + fixed1.Add(3) fixed2 := newFixed() - fixed2.AddValue(3) - fixed2.AddValue(9) - fixed2.AddValue(20) - fixed2.AddValue(21) + fixed2.Add(3) + fixed2.Add(9) + fixed2.Add(20) + fixed2.Add(21) Convey("It should guess its size.", func() { orIt.AddSubIterator(fixed1) diff --git a/graph/iterator/query_shape_test.go b/graph/iterator/query_shape_test.go index f8f1770..9e53d28 100644 --- a/graph/iterator/query_shape_test.go +++ b/graph/iterator/query_shape_test.go @@ -25,8 +25,8 @@ import ( func buildHasaWithTag(ts graph.TripleStore, tag string, target string) *HasA { fixed_obj := ts.FixedIterator() fixed_pred := ts.FixedIterator() - fixed_obj.AddValue(ts.ValueOf(target)) - fixed_pred.AddValue(ts.ValueOf("status")) + fixed_obj.Add(ts.ValueOf(target)) + fixed_pred.Add(ts.ValueOf("status")) fixed_obj.AddTag(tag) lto1 := NewLinksTo(ts, fixed_obj, graph.Object) lto2 := NewLinksTo(ts, fixed_pred, graph.Predicate) @@ -92,7 +92,7 @@ func TestQueryShape(t *testing.T) { andInternal.AddSubIterator(hasa1) andInternal.AddSubIterator(hasa2) fixed_pred := ts.FixedIterator() - fixed_pred.AddValue(ts.ValueOf("name")) + fixed_pred.Add(ts.ValueOf("name")) lto1 := NewLinksTo(ts, andInternal, graph.Subject) lto2 := NewLinksTo(ts, fixed_pred, graph.Predicate) and := NewAnd() diff --git a/graph/iterator/value_comparison_iterator_test.go b/graph/iterator/value_comparison_iterator_test.go index 90a7ac1..100e639 100644 --- a/graph/iterator/value_comparison_iterator_test.go +++ b/graph/iterator/value_comparison_iterator_test.go @@ -43,11 +43,11 @@ func SimpleValueTripleStore() *TestTripleStore { func BuildFixedIterator() *Fixed { fixed := newFixed() - fixed.AddValue(0) - fixed.AddValue(1) - fixed.AddValue(2) - fixed.AddValue(3) - fixed.AddValue(4) + fixed.Add(0) + fixed.Add(1) + fixed.Add(2) + fixed.Add(3) + fixed.Add(4) return fixed } diff --git a/graph/leveldb/leveldb_test.go b/graph/leveldb/leveldb_test.go index a7e9be9..9429927 100644 --- a/graph/leveldb/leveldb_test.go +++ b/graph/leveldb/leveldb_test.go @@ -399,7 +399,7 @@ func TestOptimize(t *testing.T) { Convey("With an linksto-fixed pair", func() { fixed := ts.FixedIterator() - fixed.AddValue(ts.ValueOf("F")) + fixed.Add(ts.ValueOf("F")) fixed.AddTag("internal") lto = iterator.NewLinksTo(ts, fixed, graph.Object) diff --git a/graph/memstore/triplestore_test.go b/graph/memstore/triplestore_test.go index b8eb68b..9dda9b2 100644 --- a/graph/memstore/triplestore_test.go +++ b/graph/memstore/triplestore_test.go @@ -40,13 +40,13 @@ func TestMemstore(t *testing.T) { func TestIteratorsAndNextResultOrderA(t *testing.T) { ts := MakeTestingMemstore() fixed := ts.FixedIterator() - fixed.AddValue(ts.ValueOf("C")) + fixed.Add(ts.ValueOf("C")) all := ts.NodesAllIterator() lto := iterator.NewLinksTo(ts, all, graph.Object) innerAnd := iterator.NewAnd() fixed2 := ts.FixedIterator() - fixed2.AddValue(ts.ValueOf("follows")) + fixed2.Add(ts.ValueOf("follows")) lto2 := iterator.NewLinksTo(ts, fixed2, graph.Predicate) innerAnd.AddSubIterator(lto2) innerAnd.AddSubIterator(lto) @@ -98,7 +98,7 @@ func CompareStringSlices(t *testing.T, expected []string, actual []string) { func TestLinksToOptimization(t *testing.T) { ts := MakeTestingMemstore() fixed := ts.FixedIterator() - fixed.AddValue(ts.ValueOf("cool")) + fixed.Add(ts.ValueOf("cool")) lto := iterator.NewLinksTo(ts, fixed, graph.Object) lto.AddTag("foo") newIt, changed := lto.Optimize() @@ -122,10 +122,10 @@ func TestRemoveTriple(t *testing.T) { ts := MakeTestingMemstore() ts.RemoveTriple(&graph.Triple{"E", "follows", "F", ""}) fixed := ts.FixedIterator() - fixed.AddValue(ts.ValueOf("E")) + fixed.Add(ts.ValueOf("E")) lto := iterator.NewLinksTo(ts, fixed, graph.Subject) fixed2 := ts.FixedIterator() - fixed2.AddValue(ts.ValueOf("follows")) + fixed2.Add(ts.ValueOf("follows")) lto2 := iterator.NewLinksTo(ts, fixed2, graph.Predicate) innerAnd := iterator.NewAnd() innerAnd.AddSubIterator(lto2) diff --git a/graph/sexp/parser.go b/graph/sexp/parser.go index 9f3f0ef..5a3c86a 100644 --- a/graph/sexp/parser.go +++ b/graph/sexp/parser.go @@ -197,7 +197,7 @@ func buildIteratorTree(tree *peg.ExpressionTree, ts graph.TripleStore) graph.Ite n = nodeID[1:] } fixed := ts.FixedIterator() - fixed.AddValue(ts.ValueOf(n)) + fixed.Add(ts.ValueOf(n)) out = fixed } return out diff --git a/query/gremlin/build_iterator.go b/query/gremlin/build_iterator.go index 0fa98f0..1634368 100644 --- a/query/gremlin/build_iterator.go +++ b/query/gremlin/build_iterator.go @@ -75,7 +75,7 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator switch v := thing.(type) { case string: it := ts.FixedIterator() - it.AddValue(ts.ValueOf(v)) + it.Add(ts.ValueOf(v)) return it default: glog.Errorln("Trying to build unknown primitive value.") @@ -89,7 +89,7 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator strings := makeListOfStringsFromArrayValue(val.Object()) it := ts.FixedIterator() for _, x := range strings { - it.AddValue(ts.ValueOf(x)) + it.Add(ts.ValueOf(x)) } return it case "Number": @@ -101,7 +101,7 @@ func buildIteratorFromValue(val otto.Value, ts graph.TripleStore) graph.Iterator case "String": it := ts.FixedIterator() str, _ := val.ToString() - it.AddValue(ts.ValueOf(str)) + it.Add(ts.ValueOf(str)) return it default: glog.Errorln("Trying to handle unsupported Javascript value.") @@ -172,7 +172,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph. } else { fixed := ts.FixedIterator() for _, name := range stringArgs { - fixed.AddValue(ts.ValueOf(name)) + fixed.Add(ts.ValueOf(name)) } it = fixed } @@ -192,7 +192,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph. all.AddTag(stringArgs[0]) } predFixed := ts.FixedIterator() - predFixed.AddValue(ts.ValueOf(stringArgs[0])) + predFixed.Add(ts.ValueOf(stringArgs[0])) subAnd := iterator.NewAnd() subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, graph.Predicate)) subAnd.AddSubIterator(iterator.NewLinksTo(ts, all, graph.Object)) @@ -212,7 +212,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph. all.AddTag(stringArgs[0]) } predFixed := ts.FixedIterator() - predFixed.AddValue(ts.ValueOf(stringArgs[0])) + predFixed.Add(ts.ValueOf(stringArgs[0])) subAnd := iterator.NewAnd() subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, graph.Predicate)) subAnd.AddSubIterator(iterator.NewLinksTo(ts, all, graph.Subject)) @@ -227,10 +227,10 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph. return iterator.NewNull() } for _, name := range stringArgs[1:] { - fixed.AddValue(ts.ValueOf(name)) + fixed.Add(ts.ValueOf(name)) } predFixed := ts.FixedIterator() - predFixed.AddValue(ts.ValueOf(stringArgs[0])) + predFixed.Add(ts.ValueOf(stringArgs[0])) subAnd := iterator.NewAnd() subAnd.AddSubIterator(iterator.NewLinksTo(ts, predFixed, graph.Predicate)) subAnd.AddSubIterator(iterator.NewLinksTo(ts, fixed, graph.Object)) @@ -263,7 +263,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph. case "is": fixed := ts.FixedIterator() for _, name := range stringArgs { - fixed.AddValue(ts.ValueOf(name)) + fixed.Add(ts.ValueOf(name)) } and := iterator.NewAnd() and.AddSubIterator(fixed) diff --git a/query/mql/build_iterator.go b/query/mql/build_iterator.go index cc18988..2a0d124 100644 --- a/query/mql/build_iterator.go +++ b/query/mql/build_iterator.go @@ -27,7 +27,7 @@ import ( func (q *Query) buildFixed(s string) graph.Iterator { f := q.ses.ts.FixedIterator() - f.AddValue(q.ses.ts.ValueOf(s)) + f.Add(q.ses.ts.ValueOf(s)) return f } @@ -138,7 +138,7 @@ func (q *Query) buildIteratorTreeMapInternal(query map[string]interface{}, path } subAnd := iterator.NewAnd() predFixed := q.ses.ts.FixedIterator() - predFixed.AddValue(q.ses.ts.ValueOf(pred)) + predFixed.Add(q.ses.ts.ValueOf(pred)) subAnd.AddSubIterator(iterator.NewLinksTo(q.ses.ts, predFixed, graph.Predicate)) if reverse { lto := iterator.NewLinksTo(q.ses.ts, builtIt, graph.Subject)