Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit 0308f92

Browse files
author
Juanjo Alvarez
committed
Fix some shadowed variables found by go vet
Signed-off-by: Juanjo Alvarez <[email protected]>
1 parent 634630f commit 0308f92

27 files changed

+146
-147
lines changed

‎auth/common_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,21 @@ func testAuthentication(
101101

102102
for _, c := range tests {
103103
t.Run(fmt.Sprintf("%s-%s", c.user, c.password), func(t *testing.T) {
104-
req := require.New(t)
104+
r := require.New(t)
105105

106-
db, err := dsql.Open("mysql", connString(c.user, c.password))
107-
req.NoError(err)
108-
_, err = db.Query("SELECT 1")
106+
db, e := dsql.Open("mysql", connString(c.user, c.password))
107+
r.NoError(e)
108+
_, e = db.Query("SELECT 1")
109109

110110
if c.success {
111-
req.NoError(err)
111+
r.NoError(e)
112112
} else {
113-
req.Error(err)
114-
req.Contains(err.Error(), "Access denied")
113+
r.Error(e)
114+
r.Contains(e.Error(), "Access denied")
115115
}
116116

117-
err = db.Close()
118-
req.NoError(err)
117+
e = db.Close()
118+
r.NoError(e)
119119

120120
if extra != nil {
121121
extra(t, c)
@@ -196,20 +196,20 @@ func testAudit(
196196

197197
for _, c := range tests {
198198
t.Run(c.user, func(t *testing.T) {
199-
req := require.New(t)
199+
r := require.New(t)
200200

201-
db, err := dsql.Open("mysql", connString(c.user, ""))
202-
req.NoError(err)
203-
_, err = db.Query(c.query)
201+
db, e := dsql.Open("mysql", connString(c.user, ""))
202+
r.NoError(e)
203+
_, e = db.Query(c.query)
204204

205205
if c.success {
206-
req.NoError(err)
206+
r.NoError(e)
207207
} else {
208-
req.Error(err)
208+
r.Error(e)
209209
}
210210

211-
err = db.Close()
212-
req.NoError(err)
211+
e = db.Close()
212+
r.NoError(e)
213213

214214
if extra != nil {
215215
extra(t, c)

‎mem/table.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ func (t *Table) HandledFilters(filters []sql.Expression) []sql.Expression {
312312
var handled []sql.Expression
313313
for _, f := range filters {
314314
var hasOtherFields bool
315-
f.TransformUp(func(e sql.Expression) (sql.Expression, error) {
315+
_, _ = f.TransformUp(func(e sql.Expression) (sql.Expression, error) {
316316
if e, ok := e.(*expression.GetField); ok {
317317
if e.Table() != t.name || !t.schema.Contains(e.Name(), t.name) {
318318
hasOtherFields = true

‎mem/table_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -151,24 +151,24 @@ var tests = []struct {
151151
},
152152
indexColumns: []string{"col1", "col3"},
153153
expectedKeyValues: []*indexKeyValue{
154-
&indexKeyValue{sql.NewRow("a", int64(100)), &indexValue{Key: "0", Pos: 0}},
155-
&indexKeyValue{sql.NewRow("c", int64(100)), &indexValue{Key: "0", Pos: 1}},
156-
&indexKeyValue{sql.NewRow("e", int64(200)), &indexValue{Key: "0", Pos: 2}},
157-
&indexKeyValue{sql.NewRow("b", int64(100)), &indexValue{Key: "1", Pos: 0}},
158-
&indexKeyValue{sql.NewRow("d", int64(200)), &indexValue{Key: "1", Pos: 1}},
159-
&indexKeyValue{sql.NewRow("f", int64(200)), &indexValue{Key: "1", Pos: 2}},
154+
{sql.NewRow("a", int64(100)), &indexValue{Key: "0", Pos: 0}},
155+
{sql.NewRow("c", int64(100)), &indexValue{Key: "0", Pos: 1}},
156+
{sql.NewRow("e", int64(200)), &indexValue{Key: "0", Pos: 2}},
157+
{sql.NewRow("b", int64(100)), &indexValue{Key: "1", Pos: 0}},
158+
{sql.NewRow("d", int64(200)), &indexValue{Key: "1", Pos: 1}},
159+
{sql.NewRow("f", int64(200)), &indexValue{Key: "1", Pos: 2}},
160160
},
161161
lookup: &dummyLookup{
162162
values: map[string][]*indexValue{
163-
"0": []*indexValue{
164-
&indexValue{Key: "0", Pos: 0},
165-
&indexValue{Key: "0", Pos: 1},
166-
&indexValue{Key: "0", Pos: 2},
163+
"0": {
164+
{Key: "0", Pos: 0},
165+
{Key: "0", Pos: 1},
166+
{Key: "0", Pos: 2},
167167
},
168-
"1": []*indexValue{
169-
&indexValue{Key: "1", Pos: 0},
170-
&indexValue{Key: "1", Pos: 1},
171-
&indexValue{Key: "1", Pos: 2},
168+
"1": {
169+
{Key: "1", Pos: 0},
170+
{Key: "1", Pos: 1},
171+
{Key: "1", Pos: 2},
172172
},
173173
},
174174
},
@@ -194,14 +194,14 @@ func TestTable(t *testing.T) {
194194
require.NoError(err)
195195

196196
for i := 0; i < test.numPartitions; i++ {
197-
p, err := pIter.Next()
198-
require.NoError(err)
197+
p, e := pIter.Next()
198+
require.NoError(e)
199199

200-
iter, err := table.PartitionRows(sql.NewEmptyContext(), p)
201-
require.NoError(err)
200+
iter, e := table.PartitionRows(sql.NewEmptyContext(), p)
201+
require.NoError(e)
202202

203-
rows, err := sql.RowIterToRows(iter)
204-
require.NoError(err)
203+
rows, e := sql.RowIterToRows(iter)
204+
require.NoError(e)
205205

206206
expected := table.partitions[string(p.Key())]
207207
require.Len(rows, len(expected))

‎sql/analyzer/optimization_rules.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func optimizeDistinct(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, e
3333
defer span.Finish()
3434

3535
a.Log("optimize distinct, node of type: %T", node)
36-
if node, ok := node.(*plan.Distinct); ok {
36+
if n, ok := node.(*plan.Distinct); ok {
3737
var isSorted bool
3838
_, _ = node.TransformUp(func(node sql.Node) (sql.Node, error) {
3939
a.Log("checking for optimization in node of type: %T", node)
@@ -45,7 +45,7 @@ func optimizeDistinct(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, e
4545

4646
if isSorted {
4747
a.Log("distinct optimized for ordered output")
48-
return plan.NewOrderedDistinct(node.Child), nil
48+
return plan.NewOrderedDistinct(n.Child), nil
4949
}
5050
}
5151

‎sql/analyzer/prune_columns.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ func pruneColumns(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
1717
}
1818

1919
if describe, ok := n.(*plan.DescribeQuery); ok {
20-
n, err := pruneColumns(ctx, a, describe.Child)
20+
pruned, err := pruneColumns(ctx, a, describe.Child)
2121
if err != nil {
2222
return nil, err
2323
}
2424

25-
return plan.NewDescribeQuery(describe.Format, n), nil
25+
return plan.NewDescribeQuery(describe.Format, pruned), nil
2626
}
2727

2828
columns := make(usedColumns)

‎sql/analyzer/pushdown.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ func pushdown(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
3939
// First step is to find all col exprs and group them by the table they mention.
4040
// Even if they appear multiple times, only the first one will be used.
4141
plan.InspectExpressions(n, func(e sql.Expression) bool {
42-
if e, ok := e.(*expression.GetField); ok {
43-
tf := tableField{e.Table(), e.Name()}
42+
if gf, ok := e.(*expression.GetField); ok {
43+
tf := tableField{gf.Table(), gf.Name()}
4444
if _, ok := tableFields[tf]; !ok {
45-
a.Log("found used column %s.%s", e.Table(), e.Name())
45+
a.Log("found used column %s.%s", gf.Table(), gf.Name())
4646
tableFields[tf] = struct{}{}
47-
fieldsByTable[e.Table()] = append(fieldsByTable[e.Table()], e.Name())
48-
exprsByTable[e.Table()] = append(exprsByTable[e.Table()], e)
47+
fieldsByTable[gf.Table()] = append(fieldsByTable[gf.Table()], gf.Name())
48+
exprsByTable[gf.Table()] = append(exprsByTable[gf.Table()], gf)
4949
}
5050
}
5151
return true
@@ -59,14 +59,14 @@ func pushdown(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
5959

6060
// then find all filters, also by table. Note that filters that mention
6161
// more than one table will not be passed to neither.
62-
filters := make(filters)
62+
filt := make(filters)
6363
plan.Inspect(n, func(node sql.Node) bool {
6464
a.Log("inspecting node of type: %T", node)
6565
switch node := node.(type) {
6666
case *plan.Filter:
6767
fs := exprToTableFilters(node.Expression)
6868
a.Log("found filters for %d tables %s", len(fs), node.Expression)
69-
filters.merge(fs)
69+
filt.merge(fs)
7070
}
7171
return true
7272
})
@@ -118,7 +118,7 @@ func pushdown(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
118118
var table = node.Table
119119

120120
if ft, ok := table.(sql.FilteredTable); ok {
121-
tableFilters := filters[node.Name()]
121+
tableFilters := filt[node.Name()]
122122
handled := ft.HandledFilters(tableFilters)
123123
handledFilters = append(handledFilters, handled...)
124124
schema := node.Schema()

‎sql/catalog.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ func (c *Catalog) UnlockTables(ctx *Context, id uint32) error {
178178
table, err := c.dbs.Table(db, t)
179179
if err == nil {
180180
if lockable, ok := table.(Lockable); ok {
181-
if err := lockable.Unlock(ctx, id); err != nil {
182-
errors = append(errors, err.Error())
181+
if e := lockable.Unlock(ctx, id); e != nil {
182+
errors = append(errors, e.Error())
183183
}
184184
}
185185
} else {

‎sql/expression/comparison.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,32 @@ func (c *comparison) evalLeftAndRight(ctx *sql.Context, row sql.Row) (interface{
7171
func (c *comparison) castLeftAndRight(left, right interface{}) (interface{}, interface{}, error) {
7272
if sql.IsNumber(c.Left().Type()) || sql.IsNumber(c.Right().Type()) {
7373
if sql.IsDecimal(c.Left().Type()) || sql.IsDecimal(c.Right().Type()) {
74-
left, right, err := convertLeftAndRight(left, right, ConvertToDecimal)
74+
l, r, err := convertLeftAndRight(left, right, ConvertToDecimal)
7575
if err != nil {
7676
return nil, nil, err
7777
}
7878

7979
c.compareType = sql.Float64
80-
return left, right, nil
80+
return l, r, nil
8181
}
8282

8383
if sql.IsSigned(c.Left().Type()) || sql.IsSigned(c.Right().Type()) {
84-
left, right, err := convertLeftAndRight(left, right, ConvertToSigned)
84+
l, r, err := convertLeftAndRight(left, right, ConvertToSigned)
8585
if err != nil {
8686
return nil, nil, err
8787
}
8888

8989
c.compareType = sql.Int64
90-
return left, right, nil
90+
return l, r, nil
9191
}
9292

93-
left, right, err := convertLeftAndRight(left, right, ConvertToUnsigned)
93+
l, r, err := convertLeftAndRight(left, right, ConvertToUnsigned)
9494
if err != nil {
9595
return nil, nil, err
9696
}
9797

9898
c.compareType = sql.Uint64
99-
return left, right, nil
99+
return l, r, nil
100100
}
101101

102102
left, right, err := convertLeftAndRight(left, right, ConvertToChar)

‎sql/expression/function/ceil_round_floor.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ func (r *Round) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
189189
dVal := float64(0)
190190

191191
if r.Right != nil {
192-
dTemp, err := r.Right.Eval(ctx, row)
193-
if err != nil {
194-
return nil, err
192+
dTemp, e := r.Right.Eval(ctx, row)
193+
if e != nil {
194+
return nil, e
195195
}
196196

197197
if dTemp != nil {
@@ -207,8 +207,8 @@ func (r *Round) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
207207
case int:
208208
dVal = float64(dNum)
209209
default:
210-
dTemp, err = sql.Float64.Convert(dTemp)
211-
if err == nil {
210+
dTemp, e = sql.Float64.Convert(dTemp)
211+
if e == nil {
212212
dVal = dTemp.(float64)
213213
}
214214
}
@@ -280,9 +280,9 @@ func (r *Round) TransformUp(f sql.TransformExprFunc) (sql.Expression, error) {
280280

281281
args[1] = nil
282282
if r.Right != nil {
283-
arg, err := r.Right.TransformUp(f)
284-
if err != nil {
285-
return nil, err
283+
arg, e := r.Right.TransformUp(f)
284+
if e != nil {
285+
return nil, e
286286
}
287287
args[1] = arg
288288
}

‎sql/expression/function/concat.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ func (f *Concat) String() string {
6767
func (f *Concat) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error) {
6868
var args = make([]sql.Expression, len(f.args))
6969
for i, arg := range f.args {
70-
arg, err := arg.TransformUp(fn)
70+
a, err := arg.TransformUp(fn)
7171
if err != nil {
7272
return nil, err
7373
}
74-
args[i] = arg
74+
args[i] = a
7575
}
7676

7777
expr, err := NewConcat(args...)

0 commit comments

Comments
 (0)