Skip to content

Commit c79cc3b

Browse files
authored
linter: prealloc (FeatureBaseDB#2315)
1 parent d2856bf commit c79cc3b

14 files changed

+23
-20
lines changed

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ linters:
2525
- errname
2626
- gofmt
2727
# - misspell (lots to fix, but we should)
28-
# - prealloc (15 to fix)
28+
- prealloc
2929
# - predeclared (20 to fix)
3030
# - stylecheck (quite a lot to fix, but we should definitely work on this)
3131
# - unconvert (not at all critical, but makes for cleaner code)

cache_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"reflect"
77
"testing"
88

9-
"github.com/featurebasedb/featurebase/v3"
9+
pilosa "github.com/featurebasedb/featurebase/v3"
1010
)
1111

1212
// Ensure cache stays constrained to its configured size.
@@ -62,7 +62,7 @@ func TestCache_Rank_Dirty(t *testing.T) {
6262
cache.Add(v.ID, v.Count)
6363
}
6464

65-
var got []pair
65+
var got []pair //nolint:prealloc
6666
for _, p := range cache.Top() {
6767
got = append(got, pair(p))
6868
}

dax/table.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ func (t *Table) HasValidPrimaryKey() bool {
459459

460460
// FieldNames returns the list of field names associated with the table.
461461
func (t *Table) FieldNames() []FieldName {
462-
var ret []FieldName
462+
ret := make([]FieldName, 0, len(t.Fields))
463463
for _, f := range t.Fields {
464464
ret = append(ret, f.Name)
465465
}

debugstats/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (c *CallStats) Report(title string) (r string) {
5757
r = fmt.Sprintf("CallStats: (%v)\n", title)
5858
c.mu.Lock()
5959
defer c.mu.Unlock()
60-
var lines []*LineSorter
60+
lines := make([]*LineSorter, 0, len(c.elap))
6161
for id, elap := range c.elap {
6262
slc := elap.dur
6363
n := len(slc)

etcd/embed.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ func (e *EmbeddedEtcd) Shutdown() {
134134
}
135135

136136
func (e *EmbeddedEtcd) Peers() []*disco.Peer {
137-
var peers []*disco.Peer
138-
for _, member := range e.e.Server.Cluster().Members() {
137+
members := e.e.Server.Cluster().Members()
138+
peers := make([]*disco.Peer, 0, len(members))
139+
for _, member := range members {
139140
peers = append(peers, &disco.Peer{ID: member.ID.String(), URL: member.PickPeerURL()})
140141
}
141142
return peers

executor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2321,7 +2321,7 @@ func (e *executor) executeTopKShardTime(ctx context.Context, tx Tx, filter *Row,
23212321
}
23222322

23232323
// Fetch fragments.
2324-
var fragments []*fragment
2324+
fragments := make([]*fragment, 0, len(views))
23252325
for _, view := range views {
23262326
f := e.Holder.fragment(index, field, view, shard)
23272327
if f == nil {

executor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7620,7 +7620,7 @@ func variousQueriesOnPercentiles(t *testing.T, c *test.Cluster) {
76207620
}
76217621

76227622
// generate string-set entries for index
7623-
var stringEntries [][2]string
7623+
stringEntries := make([][2]string, 0, len(testValues))
76247624
for _, v := range testValues {
76257625
stringEntries = append(stringEntries,
76267626
[2]string{v.rowKey, v.colKey})
@@ -7657,7 +7657,7 @@ func variousQueriesOnPercentiles(t *testing.T, c *test.Cluster) {
76577657

76587658
// generate test cases per each nth argument
76597659
nthsFloat := []float64{0, 10, 25, 50, 75, 90, 99}
7660-
var tests []testCase
7660+
tests := make([]testCase, 0, len(nthsFloat))
76617661
for _, nth := range nthsFloat {
76627662
query := fmt.Sprintf(`Percentile(field="net_worth", filter=Row(val="foo"), nth=%f)`, nth)
76637663
expectedPercentile := getExpectedPercentile(nums, nth)

field.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1018,8 +1018,9 @@ func (f *Field) viewsByTimeRange(from, to time.Time) (views []string, err error)
10181018
}
10191019

10201020
// Get min/max based on existing views.
1021-
var vs []string
1022-
for _, v := range f.views() {
1021+
fv := f.views()
1022+
vs := make([]string, 0, len(fv))
1023+
for _, v := range fv {
10231024
vs = append(vs, v.name)
10241025
}
10251026
min, max := minMaxViews(vs, q)

http_handler.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2907,8 +2907,9 @@ const (
29072907

29082908
// parseUint64Slice returns a slice of uint64s from a comma-delimited string.
29092909
func parseUint64Slice(s string) ([]uint64, error) {
2910-
var a []uint64
2911-
for _, str := range strings.Split(s, ",") {
2910+
ss := strings.Split(s, ",")
2911+
a := make([]uint64, 0, len(ss))
2912+
for _, str := range ss {
29122913
// Ignore blanks.
29132914
if str == "" {
29142915
continue

rbf/cursor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ func (c *Cursor) putLeafCell(in leafCell) (err error) {
493493

494494
// Write each group to a separate page.
495495
newRoot := (len(groups) > 1) && (c.stack.top == 0)
496-
var parents []branchCell
496+
parents := make([]branchCell, 0, len(groups))
497497
origPgno := elem.pgno
498498
// newRoot if split occured and bottom of the stack
499499
for i, group := range groups {
@@ -724,7 +724,7 @@ func (c *Cursor) putBranchCells(stackIndex int, newCells []branchCell) (err erro
724724
}
725725

726726
// Write each group to a separate page.
727-
var parents []branchCell
727+
parents := make([]branchCell, 0, len(groups))
728728
origPgno := readPageNo(page)
729729
newRoot := len(groups) > 1 && stackIndex == 0
730730
for i, group := range groups {

rbf/cursor_internal_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func TestCursor_putBranchCellsHandlesLotsOfNewBranchesAtTheRoot(t *testing.T) {
332332

333333
groups := splitLeafCells(leafcells)
334334

335-
var branches []branchCell
335+
branches := make([]branchCell, 0, len(groups))
336336

337337
for i, group := range groups {
338338
_ = i

sql/select.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func (h handlerSelectFieldsFromTableWhere) Apply(stmt *sqlparser.Select, qm Quer
206206
return nil, errors.Wrap(err, "extracting select fields")
207207
}
208208

209-
var fields []string
209+
var fields []string //nolint:prealloc
210210
for _, fld := range selectFields {
211211
if _, ok := fld.(*StarColumn); ok {
212212
pflds := index.Fields()

sql3/planner/inbuiltfunctionsstring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ func (n *callPlanExpression) EvaluateFormat(currentRow []interface{}) (interface
706706
return nil, sql3.NewErrUnexpectedTypeConversion(0, 0, argEval)
707707
}
708708

709-
var args []interface{}
709+
args := make([]interface{}, 0, len(n.args)-1)
710710

711711
// loop, since args can be of any length.
712712
for _, arg := range n.args[1:] {

view.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (v *view) openWithShardSet(ss *shardSet) error {
134134

135135
shards := ss.CloneMaybe()
136136

137-
var frags []*fragment
137+
frags := make([]*fragment, 0, len(shards))
138138
for shard := range shards {
139139
frag := v.newFragment(shard)
140140
frags = append(frags, frag)

0 commit comments

Comments
 (0)