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

graph: make quadstore init functions idempotent

Browse source
This commit is contained in:
Barak Michener 2015-11-25 14:28:15 -05:00
parent 9658689995
commit e849da9402
7 changed files with 63 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
graph/sql/quadstore.go
View file

@ -64,6 +64,7 @@ func connectSQLTables(addr string, _ graph.Options) (*sql.DB, error) {
func createSQLTables(addr string, options graph.Options) error {
conn, err := connectSQLTables(addr, options)
defer conn.Close()
if err != nil {
return err
}
@ -89,6 +90,11 @@ func createSQLTables(addr string, options graph.Options) error {
UNIQUE(subject_hash, predicate_hash, object_hash, label_hash)
);`)
if err != nil {
tx.Rollback()
errd := err.(*pq.Error)
if errd.Code == "42P07" {
return graph.ErrDatabaseExists
}
glog.Errorf("Cannot create quad table: %v", quadTable)
return err
}
@ -105,6 +111,7 @@ func createSQLTables(addr string, options graph.Options) error {
`, factor, factor, factor))
if err != nil {
glog.Errorf("Cannot create indices: %v", index)
tx.Rollback()
return err
}
tx.Commit()
@ -310,7 +317,9 @@ func (qs *QuadStore) Horizon() graph.PrimaryKey {
var horizon int64
err := qs.db.QueryRow("SELECT horizon FROM quads ORDER BY horizon DESC LIMIT 1;").Scan(&horizon)
if err != nil {
glog.Errorf("Couldn't execute horizon: %v", err)
if err != sql.ErrNoRows {
glog.Errorf("Couldn't execute horizon: %v", err)
}
return graph.NewSequentialKey(0)
}
return graph.NewSequentialKey(horizon)