From b0f92e1a184604039de76f39ed3a917f6ddf7a33 Mon Sep 17 00:00:00 2001 From: Denys Smirnov Date: Sat, 23 Dec 2017 03:20:26 +0200 Subject: [PATCH] goimports --- examples/hello_bolt/main.go | 2 +- examples/hello_schema/main.go | 3 ++- graph/bolt/bolt_test.go | 2 +- graph/bolt/iterator.go | 2 +- graph/bolt/quadstore_iterator_optimize.go | 1 + graph/gaedatastore/iterator.go | 4 ++-- graph/graphtest/graphtest.go | 2 +- graph/http/httpgraph.go | 3 ++- graph/iterator/and.go | 1 + graph/iterator/and_test.go | 2 +- graph/iterator/count.go | 1 + graph/iterator/count_test.go | 3 ++- graph/iterator/fixed.go | 2 +- graph/iterator/hasa.go | 4 ++-- graph/iterator/hasa_test.go | 2 +- graph/iterator/iterator.go | 4 ++-- graph/iterator/iterator_test.go | 1 + graph/iterator/limit.go | 1 + graph/iterator/limit_test.go | 2 +- graph/iterator/linksto.go | 1 + graph/iterator/linksto_test.go | 2 +- graph/iterator/materialize.go | 4 ++-- graph/iterator/materialize_test.go | 2 +- graph/iterator/not.go | 1 + graph/iterator/not_test.go | 2 +- graph/iterator/optional.go | 1 + graph/iterator/or.go | 1 + graph/iterator/or_test.go | 2 +- graph/iterator/query_shape.go | 1 + graph/iterator/recursive.go | 2 +- graph/iterator/recursive_test.go | 2 +- graph/iterator/regex.go | 4 ++-- graph/iterator/skip.go | 1 + graph/iterator/skip_test.go | 2 +- graph/iterator/unique.go | 1 + graph/iterator/unique_test.go | 2 +- graph/iterator/value_comparison.go | 3 ++- graph/iterator/value_comparison_test.go | 2 +- graph/kv/all_iterator.go | 1 + graph/kv/kvtest/kvtest.go | 2 +- graph/kv/quadstore.go | 2 +- graph/kv/quadstore_iterator_optimize.go | 1 + graph/kv/quadstore_test.go | 2 +- graph/leveldb/all_iterator.go | 2 +- graph/leveldb/iterator.go | 4 ++-- graph/leveldb/leveldb_test.go | 2 +- graph/leveldb/quadstore_iterator_optimize.go | 1 + graph/log/graphlog.go | 3 ++- graph/memstore/all_iterator.go | 1 + graph/memstore/iterator.go | 2 +- graph/memstore/quadstore_iterator_optimize.go | 1 + graph/memstore/quadstore_test.go | 2 +- graph/mongo/indexed_linksto.go | 5 +++-- graph/mongo/iterator.go | 5 +++-- graph/mongo/quadstore_iterator_optimize.go | 2 +- graph/nosql/nosql.go | 1 + graph/nosql/nosqltest/nosqltest_all.go | 2 +- graph/nosql/value_test.go | 3 ++- graph/quadstore.go | 2 +- graph/sql/postgres/postgres_test.go | 2 +- graph/values.go | 1 + internal/gephi/stream_test.go | 3 ++- quad/jsonld/jsonld.go | 3 ++- quad/jsonld/jsonld_test.go | 3 ++- quad/pquads/pio/io_test.go | 5 +++-- quad/pquads/pio/varint.go | 3 ++- query/sexp/parser_test.go | 2 +- 67 files changed, 89 insertions(+), 57 deletions(-) diff --git a/examples/hello_bolt/main.go b/examples/hello_bolt/main.go index ad221da61..0a5297fed 100644 --- a/examples/hello_bolt/main.go +++ b/examples/hello_bolt/main.go @@ -1,12 +1,12 @@ package main import ( + "context" "fmt" "io/ioutil" "log" "os" - "context" "github.com/cayleygraph/cayley" "github.com/cayleygraph/cayley/graph" _ "github.com/cayleygraph/cayley/graph/kv/bolt" diff --git a/examples/hello_schema/main.go b/examples/hello_schema/main.go index 8b1f1d34c..2bab95329 100644 --- a/examples/hello_schema/main.go +++ b/examples/hello_schema/main.go @@ -1,6 +1,7 @@ package main import ( + "context" "fmt" "io/ioutil" "log" @@ -13,8 +14,8 @@ import ( "github.com/cayleygraph/cayley/quad" "github.com/cayleygraph/cayley/schema" "github.com/cayleygraph/cayley/voc" + // Import RDF vocabulary definitions to be able to expand IRIs like rdf:label. - "context" _ "github.com/cayleygraph/cayley/voc/core" ) diff --git a/graph/bolt/bolt_test.go b/graph/bolt/bolt_test.go index e550c9f80..0628a5790 100644 --- a/graph/bolt/bolt_test.go +++ b/graph/bolt/bolt_test.go @@ -15,12 +15,12 @@ package bolt import ( + "context" "io/ioutil" "os" "reflect" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphtest" "github.com/cayleygraph/cayley/graph/graphtest/testutil" diff --git a/graph/bolt/iterator.go b/graph/bolt/iterator.go index 73e0d924b..e0c98e83f 100644 --- a/graph/bolt/iterator.go +++ b/graph/bolt/iterator.go @@ -16,13 +16,13 @@ package bolt import ( "bytes" + "context" "errors" "fmt" "github.com/boltdb/bolt" "github.com/cayleygraph/cayley/clog" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" diff --git a/graph/bolt/quadstore_iterator_optimize.go b/graph/bolt/quadstore_iterator_optimize.go index f669810d5..87362a98b 100644 --- a/graph/bolt/quadstore_iterator_optimize.go +++ b/graph/bolt/quadstore_iterator_optimize.go @@ -16,6 +16,7 @@ package bolt import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/gaedatastore/iterator.go b/graph/gaedatastore/iterator.go index b45a66f99..781382cc7 100644 --- a/graph/gaedatastore/iterator.go +++ b/graph/gaedatastore/iterator.go @@ -15,14 +15,14 @@ package gaedatastore import ( + "context" "fmt" + "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" - "context" - "github.com/cayleygraph/cayley/clog" "google.golang.org/appengine/datastore" ) diff --git a/graph/graphtest/graphtest.go b/graph/graphtest/graphtest.go index 37b60fb2b..b3d2c13ca 100644 --- a/graph/graphtest/graphtest.go +++ b/graph/graphtest/graphtest.go @@ -1,11 +1,11 @@ package graphtest import ( + "context" "sort" "testing" "time" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphtest/testutil" "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/http/httpgraph.go b/graph/http/httpgraph.go index 367edcaf3..b50e00b02 100644 --- a/graph/http/httpgraph.go +++ b/graph/http/httpgraph.go @@ -1,8 +1,9 @@ package httpgraph import ( - "github.com/cayleygraph/cayley/graph" "net/http" + + "github.com/cayleygraph/cayley/graph" ) type QuadStore interface { diff --git a/graph/iterator/and.go b/graph/iterator/and.go index 8cae8b4f2..9e555530b 100644 --- a/graph/iterator/and.go +++ b/graph/iterator/and.go @@ -17,6 +17,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/and_test.go b/graph/iterator/and_test.go index 958b445b3..c4e370679 100644 --- a/graph/iterator/and_test.go +++ b/graph/iterator/and_test.go @@ -15,10 +15,10 @@ package iterator_test import ( + "context" "errors" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphmock" . "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/iterator/count.go b/graph/iterator/count.go index cab3b2931..86c78d10e 100644 --- a/graph/iterator/count.go +++ b/graph/iterator/count.go @@ -2,6 +2,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/count_test.go b/graph/iterator/count_test.go index bf18669f7..9a569026e 100644 --- a/graph/iterator/count_test.go +++ b/graph/iterator/count_test.go @@ -2,10 +2,11 @@ package iterator import ( "context" + "testing" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" "github.com/stretchr/testify/require" - "testing" ) func TestCount(t *testing.T) { diff --git a/graph/iterator/fixed.go b/graph/iterator/fixed.go index 7bf97b3c9..f7436a217 100644 --- a/graph/iterator/fixed.go +++ b/graph/iterator/fixed.go @@ -21,9 +21,9 @@ package iterator // opaque Quad store value, may not answer to ==. import ( + "context" "fmt" - "context" "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/hasa.go b/graph/iterator/hasa.go index 74c979c36..fe782e05c 100644 --- a/graph/iterator/hasa.go +++ b/graph/iterator/hasa.go @@ -34,10 +34,10 @@ package iterator // Alternatively, can be seen as the dual of the LinksTo iterator. import ( - "github.com/cayleygraph/cayley/clog" - "context" "fmt" + + "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/hasa_test.go b/graph/iterator/hasa_test.go index cef58b03a..38224bd34 100644 --- a/graph/iterator/hasa_test.go +++ b/graph/iterator/hasa_test.go @@ -15,10 +15,10 @@ package iterator_test import ( + "context" "errors" "testing" - "context" . "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/iterator.go b/graph/iterator/iterator.go index e0a932605..1f08b97fa 100644 --- a/graph/iterator/iterator.go +++ b/graph/iterator/iterator.go @@ -17,10 +17,10 @@ package iterator // Define the general iterator interface. import ( - "sync/atomic" - "context" "fmt" + "sync/atomic" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/iterator_test.go b/graph/iterator/iterator_test.go index e4eec5ff6..21bfded9f 100644 --- a/graph/iterator/iterator_test.go +++ b/graph/iterator/iterator_test.go @@ -2,6 +2,7 @@ package iterator_test import ( "context" + "github.com/cayleygraph/cayley/graph" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/limit.go b/graph/iterator/limit.go index 1c831aea9..e618b1c7b 100644 --- a/graph/iterator/limit.go +++ b/graph/iterator/limit.go @@ -3,6 +3,7 @@ package iterator import ( "context" "fmt" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/limit_test.go b/graph/iterator/limit_test.go index 6b96a12e3..8fa1cf525 100644 --- a/graph/iterator/limit_test.go +++ b/graph/iterator/limit_test.go @@ -1,10 +1,10 @@ package iterator_test import ( + "context" "reflect" "testing" - "context" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/linksto.go b/graph/iterator/linksto.go index 5e69aa720..b89514fbf 100644 --- a/graph/iterator/linksto.go +++ b/graph/iterator/linksto.go @@ -32,6 +32,7 @@ package iterator import ( "context" "fmt" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/linksto_test.go b/graph/iterator/linksto_test.go index 57b4e51a2..a8a8fbbd3 100644 --- a/graph/iterator/linksto_test.go +++ b/graph/iterator/linksto_test.go @@ -15,9 +15,9 @@ package iterator_test import ( + "context" "testing" - "context" "github.com/cayleygraph/cayley/graph/graphmock" . "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" diff --git a/graph/iterator/materialize.go b/graph/iterator/materialize.go index 7c0f70d82..1b2479d6b 100644 --- a/graph/iterator/materialize.go +++ b/graph/iterator/materialize.go @@ -17,9 +17,9 @@ package iterator // A simple iterator that, when first called Contains() or Next() upon, materializes the whole subiterator, stores it locally, and responds. Essentially a cache. import ( - "github.com/cayleygraph/cayley/clog" - "context" + + "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/materialize_test.go b/graph/iterator/materialize_test.go index 775247484..5326f14d3 100644 --- a/graph/iterator/materialize_test.go +++ b/graph/iterator/materialize_test.go @@ -15,10 +15,10 @@ package iterator_test import ( + "context" "errors" "testing" - "context" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/not.go b/graph/iterator/not.go index 39a790a35..1266d233c 100644 --- a/graph/iterator/not.go +++ b/graph/iterator/not.go @@ -2,6 +2,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/not_test.go b/graph/iterator/not_test.go index 728548e87..cb285d01b 100644 --- a/graph/iterator/not_test.go +++ b/graph/iterator/not_test.go @@ -1,11 +1,11 @@ package iterator_test import ( + "context" "errors" "reflect" "testing" - "context" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/optional.go b/graph/iterator/optional.go index 20e9f6dd9..a25ff94b2 100644 --- a/graph/iterator/optional.go +++ b/graph/iterator/optional.go @@ -28,6 +28,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/or.go b/graph/iterator/or.go index f1feb55bc..a9158b2ec 100644 --- a/graph/iterator/or.go +++ b/graph/iterator/or.go @@ -23,6 +23,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/or_test.go b/graph/iterator/or_test.go index 0f95dbc2a..a35cea3c7 100644 --- a/graph/iterator/or_test.go +++ b/graph/iterator/or_test.go @@ -15,11 +15,11 @@ package iterator_test import ( + "context" "errors" "reflect" "testing" - "context" "github.com/cayleygraph/cayley/graph" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/query_shape.go b/graph/iterator/query_shape.go index 2ee1406d7..6c04e799a 100644 --- a/graph/iterator/query_shape.go +++ b/graph/iterator/query_shape.go @@ -16,6 +16,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/recursive.go b/graph/iterator/recursive.go index 1c61bac89..ce2e7c818 100644 --- a/graph/iterator/recursive.go +++ b/graph/iterator/recursive.go @@ -1,9 +1,9 @@ package iterator import ( + "context" "math" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/recursive_test.go b/graph/iterator/recursive_test.go index f0a4be595..77cf93253 100644 --- a/graph/iterator/recursive_test.go +++ b/graph/iterator/recursive_test.go @@ -15,11 +15,11 @@ package iterator_test import ( + "context" "reflect" "sort" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphmock" . "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/iterator/regex.go b/graph/iterator/regex.go index 29881194a..f1999dec6 100644 --- a/graph/iterator/regex.go +++ b/graph/iterator/regex.go @@ -15,10 +15,10 @@ package iterator import ( - "regexp" - "context" "fmt" + "regexp" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/iterator/skip.go b/graph/iterator/skip.go index 161ed792a..a52cd5e6a 100644 --- a/graph/iterator/skip.go +++ b/graph/iterator/skip.go @@ -3,6 +3,7 @@ package iterator import ( "context" "fmt" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/skip_test.go b/graph/iterator/skip_test.go index f688a7ac3..450354263 100644 --- a/graph/iterator/skip_test.go +++ b/graph/iterator/skip_test.go @@ -1,10 +1,10 @@ package iterator_test import ( + "context" "reflect" "testing" - "context" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/unique.go b/graph/iterator/unique.go index 462476fde..3918cbbc2 100644 --- a/graph/iterator/unique.go +++ b/graph/iterator/unique.go @@ -2,6 +2,7 @@ package iterator import ( "context" + "github.com/cayleygraph/cayley/graph" ) diff --git a/graph/iterator/unique_test.go b/graph/iterator/unique_test.go index fb9ec5f59..9b2100504 100644 --- a/graph/iterator/unique_test.go +++ b/graph/iterator/unique_test.go @@ -1,10 +1,10 @@ package iterator_test import ( + "context" "reflect" "testing" - "context" . "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/iterator/value_comparison.go b/graph/iterator/value_comparison.go index 445832cc3..b42447d0c 100644 --- a/graph/iterator/value_comparison.go +++ b/graph/iterator/value_comparison.go @@ -29,9 +29,10 @@ package iterator import ( "context" "fmt" + "time" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" - "time" ) type Operator int diff --git a/graph/iterator/value_comparison_test.go b/graph/iterator/value_comparison_test.go index 1b8a4c760..bdfb56f57 100644 --- a/graph/iterator/value_comparison_test.go +++ b/graph/iterator/value_comparison_test.go @@ -15,11 +15,11 @@ package iterator_test import ( + "context" "errors" "reflect" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphmock" . "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/kv/all_iterator.go b/graph/kv/all_iterator.go index c574b045c..f0e18d109 100644 --- a/graph/kv/all_iterator.go +++ b/graph/kv/all_iterator.go @@ -16,6 +16,7 @@ package kv import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/graph/proto" diff --git a/graph/kv/kvtest/kvtest.go b/graph/kv/kvtest/kvtest.go index d33410bad..5225dc237 100644 --- a/graph/kv/kvtest/kvtest.go +++ b/graph/kv/kvtest/kvtest.go @@ -1,10 +1,10 @@ package kvtest import ( + "context" "reflect" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphtest" "github.com/cayleygraph/cayley/graph/graphtest/testutil" diff --git a/graph/kv/quadstore.go b/graph/kv/quadstore.go index 793d6f688..81594d3c4 100644 --- a/graph/kv/quadstore.go +++ b/graph/kv/quadstore.go @@ -15,12 +15,12 @@ package kv import ( + "context" "encoding/binary" "errors" "fmt" "sync" - "context" "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/proto" diff --git a/graph/kv/quadstore_iterator_optimize.go b/graph/kv/quadstore_iterator_optimize.go index 6d2d80f8b..1e3a6711c 100644 --- a/graph/kv/quadstore_iterator_optimize.go +++ b/graph/kv/quadstore_iterator_optimize.go @@ -16,6 +16,7 @@ package kv import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/kv/quadstore_test.go b/graph/kv/quadstore_test.go index fcec5cacb..a8cb83538 100644 --- a/graph/kv/quadstore_test.go +++ b/graph/kv/quadstore_test.go @@ -2,6 +2,7 @@ package kv_test import ( "bytes" + "context" "encoding/binary" henc "encoding/hex" "fmt" @@ -9,7 +10,6 @@ import ( "sync" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/kv" "github.com/cayleygraph/cayley/graph/kv/btree" diff --git a/graph/leveldb/all_iterator.go b/graph/leveldb/all_iterator.go index f196714a0..c308ebe67 100644 --- a/graph/leveldb/all_iterator.go +++ b/graph/leveldb/all_iterator.go @@ -16,11 +16,11 @@ package leveldb import ( "bytes" + "context" ldbit "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" diff --git a/graph/leveldb/iterator.go b/graph/leveldb/iterator.go index cb55a9aa8..23c6ff153 100644 --- a/graph/leveldb/iterator.go +++ b/graph/leveldb/iterator.go @@ -16,12 +16,12 @@ package leveldb import ( "bytes" + "context" - "github.com/cayleygraph/cayley/clog" ldbit "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" - "context" + "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" diff --git a/graph/leveldb/leveldb_test.go b/graph/leveldb/leveldb_test.go index a7ba949f4..e4d03f5c7 100644 --- a/graph/leveldb/leveldb_test.go +++ b/graph/leveldb/leveldb_test.go @@ -15,12 +15,12 @@ package leveldb import ( + "context" "io/ioutil" "os" "reflect" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphtest" "github.com/cayleygraph/cayley/graph/graphtest/testutil" diff --git a/graph/leveldb/quadstore_iterator_optimize.go b/graph/leveldb/quadstore_iterator_optimize.go index 8b2dd477f..ea77a8405 100644 --- a/graph/leveldb/quadstore_iterator_optimize.go +++ b/graph/leveldb/quadstore_iterator_optimize.go @@ -16,6 +16,7 @@ package leveldb import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/log/graphlog.go b/graph/log/graphlog.go index 59ec51588..0dcde7a47 100644 --- a/graph/log/graphlog.go +++ b/graph/log/graphlog.go @@ -2,9 +2,10 @@ package graphlog import ( "bytes" + "sort" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" - "sort" ) type Op interface { diff --git a/graph/memstore/all_iterator.go b/graph/memstore/all_iterator.go index 9c8274edc..be5e1e47e 100644 --- a/graph/memstore/all_iterator.go +++ b/graph/memstore/all_iterator.go @@ -16,6 +16,7 @@ package memstore import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/memstore/iterator.go b/graph/memstore/iterator.go index 41c5c9ba3..6e0ba2ff0 100644 --- a/graph/memstore/iterator.go +++ b/graph/memstore/iterator.go @@ -15,11 +15,11 @@ package memstore import ( + "context" "fmt" "io" "math" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" diff --git a/graph/memstore/quadstore_iterator_optimize.go b/graph/memstore/quadstore_iterator_optimize.go index 9e750a9f7..522cf7f97 100644 --- a/graph/memstore/quadstore_iterator_optimize.go +++ b/graph/memstore/quadstore_iterator_optimize.go @@ -16,6 +16,7 @@ package memstore import ( "context" + "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" ) diff --git a/graph/memstore/quadstore_test.go b/graph/memstore/quadstore_test.go index 3fcea962f..2e6899c71 100644 --- a/graph/memstore/quadstore_test.go +++ b/graph/memstore/quadstore_test.go @@ -15,11 +15,11 @@ package memstore import ( + "context" "reflect" "sort" "testing" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphtest" "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/mongo/indexed_linksto.go b/graph/mongo/indexed_linksto.go index d426f10a0..5b74f12f6 100644 --- a/graph/mongo/indexed_linksto.go +++ b/graph/mongo/indexed_linksto.go @@ -15,11 +15,12 @@ package mongo import ( + "context" + "fmt" + "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "context" - "fmt" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" "github.com/cayleygraph/cayley/quad" diff --git a/graph/mongo/iterator.go b/graph/mongo/iterator.go index eb0753739..e0bed5cc1 100644 --- a/graph/mongo/iterator.go +++ b/graph/mongo/iterator.go @@ -15,11 +15,12 @@ package mongo import ( + "context" + "fmt" + "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "context" - "fmt" "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/mongo/quadstore_iterator_optimize.go b/graph/mongo/quadstore_iterator_optimize.go index ae99d94c3..84f130b03 100644 --- a/graph/mongo/quadstore_iterator_optimize.go +++ b/graph/mongo/quadstore_iterator_optimize.go @@ -15,11 +15,11 @@ package mongo import ( + "context" "time" "gopkg.in/mgo.v2/bson" - "context" "github.com/cayleygraph/cayley/clog" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/iterator" diff --git a/graph/nosql/nosql.go b/graph/nosql/nosql.go index a4a3ce781..d79d975ea 100644 --- a/graph/nosql/nosql.go +++ b/graph/nosql/nosql.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "github.com/pborman/uuid" ) diff --git a/graph/nosql/nosqltest/nosqltest_all.go b/graph/nosql/nosqltest/nosqltest_all.go index da0126019..69d803894 100644 --- a/graph/nosql/nosqltest/nosqltest_all.go +++ b/graph/nosql/nosqltest/nosqltest_all.go @@ -2,13 +2,13 @@ package nosqltest import ( "bytes" + "context" "math/rand" "sync" "testing" "github.com/stretchr/testify/require" - "context" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/graph/graphtest" "github.com/cayleygraph/cayley/graph/graphtest/testutil" diff --git a/graph/nosql/value_test.go b/graph/nosql/value_test.go index 95ac62295..0878f69fe 100644 --- a/graph/nosql/value_test.go +++ b/graph/nosql/value_test.go @@ -1,8 +1,9 @@ package nosql import ( - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" ) var filterMatch = []struct { diff --git a/graph/quadstore.go b/graph/quadstore.go index 6b7e4850a..b31a790a5 100644 --- a/graph/quadstore.go +++ b/graph/quadstore.go @@ -22,11 +22,11 @@ package graph // quad backing store we prefer. import ( + "context" "errors" "fmt" "reflect" - "context" "github.com/cayleygraph/cayley/quad" ) diff --git a/graph/sql/postgres/postgres_test.go b/graph/sql/postgres/postgres_test.go index 446cb0152..bed995d8e 100644 --- a/graph/sql/postgres/postgres_test.go +++ b/graph/sql/postgres/postgres_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/cayleygraph/cayley/graph" + "github.com/cayleygraph/cayley/graph/sql/sqltest" "github.com/cayleygraph/cayley/internal/dock" "github.com/lib/pq" - "github.com/cayleygraph/cayley/graph/sql/sqltest" ) func makePostgres(t testing.TB) (string, graph.Options, func()) { diff --git a/graph/values.go b/graph/values.go index eee90e15b..e40b73cf1 100644 --- a/graph/values.go +++ b/graph/values.go @@ -3,6 +3,7 @@ package graph import ( "encoding/hex" "fmt" + "github.com/cayleygraph/cayley/quad" ) diff --git a/internal/gephi/stream_test.go b/internal/gephi/stream_test.go index 3ea34d3e5..0b8e48299 100644 --- a/internal/gephi/stream_test.go +++ b/internal/gephi/stream_test.go @@ -2,9 +2,10 @@ package gephi import ( "bytes" + "testing" + "github.com/cayleygraph/cayley/quad" "github.com/stretchr/testify/require" - "testing" ) func TestStreamEncoder(t *testing.T) { diff --git a/quad/jsonld/jsonld.go b/quad/jsonld/jsonld.go index 423d77c82..7493dd636 100644 --- a/quad/jsonld/jsonld.go +++ b/quad/jsonld/jsonld.go @@ -4,9 +4,10 @@ package jsonld import ( "encoding/json" "fmt" + "io" + "github.com/cayleygraph/cayley/quad" "github.com/linkeddata/gojsonld" - "io" ) // AutoConvertTypedString allows to convert TypedString values to native diff --git a/quad/jsonld/jsonld_test.go b/quad/jsonld/jsonld_test.go index aa78101b8..130547668 100644 --- a/quad/jsonld/jsonld_test.go +++ b/quad/jsonld/jsonld_test.go @@ -3,11 +3,12 @@ package jsonld import ( "bytes" "encoding/json" - "github.com/cayleygraph/cayley/quad" "reflect" "sort" "strings" "testing" + + "github.com/cayleygraph/cayley/quad" ) var testReadCases = []struct { diff --git a/quad/pquads/pio/io_test.go b/quad/pquads/pio/io_test.go index 1ad864dac..9cd1fe82d 100644 --- a/quad/pquads/pio/io_test.go +++ b/quad/pquads/pio/io_test.go @@ -30,12 +30,13 @@ package pio_test import ( "bytes" - io "github.com/cayleygraph/cayley/quad/pquads/pio" - "github.com/gogo/protobuf/test" goio "io" "math/rand" "testing" "time" + + io "github.com/cayleygraph/cayley/quad/pquads/pio" + "github.com/gogo/protobuf/test" ) func iotest(writer io.Writer, reader io.Reader) error { diff --git a/quad/pquads/pio/varint.go b/quad/pquads/pio/varint.go index 6ccfb074a..734488203 100644 --- a/quad/pquads/pio/varint.go +++ b/quad/pquads/pio/varint.go @@ -32,8 +32,9 @@ import ( "bufio" "encoding/binary" "errors" - "github.com/gogo/protobuf/proto" "io" + + "github.com/gogo/protobuf/proto" ) var ( diff --git a/query/sexp/parser_test.go b/query/sexp/parser_test.go index 53ed461f3..29475305b 100644 --- a/query/sexp/parser_test.go +++ b/query/sexp/parser_test.go @@ -15,12 +15,12 @@ package sexp import ( + "context" "testing" "github.com/cayleygraph/cayley/graph" "github.com/cayleygraph/cayley/quad" - "context" _ "github.com/cayleygraph/cayley/graph/memstore" _ "github.com/cayleygraph/cayley/writer" )