From 90fee59287394fb43823481e1d1bff0d5d7fb047 Mon Sep 17 00:00:00 2001 From: dchenk Date: Wed, 11 Apr 2018 19:20:10 -0700 Subject: [PATCH] database/sql: remove a couple redundancies This commit includes efficiency improvements in two places in the database/sql package where an "if err != nil" was redundant and the error can be returned as-is (most of the code in the standard library and even in the file I changed does it my suggested way). Change-Id: Ib9dac69ed01ee846e570a776164cb87c2caee6ca Reviewed-on: https://go-review.googlesource.com/106555 Reviewed-by: Daniel Theophanes Run-TryBot: Daniel Theophanes TryBot-Result: Gobot Gobot --- src/database/sql/sql.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index beccf7fec1..d192dd95b8 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -2455,17 +2455,11 @@ func (s *Stmt) Query(args ...interface{}) (*Rows, error) { func rowsiFromStatement(ctx context.Context, ci driver.Conn, ds *driverStmt, args ...interface{}) (driver.Rows, error) { ds.Lock() defer ds.Unlock() - dargs, err := driverArgsConnLocked(ci, ds, args) if err != nil { return nil, err } - - rowsi, err := ctxDriverStmtQuery(ctx, ds.si, dargs) - if err != nil { - return nil, err - } - return rowsi, nil + return ctxDriverStmtQuery(ctx, ds.si, dargs) } // QueryRowContext executes a prepared query statement with the given arguments. @@ -2986,11 +2980,7 @@ func (r *Row) Scan(dest ...interface{}) error { return err } // Make sure the query can be processed to completion with no errors. - if err := r.rows.Close(); err != nil { - return err - } - - return nil + return r.rows.Close() } // A Result summarizes an executed SQL command. -- 2.48.1