database/sql: use the built-in min function

mstmdev · gopherbot · commit 1b5cfc6ca62c · 2023-10-03T19:29:35.000Z
Change-Id: Ib6a0e1e1583e45e3d239455e8b131c81602b2d5d GitHub-Last-Rev: dc82635 GitHub-Pull-Request: #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>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -964,12 +964,7 @@ func (db *DB) shortestIdleTimeLocked() time.Duration {`
`964`	`964`	`if db.maxLifetime <= 0 {`
`965`	`965`	`return db.maxIdleTime`
`966`	`966`	`}`
`967`		`-`
`968`		`- min := db.maxIdleTime`
`969`		`- if min > db.maxLifetime {`
`970`		`- min = db.maxLifetime`
`971`		`- }`
`972`		`- return min`
	`967`	`+ return min(db.maxIdleTime, db.maxLifetime)`
`973`	`968`	`}`
`974`	`969`
`975`	`970`	`// SetMaxIdleConns sets the maximum number of connections in the idle`