Skip to content

Commit d560d1f

Browse files
authored
refactor: update linter and run it (#419)
### Rationale for this change Update golangci-lint to v2 and run it for cleanup.
1 parent 146f999 commit d560d1f

66 files changed

Lines changed: 414 additions & 446 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.golangci.yaml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,31 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
version: "2"
1819
linters:
19-
# Disable all linters.
20-
# Default: false
21-
disable-all: true
22-
# Enable specific linter
23-
# https://golangci-lint.run/usage/linters/#enabled-by-default
20+
default: none
2421
enable:
25-
- gofmt
26-
- goimports
2722
- staticcheck
23+
exclusions:
24+
generated: lax
25+
presets:
26+
- comments
27+
- common-false-positives
28+
- legacy
29+
- std-error-handling
30+
paths:
31+
- third_party$
32+
- builtin$
33+
- examples$
2834
issues:
2935
fix: true
36+
formatters:
37+
enable:
38+
- gofmt
39+
- goimports
40+
exclusions:
41+
generated: lax
42+
paths:
43+
- third_party$
44+
- builtin$
45+
- examples$

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
repos:
1919
- repo: https://github.com/golangci/golangci-lint
20-
rev: v1.61.0
20+
rev: v2.1.6
2121
hooks:
2222
# no built-in support for multiple go.mod
2323
# https://github.com/golangci/golangci-lint/issues/828

arrow/array/binary.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ func NewBinaryData(data arrow.ArrayData) *Binary {
5252

5353
// Value returns the slice at index i. This value should not be mutated.
5454
func (a *Binary) Value(i int) []byte {
55-
if i < 0 || i >= a.array.data.length {
55+
if i < 0 || i >= a.data.length {
5656
panic("arrow/array: index out of range")
5757
}
58-
idx := a.array.data.offset + i
58+
idx := a.data.offset + i
5959
return a.valueBytes[a.valueOffsets[idx]:a.valueOffsets[idx+1]]
6060
}
6161

@@ -75,33 +75,33 @@ func (a *Binary) ValueString(i int) string {
7575
}
7676

7777
func (a *Binary) ValueOffset(i int) int {
78-
if i < 0 || i >= a.array.data.length {
78+
if i < 0 || i >= a.data.length {
7979
panic("arrow/array: index out of range")
8080
}
81-
return int(a.valueOffsets[a.array.data.offset+i])
81+
return int(a.valueOffsets[a.data.offset+i])
8282
}
8383

8484
func (a *Binary) ValueOffset64(i int) int64 {
8585
return int64(a.ValueOffset(i))
8686
}
8787

8888
func (a *Binary) ValueLen(i int) int {
89-
if i < 0 || i >= a.array.data.length {
89+
if i < 0 || i >= a.data.length {
9090
panic("arrow/array: index out of range")
9191
}
92-
beg := a.array.data.offset + i
92+
beg := a.data.offset + i
9393
return int(a.valueOffsets[beg+1] - a.valueOffsets[beg])
9494
}
9595

9696
func (a *Binary) ValueOffsets() []int32 {
97-
beg := a.array.data.offset
98-
end := beg + a.array.data.length + 1
97+
beg := a.data.offset
98+
end := beg + a.data.length + 1
9999
return a.valueOffsets[beg:end]
100100
}
101101

102102
func (a *Binary) ValueBytes() []byte {
103-
beg := a.array.data.offset
104-
end := beg + a.array.data.length
103+
beg := a.data.offset
104+
end := beg + a.data.length
105105
return a.valueBytes[a.valueOffsets[beg]:a.valueOffsets[end]]
106106
}
107107

@@ -138,11 +138,11 @@ func (a *Binary) setData(data *Data) {
138138
a.valueOffsets = arrow.Int32Traits.CastFromBytes(valueOffsets.Bytes())
139139
}
140140

141-
if a.array.data.length < 1 {
141+
if a.data.length < 1 {
142142
return
143143
}
144144

145-
expNumOffsets := a.array.data.offset + a.array.data.length + 1
145+
expNumOffsets := a.data.offset + a.data.length + 1
146146
if len(a.valueOffsets) < expNumOffsets {
147147
panic(fmt.Errorf("arrow/array: binary offset buffer must have at least %d values", expNumOffsets))
148148
}
@@ -195,10 +195,10 @@ func NewLargeBinaryData(data arrow.ArrayData) *LargeBinary {
195195
}
196196

197197
func (a *LargeBinary) Value(i int) []byte {
198-
if i < 0 || i >= a.array.data.length {
198+
if i < 0 || i >= a.data.length {
199199
panic("arrow/array: index out of range")
200200
}
201-
idx := a.array.data.offset + i
201+
idx := a.data.offset + i
202202
return a.valueBytes[a.valueOffsets[idx]:a.valueOffsets[idx+1]]
203203
}
204204

@@ -215,33 +215,33 @@ func (a *LargeBinary) ValueString(i int) string {
215215
}
216216

217217
func (a *LargeBinary) ValueOffset(i int) int64 {
218-
if i < 0 || i >= a.array.data.length {
218+
if i < 0 || i >= a.data.length {
219219
panic("arrow/array: index out of range")
220220
}
221-
return a.valueOffsets[a.array.data.offset+i]
221+
return a.valueOffsets[a.data.offset+i]
222222
}
223223

224224
func (a *LargeBinary) ValueOffset64(i int) int64 {
225225
return a.ValueOffset(i)
226226
}
227227

228228
func (a *LargeBinary) ValueLen(i int) int {
229-
if i < 0 || i >= a.array.data.length {
229+
if i < 0 || i >= a.data.length {
230230
panic("arrow/array: index out of range")
231231
}
232-
beg := a.array.data.offset + i
232+
beg := a.data.offset + i
233233
return int(a.valueOffsets[beg+1] - a.valueOffsets[beg])
234234
}
235235

236236
func (a *LargeBinary) ValueOffsets() []int64 {
237-
beg := a.array.data.offset
238-
end := beg + a.array.data.length + 1
237+
beg := a.data.offset
238+
end := beg + a.data.length + 1
239239
return a.valueOffsets[beg:end]
240240
}
241241

242242
func (a *LargeBinary) ValueBytes() []byte {
243-
beg := a.array.data.offset
244-
end := beg + a.array.data.length
243+
beg := a.data.offset
244+
end := beg + a.data.length
245245
return a.valueBytes[a.valueOffsets[beg]:a.valueOffsets[end]]
246246
}
247247

@@ -278,11 +278,11 @@ func (a *LargeBinary) setData(data *Data) {
278278
a.valueOffsets = arrow.Int64Traits.CastFromBytes(valueOffsets.Bytes())
279279
}
280280

281-
if a.array.data.length < 1 {
281+
if a.data.length < 1 {
282282
return
283283
}
284284

285-
expNumOffsets := a.array.data.offset + a.array.data.length + 1
285+
expNumOffsets := a.data.offset + a.data.length + 1
286286
if len(a.valueOffsets) < expNumOffsets {
287287
panic(fmt.Errorf("arrow/array: large binary offset buffer must have at least %d values", expNumOffsets))
288288
}
@@ -353,10 +353,10 @@ func (a *BinaryView) setData(data *Data) {
353353
}
354354

355355
func (a *BinaryView) ValueHeader(i int) *arrow.ViewHeader {
356-
if i < 0 || i >= a.array.data.length {
356+
if i < 0 || i >= a.data.length {
357357
panic("arrow/array: index out of range")
358358
}
359-
return &a.values[a.array.data.offset+i]
359+
return &a.values[a.data.offset+i]
360360
}
361361

362362
func (a *BinaryView) Value(i int) []byte {

arrow/array/binarybuilder.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func NewBinaryBuilder(mem memory.Allocator, dtype arrow.BinaryDataType) *BinaryB
8181
offsetByteWidth: offsetByteWidth,
8282
getOffsetVal: getOffsetVal,
8383
}
84-
bb.builder.refCount.Add(1)
84+
bb.refCount.Add(1)
8585
return bb
8686
}
8787

@@ -162,7 +162,7 @@ func (b *BinaryBuilder) AppendValues(v [][]byte, valid []bool) {
162162
b.values.Append(vv)
163163
}
164164

165-
b.builder.unsafeAppendBoolsToBitmap(valid, len(v))
165+
b.unsafeAppendBoolsToBitmap(valid, len(v))
166166
}
167167

168168
// AppendStringValues will append the values in the v slice. The valid slice determines which values
@@ -183,7 +183,7 @@ func (b *BinaryBuilder) AppendStringValues(v []string, valid []bool) {
183183
b.values.Append([]byte(vv))
184184
}
185185

186-
b.builder.unsafeAppendBoolsToBitmap(valid, len(v))
186+
b.unsafeAppendBoolsToBitmap(valid, len(v))
187187
}
188188

189189
func (b *BinaryBuilder) UnsafeAppend(v []byte) {
@@ -218,7 +218,7 @@ func (b *BinaryBuilder) DataCap() int { return b.values.capacity }
218218
// Reserve ensures there is enough space for appending n elements
219219
// by checking the capacity and calling Resize if necessary.
220220
func (b *BinaryBuilder) Reserve(n int) {
221-
b.builder.reserve(n, b.Resize)
221+
b.reserve(n, b.Resize)
222222
}
223223

224224
// ReserveData ensures there is enough space for appending n bytes
@@ -236,7 +236,7 @@ func (b *BinaryBuilder) Resize(n int) {
236236
if (n * b.offsetByteWidth) < b.offsets.Len() {
237237
b.offsets.SetLength(n * b.offsetByteWidth)
238238
}
239-
b.builder.resize(n, b.init)
239+
b.resize(n, b.init)
240240
}
241241

242242
func (b *BinaryBuilder) ResizeData(n int) {
@@ -291,7 +291,7 @@ func (b *BinaryBuilder) newData() (data *Data) {
291291
values.Release()
292292
}
293293

294-
b.builder.reset()
294+
b.reset()
295295

296296
return
297297
}
@@ -397,7 +397,7 @@ func NewBinaryViewBuilder(mem memory.Allocator) *BinaryViewBuilder {
397397
mem: mem,
398398
},
399399
}
400-
bvb.builder.refCount.Add(1)
400+
bvb.refCount.Add(1)
401401
bvb.blockBuilder.refCount.Add(1)
402402
return bvb
403403
}
@@ -445,7 +445,7 @@ func (b *BinaryViewBuilder) Resize(n int) {
445445
return
446446
}
447447

448-
b.builder.resize(nbuild, b.init)
448+
b.resize(nbuild, b.init)
449449
b.data.Resize(arrow.ViewHeaderTraits.BytesRequired(n))
450450
b.rawData = arrow.ViewHeaderTraits.CastFromBytes(b.data.Bytes())
451451
}
@@ -459,7 +459,7 @@ func (b *BinaryViewBuilder) ReserveData(length int) {
459459
}
460460

461461
func (b *BinaryViewBuilder) Reserve(n int) {
462-
b.builder.reserve(n, b.Resize)
462+
b.reserve(n, b.Resize)
463463
}
464464

465465
func (b *BinaryViewBuilder) Append(v []byte) {
@@ -554,7 +554,7 @@ func (b *BinaryViewBuilder) AppendValues(v [][]byte, valid []bool) {
554554
}
555555
}
556556

557-
b.builder.unsafeAppendBoolsToBitmap(valid, len(v))
557+
b.unsafeAppendBoolsToBitmap(valid, len(v))
558558
}
559559

560560
func (b *BinaryViewBuilder) AppendStringValues(v []string, valid []bool) {
@@ -587,7 +587,7 @@ func (b *BinaryViewBuilder) AppendStringValues(v []string, valid []bool) {
587587
}
588588
}
589589

590-
b.builder.unsafeAppendBoolsToBitmap(valid, len(v))
590+
b.unsafeAppendBoolsToBitmap(valid, len(v))
591591
}
592592

593593
// AppendValueFromString is paired with ValueStr for fulfilling the

arrow/array/boolean.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ func NewBooleanData(data arrow.ArrayData) *Boolean {
5050
}
5151

5252
func (a *Boolean) Value(i int) bool {
53-
if i < 0 || i >= a.array.data.length {
53+
if i < 0 || i >= a.data.length {
5454
panic("arrow/array: index out of range")
5555
}
56-
return bitutil.BitIsSet(a.values, a.array.data.offset+i)
56+
return bitutil.BitIsSet(a.values, a.data.offset+i)
5757
}
5858

5959
func (a *Boolean) ValueStr(i int) string {

arrow/array/booleanbuilder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type BooleanBuilder struct {
3838

3939
func NewBooleanBuilder(mem memory.Allocator) *BooleanBuilder {
4040
bb := &BooleanBuilder{builder: builder{mem: mem}}
41-
bb.builder.refCount.Add(1)
41+
bb.refCount.Add(1)
4242
return bb
4343
}
4444

@@ -131,7 +131,7 @@ func (b *BooleanBuilder) AppendValues(v []bool, valid []bool) {
131131
for i, vv := range v {
132132
bitutil.SetBitTo(b.rawData, b.length+i, vv)
133133
}
134-
b.builder.unsafeAppendBoolsToBitmap(valid, len(v))
134+
b.unsafeAppendBoolsToBitmap(valid, len(v))
135135
}
136136

137137
func (b *BooleanBuilder) init(capacity int) {
@@ -146,7 +146,7 @@ func (b *BooleanBuilder) init(capacity int) {
146146
// Reserve ensures there is enough space for appending n elements
147147
// by checking the capacity and calling Resize if necessary.
148148
func (b *BooleanBuilder) Reserve(n int) {
149-
b.builder.reserve(n, b.Resize)
149+
b.reserve(n, b.Resize)
150150
}
151151

152152
// Resize adjusts the space allocated by b to n elements. If n is greater than b.Cap(),
@@ -159,7 +159,7 @@ func (b *BooleanBuilder) Resize(n int) {
159159
if b.capacity == 0 {
160160
b.init(n)
161161
} else {
162-
b.builder.resize(n, b.init)
162+
b.resize(n, b.init)
163163
b.data.Resize(arrow.BooleanTraits.BytesRequired(n))
164164
b.rawData = b.data.Bytes()
165165
}

arrow/array/bufferbuilder_byte.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type byteBufferBuilder struct {
2424

2525
func newByteBufferBuilder(mem memory.Allocator) *byteBufferBuilder {
2626
bbb := &byteBufferBuilder{bufferBuilder: bufferBuilder{mem: mem}}
27-
bbb.bufferBuilder.refCount.Add(1)
27+
bbb.refCount.Add(1)
2828
return bbb
2929
}
3030

arrow/array/compare.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func RecordApproxEqual(left, right arrow.Record, opts ...EqualOption) bool {
7272
func chunkedBinaryApply(left, right *arrow.Chunked, fn func(left arrow.Array, lbeg, lend int64, right arrow.Array, rbeg, rend int64) bool) {
7373
var (
7474
pos int64
75-
length int64 = int64(left.Len())
75+
length = int64(left.Len())
7676
leftIdx, rightIdx int
7777
leftPos, rightPos int64
7878
)
@@ -118,7 +118,7 @@ func ChunkedEqual(left, right *arrow.Chunked) bool {
118118
return false
119119
}
120120

121-
var isequal bool = true
121+
var isequal = true
122122
chunkedBinaryApply(left, right, func(left arrow.Array, lbeg, lend int64, right arrow.Array, rbeg, rend int64) bool {
123123
isequal = SliceEqual(left, lbeg, lend, right, rbeg, rend)
124124
return isequal

0 commit comments

Comments
 (0)