Skip to content

Commit 9faac32

Browse files
committed
Revert "fix: data race in seriesIterator, use atomic int (grafana#12223)"
This reverts commit 60dcee1. We don't want atomic iterators.
1 parent 092d7f8 commit 9faac32

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

pkg/iter/sample_iterator.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package iter
33
import (
44
"container/heap"
55
"context"
6-
"go.uber.org/atomic"
76
"io"
87
"sync"
98

@@ -522,7 +521,7 @@ func NewSampleQueryResponseIterator(resp *logproto.SampleQueryResponse) SampleIt
522521
}
523522

524523
type seriesIterator struct {
525-
i *atomic.Int32
524+
i int
526525
series logproto.Series
527526
}
528527

@@ -568,14 +567,14 @@ func NewMultiSeriesIterator(series []logproto.Series) SampleIterator {
568567
// NewSeriesIterator iterates over sample in a series.
569568
func NewSeriesIterator(series logproto.Series) SampleIterator {
570569
return &seriesIterator{
571-
i: atomic.NewInt32(-1),
570+
i: -1,
572571
series: series,
573572
}
574573
}
575574

576575
func (i *seriesIterator) Next() bool {
577-
i.i.Inc()
578-
return int(i.i.Load()) < len(i.series.Samples)
576+
i.i++
577+
return i.i < len(i.series.Samples)
579578
}
580579

581580
func (i *seriesIterator) Error() error {
@@ -591,7 +590,7 @@ func (i *seriesIterator) StreamHash() uint64 {
591590
}
592591

593592
func (i *seriesIterator) Sample() logproto.Sample {
594-
return i.series.Samples[i.i.Load()]
593+
return i.series.Samples[i.i]
595594
}
596595

597596
func (i *seriesIterator) Close() error {

0 commit comments

Comments
 (0)