barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't create a util package - move the functionality to 'internal'

Browse source
This commit is contained in:
Andrew Dunham 2015-04-29 13:26:31 -07:00
parent c1771fa72b
commit 357478d1d1
4 changed files with 91 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/cayley/cayley.go
View file

@ -29,7 +29,7 @@ import (
"github.com/google/cayley/db" "github.com/google/cayley/db"
"github.com/google/cayley/graph" "github.com/google/cayley/graph"
"github.com/google/cayley/http" "github.com/google/cayley/http"
"github.com/google/cayley/util" "github.com/google/cayley/internal"
// Load all supported backends. // Load all supported backends.
_ "github.com/google/cayley/graph/bolt" _ "github.com/google/cayley/graph/bolt"
@ -185,7 +185,7 @@ func main() {
if err != nil { if err != nil {
break break
} }
err = util.Load(handle.QuadWriter, cfg, *quadFile, *quadType) err = internal.Load(handle.QuadWriter, cfg, *quadFile, *quadType)
if err != nil { if err != nil {
break break
} }
@ -197,7 +197,7 @@ func main() {
if err != nil { if err != nil {
break break
} }
err = util.Load(handle.QuadWriter, cfg, *quadFile, *quadType) err = internal.Load(handle.QuadWriter, cfg, *quadFile, *quadType)
if err != nil { if err != nil {
break break
} }
@ -210,7 +210,7 @@ func main() {
break break
} }
if !graph.IsPersistent(cfg.DatabaseType) { if !graph.IsPersistent(cfg.DatabaseType) {
err = util.Load(handle.QuadWriter, cfg, "", *quadType) err = internal.Load(handle.QuadWriter, cfg, "", *quadType)
if err != nil { if err != nil {
break break
} }
@ -226,7 +226,7 @@ func main() {
break break
} }
if !graph.IsPersistent(cfg.DatabaseType) { if !graph.IsPersistent(cfg.DatabaseType) {
err = util.Load(handle.QuadWriter, cfg, "", *quadType) err = internal.Load(handle.QuadWriter, cfg, "", *quadType)
if err != nil { if err != nil {
break break
} }

8
integration/integration_test.go
View file

@ -28,9 +28,9 @@ import (
"github.com/google/cayley/config" "github.com/google/cayley/config"
"github.com/google/cayley/db" "github.com/google/cayley/db"
"github.com/google/cayley/graph" "github.com/google/cayley/graph"
"github.com/google/cayley/internal"
"github.com/google/cayley/quad" "github.com/google/cayley/quad"
"github.com/google/cayley/query/gremlin" "github.com/google/cayley/query/gremlin"
"github.com/google/cayley/util"
// Load all supported backends. // Load all supported backends.
_ "github.com/google/cayley/graph/bolt" _ "github.com/google/cayley/graph/bolt"
@ -460,7 +460,7 @@ func prepare(t testing.TB) {
} }
if needsLoad { 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 { if err != nil {
t.Fatalf("Failed to load %q: %v", cfg.DatabasePath, err) t.Fatalf("Failed to load %q: %v", cfg.DatabasePath, err)
} }
@ -477,7 +477,7 @@ func deletePrepare(t testing.TB) {
if err != nil { if err != nil {
t.Fatalf("Failed to remove %q: %v", cfg.DatabasePath, err) 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 { if err != nil {
t.Fatalf("Failed to load %q: %v", cfg.DatabasePath, err) 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 { 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 { func remove(qw graph.QuadWriter, cfg *config.Config, dec quad.Unmarshaler) error {

5
util/load.go → internal/load.go
View file

@ -1,4 +1,4 @@
package util package internal
import ( import (
"fmt" "fmt"
@ -11,7 +11,6 @@ import (
"github.com/google/cayley/config" "github.com/google/cayley/config"
"github.com/google/cayley/db" "github.com/google/cayley/db"
"github.com/google/cayley/graph" "github.com/google/cayley/graph"
"github.com/google/cayley/internal"
"github.com/google/cayley/quad" "github.com/google/cayley/quad"
"github.com/google/cayley/quad/cquads" "github.com/google/cayley/quad/cquads"
"github.com/google/cayley/quad/nquads" "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 = res.Body
} }
r, err = internal.Decompressor(r) r, err = Decompressor(r)
if err != nil { if err != nil {
if err == io.EOF { if err == io.EOF {
return nil return nil