Improve query transaction support
This commit is contained in:
Tobie Morgan Hitchcock
parent
c997f89a2a
commit
67c32e5eea
1 changed files with 304 additions and 134 deletions
312
db/db.go
312
db/db.go
|
|
@ -18,7 +18,7 @@ import (
|
|||
"fmt"
|
||||
"time"
|
||||
|
||||
"runtime/debug"
|
||||
"net/http"
|
||||
|
||||
"github.com/abcum/fibre"
|
||||
"github.com/abcum/surreal/cnf"
|
||||
|
|
@ -33,9 +33,9 @@ import (
|
|||
|
||||
type Response struct {
|
||||
Time string `codec:"time,omitempty"`
|
||||
Status interface{} `codec:"status,omitempty"`
|
||||
Detail interface{} `codec:"detail,omitempty"`
|
||||
Result interface{} `codec:"result,omitempty"`
|
||||
Status string `codec:"status,omitempty"`
|
||||
Detail string `codec:"detail,omitempty"`
|
||||
Result []interface{} `codec:"result,omitempty"`
|
||||
}
|
||||
|
||||
var db *kvs.DB
|
||||
|
|
@ -68,24 +68,38 @@ func Execute(ctx *fibre.Context, txt interface{}, vars map[string]interface{}) (
|
|||
return
|
||||
}
|
||||
|
||||
chn := make(chan interface{})
|
||||
quit := make(chan bool, 1)
|
||||
recv := make(chan *Response)
|
||||
|
||||
go execute(ctx, ast, chn)
|
||||
defer close(quit)
|
||||
|
||||
for msg := range chn {
|
||||
switch res := msg.(type) {
|
||||
case error:
|
||||
return nil, res
|
||||
case *Response:
|
||||
out = append(out, res)
|
||||
if _, ok := ctx.Response().ResponseWriter.(http.CloseNotifier); ok {
|
||||
|
||||
exit := ctx.Response().CloseNotify()
|
||||
done := make(chan bool)
|
||||
defer close(done)
|
||||
|
||||
go func() {
|
||||
select {
|
||||
case <-done:
|
||||
case <-exit:
|
||||
quit <- true
|
||||
}
|
||||
}()
|
||||
|
||||
}
|
||||
|
||||
go execute(ctx, ast, quit, recv)
|
||||
|
||||
for res := range recv {
|
||||
out = append(out, res)
|
||||
}
|
||||
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
func status(e error) interface{} {
|
||||
func status(e error) (s string) {
|
||||
switch e.(type) {
|
||||
default:
|
||||
return "OK"
|
||||
|
|
@ -102,89 +116,253 @@ func status(e error) interface{} {
|
|||
}
|
||||
}
|
||||
|
||||
func detail(e error) interface{} {
|
||||
func detail(e error) (s string) {
|
||||
switch err := e.(type) {
|
||||
default:
|
||||
return nil
|
||||
return
|
||||
case error:
|
||||
return err.Error()
|
||||
}
|
||||
}
|
||||
|
||||
func writable(cur kvs.TX, tmp bool) (txn kvs.TX, err error, loc bool) {
|
||||
if cur == nil {
|
||||
cur, err = db.Txn(true)
|
||||
func begin(txn kvs.TX) (tmp kvs.TX, err error) {
|
||||
if txn == nil {
|
||||
txn, err = writable()
|
||||
}
|
||||
return cur, err, tmp
|
||||
return txn, err
|
||||
}
|
||||
|
||||
func readable(cur kvs.TX, tmp bool) (txn kvs.TX, err error, loc bool) {
|
||||
if cur == nil {
|
||||
cur, err = db.Txn(false)
|
||||
}
|
||||
return cur, err, tmp
|
||||
func cancel(txn kvs.TX, buf []*Response, err error, chn chan<- *Response) (kvs.TX, error, []*Response) {
|
||||
|
||||
if txn == nil {
|
||||
return nil, nil, buf
|
||||
}
|
||||
|
||||
func execute(ctx *fibre.Context, ast *sql.Query, chn chan<- interface{}) {
|
||||
txn.Cancel()
|
||||
|
||||
for _, v := range buf {
|
||||
v.Status = "ERR"
|
||||
chn <- v
|
||||
}
|
||||
|
||||
for i := len(buf) - 1; i >= 0; i-- {
|
||||
buf[len(buf)-1] = nil
|
||||
buf = buf[:len(buf)-1]
|
||||
}
|
||||
|
||||
return nil, nil, buf
|
||||
|
||||
}
|
||||
|
||||
func commit(txn kvs.TX, buf []*Response, err error, chn chan<- *Response) (kvs.TX, error, []*Response) {
|
||||
|
||||
if txn == nil {
|
||||
return nil, nil, buf
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
txn.Cancel()
|
||||
} else {
|
||||
txn.Commit()
|
||||
}
|
||||
|
||||
for _, v := range buf {
|
||||
if err != nil {
|
||||
v.Status = "ERR"
|
||||
}
|
||||
chn <- v
|
||||
}
|
||||
|
||||
for i := len(buf) - 1; i >= 0; i-- {
|
||||
buf[len(buf)-1] = nil
|
||||
buf = buf[:len(buf)-1]
|
||||
}
|
||||
|
||||
return nil, nil, buf
|
||||
|
||||
}
|
||||
|
||||
func writable() (txn kvs.TX, err error) {
|
||||
return db.Txn(true)
|
||||
}
|
||||
|
||||
func readable() (txn kvs.TX, err error) {
|
||||
return db.Txn(false)
|
||||
}
|
||||
|
||||
func execute(ctx *fibre.Context, ast *sql.Query, quit <-chan bool, send chan<- *Response) {
|
||||
|
||||
var err error
|
||||
var txn kvs.TX
|
||||
var rsp *Response
|
||||
var buf []*Response
|
||||
var res []interface{}
|
||||
|
||||
// Ensure that the query responses channel is
|
||||
// closed when the full query has been processed
|
||||
// and dealt with.
|
||||
|
||||
defer close(send)
|
||||
|
||||
// If we are making use of a global transaction
|
||||
// which is not committed at the end of the
|
||||
// query set, then cancel the transaction.
|
||||
|
||||
defer func() {
|
||||
if txn != nil {
|
||||
txn.Cancel()
|
||||
}
|
||||
if r := recover(); r != nil {
|
||||
if err, ok := r.(error); ok {
|
||||
fmt.Printf("%s", debug.Stack())
|
||||
chn <- err
|
||||
}
|
||||
}
|
||||
close(chn)
|
||||
}()
|
||||
|
||||
for _, s := range ast.Statements {
|
||||
// If we have paniced during query execution
|
||||
// then ensure that we recover from the error
|
||||
// and print the error to the log.
|
||||
|
||||
var loc bool
|
||||
var err error
|
||||
var res []interface{}
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
if err, ok := r.(error); ok {
|
||||
fmt.Println(err)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
stms := make(chan sql.Statement)
|
||||
|
||||
// Loop over the defined query statements and
|
||||
// pass them to the statement processing
|
||||
// channel for execution.
|
||||
|
||||
go func() {
|
||||
for _, stm := range ast.Statements {
|
||||
stms <- stm
|
||||
}
|
||||
close(stms)
|
||||
}()
|
||||
|
||||
// Listen for any new statements to process and
|
||||
// at the same time listen for the quit signal
|
||||
// notifying us whether the client has gone away.
|
||||
|
||||
for {
|
||||
|
||||
select {
|
||||
|
||||
case <-quit:
|
||||
return
|
||||
|
||||
case stm, open := <-stms:
|
||||
|
||||
// If we have reached the end of the statement
|
||||
// processing channel then return out of this
|
||||
// for loop and exit.
|
||||
|
||||
if !open {
|
||||
return
|
||||
}
|
||||
|
||||
// If we are not inside a global transaction
|
||||
// then reset the error to nil so that the
|
||||
// next statement is not ignored.
|
||||
|
||||
if txn == nil {
|
||||
err = nil
|
||||
}
|
||||
|
||||
// Check to see if the current statement is
|
||||
// a TRANSACTION statement, and if it is
|
||||
// then deal with it and move on to the next.
|
||||
|
||||
switch stm.(type) {
|
||||
case *sql.BeginStatement:
|
||||
txn, err = begin(txn)
|
||||
continue
|
||||
case *sql.CancelStatement:
|
||||
txn, err, buf = cancel(txn, buf, err, send)
|
||||
continue
|
||||
case *sql.CommitStatement:
|
||||
txn, err, buf = commit(txn, buf, err, send)
|
||||
continue
|
||||
}
|
||||
|
||||
// This is not a TRANSACTION statement and
|
||||
// therefore we must time the execution speed
|
||||
// and process the statement response.
|
||||
|
||||
now := time.Now()
|
||||
|
||||
switch s.(type) {
|
||||
// If an error has occured and we are inside
|
||||
// a global transaction, then ignore all
|
||||
// subsequent statements in the transaction.
|
||||
|
||||
case *sql.UseStatement:
|
||||
if err == nil {
|
||||
res, err = operate(txn, stm)
|
||||
} else {
|
||||
res, err = []interface{}{}, fmt.Errorf("Query not executed")
|
||||
}
|
||||
|
||||
rsp = &Response{
|
||||
Time: time.Since(now).String(),
|
||||
Status: status(err),
|
||||
Detail: detail(err),
|
||||
Result: append([]interface{}{}, res...),
|
||||
}
|
||||
|
||||
// If we are not inside a global transaction
|
||||
// then we can output the statement response
|
||||
// immediately to the channel.
|
||||
|
||||
if txn == nil {
|
||||
send <- rsp
|
||||
continue
|
||||
case *sql.BeginStatement:
|
||||
break
|
||||
case *sql.CancelStatement:
|
||||
break
|
||||
case *sql.CommitStatement:
|
||||
break
|
||||
}
|
||||
|
||||
// If we are inside a global transaction we
|
||||
// must buffer the responses for output at
|
||||
// the end of the transaction.
|
||||
|
||||
if txn != nil {
|
||||
buf = append(buf, rsp)
|
||||
continue
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func operate(txn kvs.TX, ast sql.Statement) (res []interface{}, err error) {
|
||||
|
||||
var loc bool
|
||||
|
||||
// If we are not inside a global transaction
|
||||
// then grab a new transaction, ensuring that
|
||||
// it is closed at the end.
|
||||
|
||||
if txn == nil {
|
||||
|
||||
loc = true
|
||||
|
||||
switch ast.(type) {
|
||||
case *sql.InfoStatement:
|
||||
txn, err, loc = readable(txn, txn == nil)
|
||||
txn, err = readable()
|
||||
default:
|
||||
txn, err, loc = writable(txn, txn == nil)
|
||||
txn, err = writable()
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
chn <- err
|
||||
return
|
||||
}
|
||||
|
||||
switch stm := s.(type) {
|
||||
defer txn.Close()
|
||||
|
||||
case *sql.CommitStatement:
|
||||
txn.Commit()
|
||||
txn = nil
|
||||
continue
|
||||
}
|
||||
|
||||
case *sql.CancelStatement:
|
||||
txn.Cancel()
|
||||
txn = nil
|
||||
continue
|
||||
// Execute the defined statement, receiving the
|
||||
// result set, and any errors which occured
|
||||
// while processing the query.
|
||||
|
||||
case *sql.BeginStatement:
|
||||
txn, err, loc = writable(txn, false)
|
||||
continue
|
||||
switch stm := ast.(type) {
|
||||
|
||||
case *sql.InfoStatement:
|
||||
res, err = executeInfoStatement(txn, stm)
|
||||
|
|
@ -229,9 +407,9 @@ func execute(ctx *fibre.Context, ast *sql.Query, chn chan<- interface{}) {
|
|||
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
chn <- err
|
||||
}
|
||||
// If this is a local transaction for only the
|
||||
// current statement, then commit or cancel
|
||||
// depending on the result error.
|
||||
|
||||
if loc {
|
||||
if err != nil {
|
||||
|
|
@ -239,16 +417,8 @@ func execute(ctx *fibre.Context, ast *sql.Query, chn chan<- interface{}) {
|
|||
} else {
|
||||
txn.Commit()
|
||||
}
|
||||
txn = nil
|
||||
}
|
||||
|
||||
chn <- &Response{
|
||||
Time: time.Since(now).String(),
|
||||
Status: status(err),
|
||||
Detail: detail(err),
|
||||
Result: append([]interface{}{}, res...),
|
||||
}
|
||||
|
||||
}
|
||||
return
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue