diff options
| author | mstmdev <mstmdev@gmail.com> | 2023-09-25 08:43:18 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-10-03 19:29:35 +0000 |
| commit | 1b5cfc6ca62c421f12b0ef70daeb1efd03327636 (patch) | |
| tree | cef007f659cbb62c6d6d5f9aa7c2719f1e250fcc /src/database/sql/sql.go | |
| parent | 90276c268bf003e94917db8df513736f9b01479b (diff) | |
| download | go-1b5cfc6ca62c421f12b0ef70daeb1efd03327636.tar.xz | |
database/sql: use the built-in min function
Change-Id: Ib6a0e1e1583e45e3d239455e8b131c81602b2d5d
GitHub-Last-Rev: dc82635562a7fb4488f374d7a9ed26b29310e918
GitHub-Pull-Request: golang/go#63200
Reviewed-on: https://go-review.googlesource.com/c/go/+/530875
Reviewed-by: qiulaidongfeng <2645477756@qq.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Diffstat (limited to 'src/database/sql/sql.go')
| -rw-r--r-- | src/database/sql/sql.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 7592bad1d3..013c03d97a 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -964,12 +964,7 @@ func (db *DB) shortestIdleTimeLocked() time.Duration { if db.maxLifetime <= 0 { return db.maxIdleTime } - - min := db.maxIdleTime - if min > db.maxLifetime { - min = db.maxLifetime - } - return min + return min(db.maxIdleTime, db.maxLifetime) } // SetMaxIdleConns sets the maximum number of connections in the idle |