Skip to content

Commit b769aa6

Browse files
linxGnulinxGnu
committed
Update
1 parent 47c21af commit b769aa6

File tree

5 files changed

+52
-32
lines changed

5 files changed

+52
-32
lines changed

‎example/main.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ func main() {
1414
if err != nil {
1515
log.Fatal(err)
1616
}
17-
defer q.Close() // it's important to close the queue before exit
17+
defer func() {
18+
_ = q.Close() // it's important to close the queue before exit
19+
}()
1820

1921
// enqueue
2022
if err = q.Enqueue([]byte{1, 2, 3, 4}); err != nil {

‎queue.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -197,31 +197,31 @@ func (q *queue) readEntryFromHead(head *segment, front *list.Element, dst *entry
197197
}
198198
}
199199

200-
func (q *queue) removeSegment(seg *list.Element) bool {
200+
func (q *queue) removeSegment(e *list.Element) bool {
201201
q.wLock.RLock()
202202

203203
// do not remove back/tail of segment list
204-
if seg == q.segments.Back() {
204+
if e == q.segments.Back() {
205205
q.wLock.RUnlock()
206206
return true
207207
}
208208

209209
// remove from list
210-
val := q.segments.Remove(seg)
210+
val := q.segments.Remove(e)
211211

212212
q.wLock.RUnlock()
213213

214-
segment_ := val.(*segment)
214+
seg := val.(*segment)
215215

216216
// close segment
217-
if segment_.seg != nil {
218-
_ = segment_.seg.Close()
217+
if seg.seg != nil {
218+
_ = seg.seg.Close()
219219
}
220220

221221
// remove underlying file
222-
if len(segment_.path) > 0 {
223-
_ = os.Remove(segment_.path)
224-
q.closeAndRemoveOffsetTracker(offsetFilePath(segment_.path))
222+
if len(seg.path) > 0 {
223+
_ = os.Remove(seg.path)
224+
q.closeAndRemoveOffsetTracker(offsetFilePath(seg.path))
225225
}
226226

227227
return false
@@ -352,7 +352,7 @@ func (q *queue) newSegment() (*segment, error) {
352352

353353
func loadOffsetTracker(path string) (offset int64, f *os.File, err error) {
354354
for attempt := 0; attempt < 2; attempt++ {
355-
f, err = os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0644)
355+
f, err = os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0o644)
356356
if err != nil {
357357
return
358358
}

‎queue_bench_test.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func BenchmarkBigQueueRW_64K(b *testing.B) {
240240
func prepareDataDir(dir string) string {
241241
dataDir := filepath.Join(tmpDir, dir)
242242
_ = os.RemoveAll(dataDir)
243-
_ = os.MkdirAll(dataDir, 0777)
243+
_ = os.MkdirAll(dataDir, 0o777)
244244
return dataDir
245245
}
246246

@@ -256,11 +256,13 @@ func benchmarkPQueue(b *testing.B, size int, entrySize int, alsoRead bool) {
256256

257257
dataDir := prepareDataDir(path)
258258
defer func() {
259-
os.RemoveAll(dataDir)
259+
_ = os.RemoveAll(dataDir)
260260
}()
261261

262262
q, _ := New(dataDir, 2000)
263-
defer q.Close()
263+
defer func() {
264+
_ = q.Close()
265+
}()
264266

265267
b.StartTimer()
266268

@@ -320,14 +322,16 @@ func benchmarkBigQueue(b *testing.B, size int, entrySize int, alsoRead bool) {
320322

321323
dataDir := prepareDataDir(path)
322324
defer func() {
323-
os.RemoveAll(dataDir)
325+
_ = os.RemoveAll(dataDir)
324326
}()
325327

326328
q, _ := bigqueue.NewMmapQueue(dataDir,
327329
bigqueue.SetPeriodicFlushOps(flushOps),
328330
bigqueue.SetMaxInMemArenas(256<<20),
329331
bigqueue.SetArenaSize(512<<20))
330-
defer q.Close()
332+
defer func() {
333+
_ = q.Close()
334+
}()
331335

332336
b.StartTimer()
333337

‎queue_test.go‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,28 @@ func (m *mockWriterErr) Write(data []byte) (int, error) {
3434
}
3535
return m.buf.Write(data)
3636
}
37+
3738
func (m *mockWriterErr) Sync() error {
3839
if m.onSync {
3940
return fmt.Errorf("fake error")
4041
}
4142
return nil
4243
}
44+
4345
func (m *mockWriterErr) Close() error {
4446
if m.onClose {
4547
return fmt.Errorf("fake error")
4648
}
4749
return nil
4850
}
51+
4952
func (m *mockWriterErr) WriteHeader(io.WriteCloser, common.SegmentFormat) error {
5053
if m.onSegmentHeader {
5154
return fmt.Errorf("fake error")
5255
}
5356
return nil
5457
}
58+
5559
func (m *mockWriterErr) ReadHeader(r io.ReadCloser) (format common.SegmentFormat, err error) {
5660
return
5761
}
@@ -113,9 +117,11 @@ func TestQueueRace(t *testing.T) {
113117
dataDir := filepath.Join(tmpDir, "pqueue_race_test")
114118
_ = os.RemoveAll(dataDir)
115119

116-
err := os.MkdirAll(dataDir, 0777)
120+
err := os.MkdirAll(dataDir, 0o777)
117121
require.NoError(t, err)
118-
defer os.RemoveAll(dataDir)
122+
defer func() {
123+
_ = os.RemoveAll(dataDir)
124+
}()
119125

120126
// prepare some files
121127
{
@@ -138,7 +144,9 @@ func TestQueueRace(t *testing.T) {
138144

139145
q, err := New(dataDir, 0)
140146
require.NoError(t, err)
141-
defer q.Close()
147+
defer func() {
148+
_ = q.Close()
149+
}()
142150

143151
// start reader
144152
var wg sync.WaitGroup
@@ -260,9 +268,11 @@ func TestQueueWriteLoad(t *testing.T) {
260268
dataDir := filepath.Join(tmpDir, "pqueue_write_load")
261269
_ = os.RemoveAll(dataDir)
262270

263-
err := os.MkdirAll(dataDir, 0777)
271+
err := os.MkdirAll(dataDir, 0o777)
264272
require.NoError(t, err)
265-
defer os.RemoveAll(dataDir)
273+
defer func() {
274+
_ = os.RemoveAll(dataDir)
275+
}()
266276

267277
{
268278
q, err := New(dataDir, 0)
@@ -321,9 +331,11 @@ func TestQueueWriteLoad(t *testing.T) {
321331
func TestQueueExample(t *testing.T) {
322332
dataDir := filepath.Join(tmpDir, "pqueue_example")
323333
_ = os.RemoveAll(dataDir)
324-
err := os.MkdirAll(dataDir, 0777)
334+
err := os.MkdirAll(dataDir, 0o777)
325335
require.NoError(t, err)
326-
defer os.RemoveAll(dataDir)
336+
defer func() {
337+
_ = os.RemoveAll(dataDir)
338+
}()
327339

328340
q, err := New(dataDir, 3)
329341
require.NoError(t, err)
@@ -366,17 +378,19 @@ func TestLoadOffsetFile(t *testing.T) {
366378
func TestQueueCorruptedWritingFile(t *testing.T) {
367379
dataDir := filepath.Join(tmpDir, "pqueue_hijack")
368380
_ = os.RemoveAll(dataDir)
369-
err := os.MkdirAll(dataDir, 0777)
381+
err := os.MkdirAll(dataDir, 0o777)
370382
require.NoError(t, err)
371-
defer os.RemoveAll(dataDir)
383+
defer func() {
384+
_ = os.RemoveAll(dataDir)
385+
}()
372386

373387
q, err := New(dataDir, 3)
374388
require.NoError(t, err)
375389

376390
require.NoError(t, q.Enqueue([]byte{1, 2, 3}))
377391

378392
front := q.(*queue).segments.Front().Value.(*segment)
379-
f, err := os.OpenFile(front.path, os.O_RDWR, 0644)
393+
f, err := os.OpenFile(front.path, os.O_RDWR, 0o644)
380394
require.NoError(t, err)
381395
_, err = f.Write([]byte{1, 2, 3, 4, 1, 1, 1, 1})
382396
require.NoError(t, err)

‎segment/v1/segment_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import (
1414
"github.com/stretchr/testify/require"
1515
)
1616

17-
var (
18-
tmpDir = os.TempDir()
19-
)
17+
var tmpDir = os.TempDir()
2018

2119
func TestSegment(t *testing.T) {
2220
t.Run("NewSegmentFailure", func(t *testing.T) {
@@ -249,11 +247,11 @@ func TestSegmentRace(t *testing.T) {
249247
tmpFile := filepath.Join(tmpDir, "segment.tmp")
250248

251249
// create/trunc it
252-
f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
250+
f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
253251
require.NoError(t, err)
254252

255253
// remove when done
256-
defer os.Remove(tmpFile)
254+
defer func() { _ = os.Remove(tmpFile) }()
257255

258256
// open temp file for reading
259257
fr, err := os.Open(tmpFile)
@@ -265,7 +263,9 @@ func TestSegmentRace(t *testing.T) {
265263
n, err := s.Reading(fr)
266264
require.NoError(t, err)
267265
require.Equal(t, 4, n)
268-
defer s.Close()
266+
defer func() {
267+
_ = s.Close()
268+
}()
269269

270270
// start reader
271271
var wg sync.WaitGroup

0 commit comments

Comments
 (0)