domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Adjust transaction handling via db.Context (#20031)

Browse source
This commit is contained in:
Lunny Xiao 2022-06-20 20:38:58 +08:00 • committed by GitHub
parent cb50375e2b
commit 0649c54275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

45
models/db/context.go
View file

@ -23,23 +23,30 @@ type contextKey struct {
name string
}
// EnginedContextKey is a context key. It is used with context.Value() to get the current Engined for the context
var EnginedContextKey = &contextKey{"engined"}
// enginedContextKey is a context key. It is used with context.Value() to get the current Engined for the context
var enginedContextKey = &contextKey{"engined"}
var _ Engined = &Context{}
// Context represents a db context
type Context struct {
context.Context
e Engine
e Engine
transaction bool
}
// WithEngine returns a Context from a context.Context and Engine
func WithEngine(ctx context.Context, e Engine) *Context {
func newContext(ctx context.Context, e Engine, transaction bool) *Context {
return &Context{
Context: ctx,
e: e.Context(ctx),
Context: ctx,
e: e,
transaction: transaction,
}
}
// InTransaction if context is in a transaction
func (ctx *Context) InTransaction() bool {
return ctx.transaction
}
// Engine returns db engine
func (ctx *Context) Engine() Engine {
return ctx.e
@ -47,7 +54,7 @@ func (ctx *Context) Engine() Engine {
// Value shadows Value for context.Context but allows us to get ourselves and an Engined object
func (ctx *Context) Value(key interface{}) interface{} {
if key == EnginedContextKey {
if key == enginedContextKey {
return ctx
}
return ctx.Context.Value(key)
@ -55,7 +62,7 @@ func (ctx *Context) Value(key interface{}) interface{} {
// WithContext returns this engine tied to this context
func (ctx *Context) WithContext(other context.Context) *Context {
return WithEngine(other, ctx.e)
return newContext(ctx, ctx.e.Context(other), ctx.transaction)
}
// Engined structs provide an Engine
@ -68,7 +75,7 @@ func GetEngine(ctx context.Context) Engine {
if engined, ok := ctx.(Engined); ok {
return engined.Engine()
}
enginedInterface := ctx.Value(EnginedContextKey)
enginedInterface := ctx.Value(enginedContextKey)
if enginedInterface != nil {
return enginedInterface.(Engined).Engine()
}
@ -89,18 +96,7 @@ func TxContext() (*Context, Committer, error) {
return nil, nil, err
}
return &Context{
Context: DefaultContext,
e: sess,
}, sess, nil
}
// WithContext represents executing database operations
func WithContext(f func(ctx *Context) error) error {
return f(&Context{
Context: DefaultContext,
e: x,
})
return newContext(DefaultContext, sess, true), sess, nil
}
// WithTx represents executing database operations on a transaction
@ -118,10 +114,7 @@ func WithTx(f func(ctx context.Context) error, stdCtx ...context.Context) error
return err
}
if err := f(&Context{
Context: parentCtx,
e: sess,
}); err != nil {
if err := f(newContext(parentCtx, sess, true)); err != nil {
return err
}