diff options
| author | Jonathan Amsterdam <jba@google.com> | 2020-02-28 14:26:17 -0500 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2020-04-06 15:50:52 -0400 |
| commit | 0f8c7c9210275e69c78ad11911fd4368d5d5fdd4 (patch) | |
| tree | e888fcf65d1f1a857b2f4a0fb89607516afc1971 /internal/database/database.go | |
| parent | 85574d545074b8d4e3db7890f7c00d073e0f2254 (diff) | |
| download | go-x-pkgsite-0f8c7c9210275e69c78ad11911fd4368d5d5fdd4.tar.xz | |
discovery: fix issues highlighted by mvdan.cc/unparam
I ran unparam (`go get mvdan.cc/unparam`) on our codebase, and
it found a few issues that I fixed.
- etl/main.go:getRedis: Use the context to set the DialTimout option when dialing redis.
- config.go:readOverrideFile: Use the bucketName argument, not a global constant.
- various: Remove unused parameters and return values.
Change-Id: I98a1e5d728d41033b5f632ccc6c22442d91c2b6d
Reviewed-on: https://team-review.git.corp.google.com/c/golang/discovery/+/678587
Reviewed-by: Julie Qiu <julieqiu@google.com>
Diffstat (limited to 'internal/database/database.go')
| -rw-r--r-- | internal/database/database.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/internal/database/database.go b/internal/database/database.go index d1780e1c..6f6a2be2 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -159,11 +159,7 @@ func BulkInsert(ctx context.Context, tx *sql.Tx, table string, columns []string, rightBound = len(values) } valueSlice := values[leftBound:rightBound] - query, err := buildInsertQuery(table, columns, valueSlice, conflictAction) - if err != nil { - return fmt.Errorf("buildInsertQuery(%q, %v, values[%d:%d], %q): %v", table, columns, leftBound, rightBound, conflictAction, err) - } - + query := buildInsertQuery(table, columns, valueSlice, conflictAction) if _, err := ExecTx(ctx, tx, query, valueSlice...); err != nil { return fmt.Errorf("tx.ExecContext(ctx, [bulk insert query], values[%d:%d]): %v", leftBound, rightBound, err) } @@ -178,7 +174,7 @@ func BulkInsert(ctx context.Context, tx *sql.Tx, table string, columns []string, // // When calling buildInsertQuery, it must be true that // len(values) % len(columns) == 0 -func buildInsertQuery(table string, columns []string, values []interface{}, conflictAction string) (string, error) { +func buildInsertQuery(table string, columns []string, values []interface{}, conflictAction string) string { var b strings.Builder fmt.Fprintf(&b, "INSERT INTO %s", table) fmt.Fprintf(&b, "(%s) VALUES", strings.Join(columns, ", ")) @@ -207,7 +203,7 @@ func buildInsertQuery(table string, columns []string, values []interface{}, conf b.WriteString(" " + conflictAction) } - return b.String(), nil + return b.String() } // QueryLoggingDisabled stops logging of queries when true. |