kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

rename gograph in graphdb

This commit is contained in:
Guillaume J. Charmes 2013-11-15 15:55:45 -08:00
parent 035c144242
commit cbd1281ec9
No known key found for this signature in database
GPG Key ID: B33E4642CB6E3FF3
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
gograph/MAINTAINERS → graphdb/MAINTAINERS
View File

2
gograph/gograph.go → graphdb/graphdb.go
View File

@ -1,4 +1,4 @@
package gograph package graphdb
import ( import (
"database/sql" "database/sql"

2
gograph/gograph_test.go → graphdb/graphdb_test.go
View File

@ -1,4 +1,4 @@
package gograph package graphdb
import ( import (
_ "code.google.com/p/gosqlite/sqlite3" _ "code.google.com/p/gosqlite/sqlite3"

2
gograph/sort.go → graphdb/sort.go
View File

@ -1,4 +1,4 @@
package gograph package graphdb
import "sort" import "sort"

2
gograph/sort_test.go → graphdb/sort_test.go
View File

@ -1,4 +1,4 @@
package gograph package graphdb
import ( import (
"testing" "testing"

2
gograph/utils.go → graphdb/utils.go
View File

@ -1,4 +1,4 @@
package gograph package graphdb
import ( import (
"path" "path"

14
runtime.go
View File

@ -6,7 +6,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/gograph" "github.com/dotcloud/docker/graphdb"
"github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/graphdriver"
_ "github.com/dotcloud/docker/graphdriver/aufs" _ "github.com/dotcloud/docker/graphdriver/aufs"
_ "github.com/dotcloud/docker/graphdriver/devmapper" _ "github.com/dotcloud/docker/graphdriver/devmapper"
@ -43,7 +43,7 @@ type Runtime struct {
volumes *Graph volumes *Graph
srv *Server srv *Server
config *DaemonConfig config *DaemonConfig
containerGraph *gograph.Database containerGraph *graphdb.Database
driver graphdriver.Driver driver graphdriver.Driver
} }
@ -581,7 +581,7 @@ func (runtime *Runtime) Children(name string) (map[string]*Container, error) {
} }
children := make(map[string]*Container) children := make(map[string]*Container)
err = runtime.containerGraph.Walk(name, func(p string, e *gograph.Entity) error { err = runtime.containerGraph.Walk(name, func(p string, e *graphdb.Entity) error {
c := runtime.Get(e.ID()) c := runtime.Get(e.ID())
if c == nil { if c == nil {
return fmt.Errorf("Could not get container for name %s and id %s", e.ID(), p) return fmt.Errorf("Could not get container for name %s and id %s", e.ID(), p)
@ -659,20 +659,20 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) {
return nil, err return nil, err
} }
gographPath := path.Join(config.Root, "linkgraph.db") graphdbPath := path.Join(config.Root, "linkgraph.db")
initDatabase := false initDatabase := false
if _, err := os.Stat(gographPath); err != nil { if _, err := os.Stat(graphdbPath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
initDatabase = true initDatabase = true
} else { } else {
return nil, err return nil, err
} }
} }
conn, err := sql.Open("sqlite3", gographPath) conn, err := sql.Open("sqlite3", graphdbPath)
if err != nil { if err != nil {
return nil, err return nil, err
} }
graph, err := gograph.NewDatabase(conn, initDatabase) graph, err := graphdb.NewDatabase(conn, initDatabase)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
server.go
View File

@ -8,7 +8,7 @@ import (
"github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/auth" "github.com/dotcloud/docker/auth"
"github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/gograph" "github.com/dotcloud/docker/graphdb"
"github.com/dotcloud/docker/registry" "github.com/dotcloud/docker/registry"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io" "io"
@ -502,7 +502,7 @@ func createAPIContainer(container *Container, size bool, runtime *Runtime) APICo
ID: container.ID, ID: container.ID,
} }
names := []string{} names := []string{}
runtime.containerGraph.Walk("/", func(p string, e *gograph.Entity) error { runtime.containerGraph.Walk("/", func(p string, e *graphdb.Entity) error {
if e.ID() == container.ID { if e.ID() == container.ID {
names = append(names, p) names = append(names, p)
} }