aclindsa/go-asink
1
0
Fork 0
Code Releases Activity

Fixup client/database so it doesn't leak open cursors

Browse Source
This commit is contained in:
Aaron Lindsay 2013-08-13 21:44:15 -04:00
parent 9c8730f60a
commit cfc45fec71
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/database.go
View File

@ -21,7 +21,7 @@ func GetAndInitDB(config *conf.ConfigFile) (*AsinkDB, error) {
return nil, errors.New("Error: database location not specified in config file.") return nil, errors.New("Error: database location not specified in config file.")
} }
db, err := sql.Open("sqlite3", dbLocation) db, err := sql.Open("sqlite3", "file:"+dbLocation+"?cache=shared&mode=rwc")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -122,23 +122,22 @@ func (adb *AsinkDB) DatabaseUpdateEvent(e *asink.Event) (err error) {
} }
//returns nil if no such event exists //returns nil if no such event exists
func (adb *AsinkDB) DatabaseLatestRemoteEvent() (event *asink.Event, err error) { func (adb *AsinkDB) DatabaseLatestEventForPath(path string) (event *asink.Event, err error) {
adb.lock.Lock() adb.lock.Lock()
//make sure the database gets unlocked //make sure the database gets unlocked
defer adb.lock.Unlock() defer adb.lock.Unlock()
row := adb.db.QueryRow("SELECT id, localid, type, status, path, hash, predecessor, timestamp, permissions FROM events WHERE path == ? ORDER BY timestamp DESC LIMIT 1;", path) row := adb.db.QueryRow("SELECT id, localid, type, status, path, hash, predecessor, timestamp, permissions FROM events WHERE path == ? ORDER BY timestamp DESC LIMIT 1;", path)
if err != nil {
return nil, err
}
for rows.Next() {
event = new(asink.Event) event = new(asink.Event)
err = rows.Scan(&event.Id, &event.LocalId, &event.Type, &event.Status, &event.Path, &event.Hash, &event.Predecessor, &event.Timestamp, &event.Permissions) err = row.Scan(&event.Id, &event.LocalId, &event.Type, &event.Status, &event.Path, &event.Hash, &event.Predecessor, &event.Timestamp, &event.Permissions)
if err != nil {
switch {
case err == sql.ErrNoRows:
return nil, nil
case err != nil:
return nil, err return nil, err
} default:
return event, nil return event, nil
} }
return nil, nil
} }