diff --git a/cmd/cayley/cayley.go b/cmd/cayley/cayley.go index f5f8b6e..77c6cde 100644 --- a/cmd/cayley/cayley.go +++ b/cmd/cayley/cayley.go @@ -29,7 +29,7 @@ import ( "github.com/google/cayley/db" "github.com/google/cayley/graph" "github.com/google/cayley/http" - "github.com/google/cayley/util" + "github.com/google/cayley/internal" // Load all supported backends. _ "github.com/google/cayley/graph/bolt" @@ -185,7 +185,7 @@ func main() { if err != nil { break } - err = util.Load(handle.QuadWriter, cfg, *quadFile, *quadType) + err = internal.Load(handle.QuadWriter, cfg, *quadFile, *quadType) if err != nil { break } @@ -197,7 +197,7 @@ func main() { if err != nil { break } - err = util.Load(handle.QuadWriter, cfg, *quadFile, *quadType) + err = internal.Load(handle.QuadWriter, cfg, *quadFile, *quadType) if err != nil { break } @@ -210,7 +210,7 @@ func main() { break } if !graph.IsPersistent(cfg.DatabaseType) { - err = util.Load(handle.QuadWriter, cfg, "", *quadType) + err = internal.Load(handle.QuadWriter, cfg, "", *quadType) if err != nil { break } @@ -226,7 +226,7 @@ func main() { break } if !graph.IsPersistent(cfg.DatabaseType) { - err = util.Load(handle.QuadWriter, cfg, "", *quadType) + err = internal.Load(handle.QuadWriter, cfg, "", *quadType) if err != nil { break } diff --git a/integration/integration_test.go b/integration/integration_test.go index 1015a5f..c6a39ed 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -28,9 +28,9 @@ import ( "github.com/google/cayley/config" "github.com/google/cayley/db" "github.com/google/cayley/graph" + "github.com/google/cayley/internal" "github.com/google/cayley/quad" "github.com/google/cayley/query/gremlin" - "github.com/google/cayley/util" // Load all supported backends. _ "github.com/google/cayley/graph/bolt" @@ -460,7 +460,7 @@ func prepare(t testing.TB) { } if needsLoad { - err = util.Load(handle.QuadWriter, cfg, "../data/30kmoviedata.nq.gz", "cquad") + err = internal.Load(handle.QuadWriter, cfg, "../data/30kmoviedata.nq.gz", "cquad") if err != nil { t.Fatalf("Failed to load %q: %v", cfg.DatabasePath, err) } @@ -477,7 +477,7 @@ func deletePrepare(t testing.TB) { if err != nil { t.Fatalf("Failed to remove %q: %v", cfg.DatabasePath, err) } - err = util.Load(handle.QuadWriter, cfg, "", "cquad") + err = internal.Load(handle.QuadWriter, cfg, "", "cquad") if err != nil { t.Fatalf("Failed to load %q: %v", cfg.DatabasePath, err) } @@ -486,7 +486,7 @@ func deletePrepare(t testing.TB) { } func removeAll(qw graph.QuadWriter, cfg *config.Config, path, typ string) error { - return util.DecompressAndLoad(qw, cfg, path, typ, remove) + return internal.DecompressAndLoad(qw, cfg, path, typ, remove) } func remove(qw graph.QuadWriter, cfg *config.Config, dec quad.Unmarshaler) error { diff --git a/util/load.go b/internal/load.go similarity index 95% rename from util/load.go rename to internal/load.go index 07f9bf9..57b46da 100644 --- a/util/load.go +++ b/internal/load.go @@ -1,4 +1,4 @@ -package util +package internal import ( "fmt" @@ -11,7 +11,6 @@ import ( "github.com/google/cayley/config" "github.com/google/cayley/db" "github.com/google/cayley/graph" - "github.com/google/cayley/internal" "github.com/google/cayley/quad" "github.com/google/cayley/quad/cquads" "github.com/google/cayley/quad/nquads" @@ -57,7 +56,7 @@ func DecompressAndLoad(qw graph.QuadWriter, cfg *config.Config, path, typ string r = res.Body } - r, err = internal.Decompressor(r) + r, err = Decompressor(r) if err != nil { if err == io.EOF { return nil