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

Commit 04aa0ac

Browse files
author
Juanjo Alvarez
committed
Dont rename err to e except when needed
Signed-off-by: Juanjo Alvarez <[email protected]>
1 parent 16e67f1 commit 04aa0ac

File tree

15 files changed

+105
-84
lines changed

15 files changed

+105
-84
lines changed

‎auth/common_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,20 @@ func testAuthentication(
103103
t.Run(fmt.Sprintf("%s-%s", c.user, c.password), func(t *testing.T) {
104104
r := require.New(t)
105105

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

110111
if c.success {
111-
r.NoError(e)
112+
r.NoError(err)
112113
} else {
113-
r.Error(e)
114-
r.Contains(e.Error(), "Access denied")
114+
r.Error(err)
115+
r.Contains(err.Error(), "Access denied")
115116
}
116117

117-
e = db.Close()
118-
r.NoError(e)
118+
err = db.Close()
119+
r.NoError(err)
119120

120121
if extra != nil {
121122
extra(t, c)

‎mem/table_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,17 @@ func TestTable(t *testing.T) {
194194
require.NoError(err)
195195

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

200-
iter, e := table.PartitionRows(sql.NewEmptyContext(), p)
201-
require.NoError(e)
201+
var iter sql.RowIter
202+
iter, err = table.PartitionRows(sql.NewEmptyContext(), p)
203+
require.NoError(err)
202204

203-
rows, e := sql.RowIterToRows(iter)
204-
require.NoError(e)
205+
var rows []sql.Row
206+
rows, err = sql.RowIterToRows(iter)
207+
require.NoError(err)
205208

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

‎sql/expression/function/ceil_round_floor.go

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

191191
if r.Right != nil {
192-
dTemp, e := r.Right.Eval(ctx, row)
193-
if e != nil {
194-
return nil, e
192+
var dTemp interface{}
193+
dTemp, err = r.Right.Eval(ctx, row)
194+
if err != nil {
195+
return nil, err
195196
}
196197

197198
if dTemp != nil {
@@ -207,8 +208,8 @@ func (r *Round) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
207208
case int:
208209
dVal = float64(dNum)
209210
default:
210-
dTemp, e = sql.Float64.Convert(dTemp)
211-
if e == nil {
211+
dTemp, err = sql.Float64.Convert(dTemp)
212+
if err == nil {
212213
dVal = dTemp.(float64)
213214
}
214215
}
@@ -280,9 +281,10 @@ func (r *Round) TransformUp(f sql.TransformExprFunc) (sql.Expression, error) {
280281

281282
args[1] = nil
282283
if r.Right != nil {
283-
arg, e := r.Right.TransformUp(f)
284-
if e != nil {
285-
return nil, e
284+
var arg sql.Expression
285+
arg, err = r.Right.TransformUp(f)
286+
if err != nil {
287+
return nil, err
286288
}
287289
args[1] = arg
288290
}

‎sql/expression/function/time_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,10 @@ func TestCalcWeek(t *testing.T) {
345345
func TestNow(t *testing.T) {
346346
require := require.New(t)
347347
date := time.Date(2018, time.December, 2, 16, 25, 0, 0, time.Local)
348-
cl := clock(func() time.Time {
348+
clk := clock(func() time.Time {
349349
return date
350350
})
351-
f := &Now{cl}
351+
f := &Now{clk}
352352

353353
result, err := f.Eval(nil, nil)
354354
require.NoError(err)

‎sql/expression/like.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ func (l *Like) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
5959
)
6060
// eval right and convert to text
6161
if !l.cached || l.pool == nil {
62-
v, e := l.Right.Eval(ctx, row)
63-
if e != nil || v == nil {
64-
return nil, e
62+
var v interface{}
63+
v, err = l.Right.Eval(ctx, row)
64+
if err != nil || v == nil {
65+
return nil, err
6566
}
66-
v, e = sql.Text.Convert(v)
67-
if e != nil {
68-
return nil, e
67+
v, err = sql.Text.Convert(v)
68+
if err != nil {
69+
return nil, err
6970
}
7071
right = patternToRegex(v.(string))
7172
}

‎sql/index/pilosa/driver.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func (d *Driver) loadIndex(db, table, id string) (*pilosaIndex, error) {
202202
"dir": dir,
203203
})
204204
log.Warn("could not read index file, index is corrupt and will be deleted")
205-
if e := os.RemoveAll(dir); e != nil {
205+
if err = os.RemoveAll(dir); err != nil {
206206
log.Warn("unable to remove corrupted index: " + dir)
207207
}
208208

@@ -262,8 +262,8 @@ func (d *Driver) savePartition(
262262
if !ok {
263263
return 0, errMappingNotFound.New(mk)
264264
}
265-
if e := mapping.openCreate(true); e != nil {
266-
return 0, e
265+
if err := mapping.openCreate(true); err != nil {
266+
return 0, err
267267
}
268268

269269
defer func() {
@@ -304,7 +304,8 @@ func (d *Driver) savePartition(
304304
continue
305305
}
306306

307-
rowID, err := mapping.getRowID(field.Name(), values[i])
307+
var rowID uint64
308+
rowID, err = mapping.getRowID(field.Name(), values[i])
308309
if err != nil {
309310
return 0, err
310311
}

‎sql/index/pilosa/driver_test.go

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,21 @@ func TestSaveAndLoad(t *testing.T) {
192192

193193
for partition, records := range it.records {
194194
for _, r := range records {
195-
lookup, e := sqlIdx.Get(r.values...)
196-
require.NoError(e)
195+
var lookup sql.IndexLookup
196+
lookup, err = sqlIdx.Get(r.values...)
197+
require.NoError(err)
197198

198-
lit, e := lookup.Values(testPartition(partition))
199-
require.NoError(e)
199+
var lit sql.IndexValueIter
200+
lit, err = lookup.Values(testPartition(partition))
201+
require.NoError(err)
200202

201203
for {
202-
loc, e := lit.Next()
203-
if e == io.EOF {
204+
var loc []byte
205+
loc, err = lit.Next()
206+
if err == io.EOF {
204207
break
205208
}
206-
require.NoError(e)
209+
require.NoError(err)
207210

208211
locations[partition] = append(locations[partition], string(loc))
209212
}
@@ -869,8 +872,9 @@ func TestUnionDiffAsc(t *testing.T) {
869872
for partition, records := range it.records {
870873
ls[partition] = make([]*indexLookup, it.total)
871874
for i, r := range records {
872-
l, e := pilosaIdx.Get(r.values...)
873-
require.NoError(e)
875+
var l sql.IndexLookup
876+
l, err = pilosaIdx.Get(r.values...)
877+
require.NoError(err)
874878
ls[partition][i], _ = l.(*indexLookup)
875879
}
876880
}
@@ -882,8 +886,9 @@ func TestUnionDiffAsc(t *testing.T) {
882886
require.NoError(err)
883887

884888
for i := 1; i < it.total-1; i += 2 {
885-
loc, e := diffIt.Next()
886-
require.NoError(e)
889+
var loc []byte
890+
loc, err = diffIt.Next()
891+
require.NoError(err)
887892

888893
require.Equal(it.records[0][i].location, loc)
889894
}
@@ -936,8 +941,9 @@ func TestInterRanges(t *testing.T) {
936941
require.NoError(err)
937942

938943
for i := ranges[0]; i < ranges[1]; i++ {
939-
loc, e := interIt.Next()
940-
require.NoError(e)
944+
var loc []byte
945+
loc, err = interIt.Next()
946+
require.NoError(err)
941947
require.Equal(it.records[0][i].location, loc)
942948
}
943949

‎sql/index/pilosa/index.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,10 @@ func newAscendLookup(f *filteredLookup, gte []interface{}, lt []interface{}) *as
303303
return false, err
304304
}
305305

306-
cmp, e := compare(v, l.gte[i])
307-
if e != nil {
308-
return false, e
306+
var cmp int
307+
cmp, err = compare(v, l.gte[i])
308+
if err != nil {
309+
return false, err
309310
}
310311

311312
if cmp < 0 {
@@ -349,9 +350,10 @@ func newDescendLookup(f *filteredLookup, gt []interface{}, lte []interface{}) *d
349350
return false, err
350351
}
351352

352-
cmp, e := compare(v, l.gt[i])
353-
if e != nil {
354-
return false, e
353+
var cmp int
354+
cmp, err = compare(v, l.gt[i])
355+
if err != nil {
356+
return false, err
355357
}
356358

357359
if cmp <= 0 {

‎sql/index/pilosa/lookup.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ func (l *filteredLookup) Values(p sql.Partition) (sql.IndexValueIter, error) {
350350
}
351351

352352
bits := row.Columns()
353-
if e := m.open(); e != nil {
354-
return nil, e
353+
if err = m.open(); err != nil {
354+
return nil, err
355355
}
356356

357357
defer m.close()
@@ -455,7 +455,8 @@ func (l *negateLookup) intersectExpressions(p sql.Partition, m *mapping) (*pilos
455455
var r *pilosa.Row
456456
// rowIDs start with 1
457457
for ri := uint64(1); ri <= maxRowID; ri++ {
458-
rr, err := field.Row(ri)
458+
var rr *pilosa.Row
459+
rr, err = field.Row(ri)
459460
if err != nil {
460461
return nil, err
461462
}

‎sql/parse/lock.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ func readTableLocks(tables *[]*plan.TableLock) parseFunc {
3939

4040
*tables = append(*tables, t)
4141

42-
if e := skipSpaces(rd); e != nil {
43-
return e
42+
if err = skipSpaces(rd); err != nil {
43+
return err
4444
}
4545

46-
b, err := rd.Peek(1)
46+
var b []byte
47+
b, err = rd.Peek(1)
4748
if err == io.EOF {
4849
return nil
4950
} else if err != nil {

0 commit comments

Comments
 (0)