kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #9451 from erikh/fix-sqlite

Browse source 
graphdb: initialize the database semi-idempotently on every connection, not just new installs.
This commit is contained in:
Jessie Frazelle 2014-12-03 17:17:20 -08:00
commit 8520fd55b6
3 changed files with 45 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/graphdb/conn_sqlite3.go
View file

@ -4,31 +4,15 @@ package graphdb
import ( import (
"database/sql" "database/sql"
"os"
_ "code.google.com/p/gosqlite/sqlite3" // registers sqlite _ "code.google.com/p/gosqlite/sqlite3" // registers sqlite
) )
func NewSqliteConn(root string) (*Database, error) { func NewSqliteConn(root string) (*Database, error) {
initDatabase := false
stat, err := os.Stat(root)
if err != nil {
if os.IsNotExist(err) {
initDatabase = true
} else {
return nil, err
}
}
if stat != nil && stat.Size() == 0 {
initDatabase = true
}
conn, err := sql.Open("sqlite3", root) conn, err := sql.Open("sqlite3", root)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewDatabase(conn, initDatabase) return NewDatabase(conn)
} }

16
pkg/graphdb/graphdb.go
View file

@ -73,13 +73,12 @@ func IsNonUniqueNameError(err error) bool {
} }
// Create a new graph database initialized with a root entity // Create a new graph database initialized with a root entity
func NewDatabase(conn *sql.DB, init bool) (*Database, error) { func NewDatabase(conn *sql.DB) (*Database, error) {
if conn == nil { if conn == nil {
return nil, fmt.Errorf("Database connection cannot be nil") return nil, fmt.Errorf("Database connection cannot be nil")
} }
db := &Database{conn: conn} db := &Database{conn: conn}
if init {
if _, err := conn.Exec(createEntityTable); err != nil { if _, err := conn.Exec(createEntityTable); err != nil {
return nil, err return nil, err
} }
@ -98,11 +97,22 @@ func NewDatabase(conn *sql.DB, init bool) (*Database, error) {
if _, err := conn.Exec("BEGIN"); err != nil { if _, err := conn.Exec("BEGIN"); err != nil {
return nil, err return nil, err
} }
if _, err := conn.Exec("DELETE FROM entity where id = ?", "0"); err != nil {
rollback()
return nil, err
}
if _, err := conn.Exec("INSERT INTO entity (id) VALUES (?);", "0"); err != nil { if _, err := conn.Exec("INSERT INTO entity (id) VALUES (?);", "0"); err != nil {
rollback() rollback()
return nil, err return nil, err
} }
if _, err := conn.Exec("DELETE FROM edge where entity_id=? and name=?", "0", "/"); err != nil {
rollback()
return nil, err
}
if _, err := conn.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", "0", "/"); err != nil { if _, err := conn.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", "0", "/"); err != nil {
rollback() rollback()
return nil, err return nil, err
@ -111,7 +121,7 @@ func NewDatabase(conn *sql.DB, init bool) (*Database, error) {
if _, err := conn.Exec("COMMIT"); err != nil { if _, err := conn.Exec("COMMIT"); err != nil {
return nil, err return nil, err
} }
}
return db, nil return db, nil
} }

2
pkg/graphdb/graphdb_test.go
View file

@ -14,7 +14,7 @@ import (
func newTestDb(t *testing.T) (*Database, string) { func newTestDb(t *testing.T) (*Database, string) {
p := path.Join(os.TempDir(), "sqlite.db") p := path.Join(os.TempDir(), "sqlite.db")
conn, err := sql.Open("sqlite3", p) conn, err := sql.Open("sqlite3", p)
db, err := NewDatabase(conn, true) db, err := NewDatabase(conn)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }