diff --git a/graph/bolt/quadstore.go b/graph/bolt/quadstore.go index 0270f7b91..fe7baa130 100644 --- a/graph/bolt/quadstore.go +++ b/graph/bolt/quadstore.go @@ -587,7 +587,3 @@ func compareTokens(a, b graph.Value) bool { func (qs *QuadStore) FixedIterator() graph.FixedIterator { return iterator.NewFixed(compareTokens) } - -func (qs *QuadStore) Type() string { - return QuadStoreType -} diff --git a/graph/bolt2/bolt.go b/graph/bolt2/bolt.go index 293401aba..3b289c1a5 100644 --- a/graph/bolt2/bolt.go +++ b/graph/bolt2/bolt.go @@ -82,9 +82,11 @@ type DB struct { func (db *DB) Type() string { return Type } + func (db *DB) Close() error { return db.DB.Close() } + func (db *DB) Tx(update bool) (kv.BucketTx, error) { tx, err := db.DB.Begin(update) if err != nil { diff --git a/graph/gaedatastore/quadstore.go b/graph/gaedatastore/quadstore.go index b2e5ea916..222d47e31 100644 --- a/graph/gaedatastore/quadstore.go +++ b/graph/gaedatastore/quadstore.go @@ -559,7 +559,3 @@ func (qs *QuadStore) QuadDirection(val graph.Value, dir quad.Direction) graph.Va sub := t.Hash[offset : offset+(quad.HashSize*2)] return &Token{Kind: nodeKind, Hash: sub} } - -func (qs *QuadStore) Type() string { - return QuadStoreType -} diff --git a/graph/kv/quadstore.go b/graph/kv/quadstore.go index 5a766c53d..727a1b5e4 100644 --- a/graph/kv/quadstore.go +++ b/graph/kv/quadstore.go @@ -291,10 +291,6 @@ func (qs *QuadStore) ValueOf(s quad.Value) graph.Value { return out } -func (qs *QuadStore) Type() string { - return qs.db.Type() -} - func (qs *QuadStore) QuadDirection(val graph.Value, d quad.Direction) graph.Value { p, ok := val.(*proto.Primitive) if !ok { diff --git a/graph/leveldb/quadstore.go b/graph/leveldb/quadstore.go index 34c21e5fb..ce587d098 100644 --- a/graph/leveldb/quadstore.go +++ b/graph/leveldb/quadstore.go @@ -573,7 +573,3 @@ func compareBytes(a, b graph.Value) bool { func (qs *QuadStore) FixedIterator() graph.FixedIterator { return iterator.NewFixed(compareBytes) } - -func (qs *QuadStore) Type() string { - return QuadStoreType -} diff --git a/graph/memstore/quadstore.go b/graph/memstore/quadstore.go index b58e1e7d2..012320990 100644 --- a/graph/memstore/quadstore.go +++ b/graph/memstore/quadstore.go @@ -463,7 +463,3 @@ func (qs *QuadStore) NodesAllIterator() graph.Iterator { } func (qs *QuadStore) Close() error { return nil } - -func (qs *QuadStore) Type() string { - return QuadStoreType -} diff --git a/graph/mongo/quadstore.go b/graph/mongo/quadstore.go index 2861e87cf..e49b4a257 100644 --- a/graph/mongo/quadstore.go +++ b/graph/mongo/quadstore.go @@ -560,10 +560,6 @@ func (qs *QuadStore) QuadDirection(in graph.Value, d quad.Direction) graph.Value // TODO(barakmich): Rewrite bulk loader. For now, iterating around blocks is the way we'll go about it. -func (qs *QuadStore) Type() string { - return QuadStoreType -} - func (qs *QuadStore) getSize(collection string, constraint bson.M) (int64, error) { var size int bytes, err := bson.Marshal(constraint) diff --git a/graph/quadstore.go b/graph/quadstore.go index 095eb0c75..60af74f16 100644 --- a/graph/quadstore.go +++ b/graph/quadstore.go @@ -134,10 +134,6 @@ type QuadStore interface { // qs.ValueOf(qs.Quad(id).Get(dir)) // QuadDirection(id Value, d quad.Direction) Value - - // Get the type of QuadStore - //TODO replace this using reflection - Type() string } type Options map[string]interface{} diff --git a/graph/sql/quadstore.go b/graph/sql/quadstore.go index 04255642d..0feba084d 100644 --- a/graph/sql/quadstore.go +++ b/graph/sql/quadstore.go @@ -575,10 +575,6 @@ func (qs *QuadStore) QuadDirection(in graph.Value, d quad.Direction) graph.Value return NodeHash(in.(QuadHashes).Get(d)) } -func (qs *QuadStore) Type() string { - return QuadStoreType -} - func (qs *QuadStore) sizeForIterator(isAll bool, dir quad.Direction, hash NodeHash) int64 { var err error if isAll {