Skip to content

Commit

Permalink
fix: shared sql log panic
Browse files Browse the repository at this point in the history
  • Loading branch information
GaleHuang committed Oct 25, 2024
1 parent c143943 commit 5b1787a
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions conn_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ func (pool ConnPool) ExecContext(ctx context.Context, query string, args ...any)
if r.DoubleWrite {
pool.sharding.Logger.Trace(ctx, curTime, func() (sql string, rowsAffected int64) {
result, _ := pool.ConnPool.ExecContext(ctx, ftQuery, args...)
rowsAffected, _ = result.RowsAffected()
return fmt.Sprintf("[Shard] %s", pool.sharding.Explain(ftQuery, args...)), rowsAffected
if result != nil {
rowsAffected, _ = result.RowsAffected()
}
return fmt.Sprintf("[Shard DoubleWrite] %s", pool.sharding.Explain(ftQuery, args...)), rowsAffected
}, pool.sharding.Error)
}
}
Expand All @@ -51,7 +53,9 @@ func (pool ConnPool) ExecContext(ctx context.Context, query string, args ...any)
var result sql.Result
result, err = pool.ConnPool.ExecContext(ctx, stQuery, args...)
pool.sharding.Logger.Trace(ctx, curTime, func() (sql string, rowsAffected int64) {
rowsAffected, _ = result.RowsAffected()
if result != nil {
rowsAffected, _ = result.RowsAffected()
}
return fmt.Sprintf("[Shard] %s", pool.sharding.Explain(stQuery, args...)), rowsAffected
}, pool.sharding.Error)

Expand Down

0 comments on commit 5b1787a

Please sign in to comment.