Skip to content

refactor: refactor hook#16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenquan merged 1 commit into from
Jan 8, 2023
Merged

refactor: refactor hook #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions hook.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ type (

BeforePrepareContext(ctx context.Context, query string, err error) (context.Context, string, error)
AfterPrepareContext(ctx context.Context, query string, ds driver.Stmt, err error) (context.Context, driver.Stmt, error)

BeforeClose(ctx context.Context, err error) (context.Context, error)
AfterClose(ctx context.Context, err error) (context.Context, error)
}
Expand All@@ -34,12 +35,14 @@ type (
TxHook interface {
BeforeCommit(ctx context.Context, err error) (context.Context, error)
AfterCommit(ctx context.Context, err error) (context.Context, error)

BeforeRollback(ctx context.Context, err error) (context.Context, error)
AfterRollback(ctx context.Context, err error) (context.Context, error)
}
StmtHook interface {
BeforeStmtQueryContext(ctx context.Context, query string, args []driver.NamedValue, err error) (context.Context, []driver.NamedValue, error)
AfterStmtQueryContext(ctx context.Context, query string, args []driver.NamedValue, rows driver.Rows, err error) (context.Context, driver.Rows, error)

BeforeStmtExecContext(ctx context.Context, query string, args []driver.NamedValue, err error) (context.Context, []driver.NamedValue, error)
AfterStmtExecContext(ctx context.Context, query string, args []driver.NamedValue, r driver.Result, err error) (context.Context, driver.Result, error)
}
Expand Down
36 changes: 0 additions & 36 deletions hook_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,10 +74,6 @@ func (m *mockHook) AfterPrepareContext(ctx context.Context, _ string, ds driver.

func (m *mockHook) BeforeCommit(ctx context.Context, err error) (context.Context, error) {
m.Write("BeforeCommit")
txContext := TxContextFromContext(ctx)
if txContext == nil {
panic("txContext is nil")
}

prepareContext := PrepareContextFromContext(ctx)
if prepareContext != nil {
Expand All@@ -89,10 +85,6 @@ func (m *mockHook) BeforeCommit(ctx context.Context, err error) (context.Context

func (m *mockHook) AfterCommit(ctx context.Context, err error) (context.Context, error) {
m.Write("AfterCommit")
txContext := TxContextFromContext(ctx)
if txContext == nil {
panic("txContext is nil")
}

prepareContext := PrepareContextFromContext(ctx)
if prepareContext != nil {
Expand All@@ -104,10 +96,6 @@ func (m *mockHook) AfterCommit(ctx context.Context, err error) (context.Context,

func (m *mockHook) BeforeRollback(ctx context.Context, err error) (context.Context, error) {
m.Write("BeforeRollback")
txContext := TxContextFromContext(ctx)
if txContext == nil {
panic("txContext is nil")
}

prepareContext := PrepareContextFromContext(ctx)
if prepareContext != nil {
Expand All@@ -119,10 +107,6 @@ func (m *mockHook) BeforeRollback(ctx context.Context, err error) (context.Conte

func (m *mockHook) AfterRollback(ctx context.Context, err error) (context.Context, error) {
m.Write("AfterRollback")
txContext := TxContextFromContext(ctx)
if txContext == nil {
panic("txContext is nil")
}

prepareContext := PrepareContextFromContext(ctx)
if prepareContext != nil {
Expand All@@ -139,11 +123,6 @@ func (m *mockHook) BeforeStmtQueryContext(ctx context.Context, _ string, args []
panic("prepareContext is nil")
}

txContext := TxContextFromContext(ctx)
if txContext != nil {
panic("txContext is not nil")
}

return ctx, args, err
}

Expand All@@ -154,11 +133,6 @@ func (m *mockHook) AfterStmtQueryContext(ctx context.Context, _ string, _ []driv
panic("prepareContext is nil")
}

txContext := TxContextFromContext(ctx)
if txContext != nil {
panic("txContext is not nil")
}

return ctx, rows, err
}

Expand All@@ -169,11 +143,6 @@ func (m *mockHook) BeforeStmtExecContext(ctx context.Context, _ string, args []d
panic("prepareContext is nil")
}

txContext := TxContextFromContext(ctx)
if txContext != nil {
panic("txContext is not nil")
}

return ctx, args, err
}

Expand All@@ -184,11 +153,6 @@ func (m *mockHook) AfterStmtExecContext(ctx context.Context, _ string, _ []drive
panic("prepareContext is nil")
}

txContext := TxContextFromContext(ctx)
if txContext != nil {
panic("txContext is not nil")
}

return ctx, r, err
}

Expand Down
16 changes: 2 additions & 14 deletions tx.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,22 +11,10 @@ type (
TxHook
txContext context.Context
}
txContextKey struct{}
)

func TxContextFromContext(ctx context.Context) context.Context {
value := ctx.Value(txContextKey{})
if value != nil {
return value.(context.Context)
}

return nil
}

// -----------------

func (t *tx) Commit() (err error) {
ctx := context.WithValue(context.Background(), txContextKey{}, t.txContext)
ctx := t.txContext
ctx, err = t.BeforeCommit(ctx, nil)
defer func() {
_, err = t.AfterCommit(ctx, err)
Expand All@@ -44,7 +32,7 @@ func (t *tx) Commit() (err error) {
}

func (t *tx) Rollback() (err error) {
ctx := context.WithValue(context.Background(), txContextKey{}, t.txContext)
ctx := t.txContext
ctx, err = t.BeforeRollback(ctx, nil)
defer func() {
_, err = t.AfterRollback(ctx, err)
Expand Down