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

Add support for adding multiple events to the database atomically

Browse Source
This commit is contained in:
Aaron Lindsay 2013-09-05 21:06:15 -04:00
parent fcf61701cc
commit 65e692b701
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asinkd/database.go
View File

@ -68,7 +68,7 @@ func GetAndInitDB() (*AsinkDB, error) {
return ret, nil return ret, nil
} }
func (adb *AsinkDB) DatabaseAddEvent(u *User, e *asink.Event) (err error) { func (adb *AsinkDB) DatabaseAddEvents(u *User, events []*asink.Event) (err error) {
adb.lock.Lock() adb.lock.Lock()
tx, err := adb.db.Begin() tx, err := adb.db.Begin()
if err != nil { if err != nil {
@ -83,6 +83,7 @@ func (adb *AsinkDB) DatabaseAddEvent(u *User, e *asink.Event) (err error) {
adb.lock.Unlock() adb.lock.Unlock()
}() }()
for _, e := range events {
result, err := tx.Exec("INSERT INTO events (userid, type, path, hash, predecessor, timestamp, permissions) VALUES (?,?,?,?,?,?,?);", u.Id, e.Type, e.Path, e.Hash, e.Predecessor, e.Timestamp, e.Permissions) result, err := tx.Exec("INSERT INTO events (userid, type, path, hash, predecessor, timestamp, permissions) VALUES (?,?,?,?,?,?,?);", u.Id, e.Type, e.Path, e.Hash, e.Predecessor, e.Timestamp, e.Permissions)
if err != nil { if err != nil {
return err return err
@ -91,13 +92,14 @@ func (adb *AsinkDB) DatabaseAddEvent(u *User, e *asink.Event) (err error) {
if err != nil { if err != nil {
return err return err
} }
e.Id = id
}
err = tx.Commit() err = tx.Commit()
if err != nil { if err != nil {
return err return err
} }
e.Id = id
e.InDB = true
return nil return nil
} }

9
asinkd/server.go
View File

@ -162,18 +162,13 @@ func putEvents(w http.ResponseWriter, r *http.Request, user *User) {
error_message = err.Error() error_message = err.Error()
return return
} }
for _, event := range events.Events { err = adb.DatabaseAddEvents(user, events.Events)
err = adb.DatabaseAddEvent(user, event)
if err != nil { if err != nil {
//TODO should probably do this in a way that the caller knows how many of these have failed and doesn't re-try sending ones that succeeded
//i.e. add this to the return codes or something
//OR put all the DatabaseAddEvent's inside a SQL transaction, and rollback on any failure
error_message = err.Error() error_message = err.Error()
return return
} }
}
broadcastToPollers(user.Id, events.Events[0]) //TODO support more than one user broadcastToPollers(user.Id, events.Events[0])
} }
func eventHandler(w http.ResponseWriter, r *http.Request) { func eventHandler(w http.ResponseWriter, r *http.Request) {