Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: Revert "refactor(tsdb): remove read from unexported field (#17279)" (#17305) 

This reverts commit 0ec2b453b9.

Fixes panic.
pull/17306/head
Jacob Marble 2020-03-16 17:48:01 -07:00 committed by GitHub
parent eb226776ff
commit 679215de97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsdb/series_iterators.go
View File

@ -30,7 +30,7 @@ type seriesIDSetIterator struct {
}
func NewSeriesIDSetIterator(ss *SeriesIDSet) SeriesIDSetIterator {
if ss == nil || ss.IsEmpty() {
if ss == nil || ss.bitmap == nil {
return nil
}
return &seriesIDSetIterator{ss: ss, itr: ss.Iterator()}

23
tsdb/series_iterators_test.go
View File

@ -18,7 +18,6 @@ import (
"github.com/influxdata/influxdb/tsdb/seriesfile"
"github.com/influxdata/influxdb/tsdb/tsi1"
"github.com/influxdata/influxql"
"github.com/stretchr/testify/assert"
)
func toSeriesIDs(ids []uint64) []tsdb.SeriesID {
@ -356,25 +355,3 @@ func BenchmarkIndex_ConcurrentWriteQuery(b *testing.B) {
})
}
}
func TestSeriesIDSet_isEmpty(t *testing.T) {
sis := tsdb.NewSeriesIDSet(tsdb.NewSeriesID(1))
assert.False(t, sis.IsEmpty())
sis = tsdb.NewSeriesIDSet()
assert.True(t, sis.IsEmpty())
sis = &tsdb.SeriesIDSet{} // sis.bitmap == nil
assert.True(t, sis.IsEmpty())
}
func TestNewSeriesIDSetIterator(t *testing.T) {
sisi := tsdb.NewSeriesIDSetIterator(tsdb.NewSeriesIDSet(tsdb.NewSeriesID(1)))
assert.NotNil(t, sisi)
sisi = tsdb.NewSeriesIDSetIterator(tsdb.NewSeriesIDSet())
assert.Nil(t, sisi)
sisi = tsdb.NewSeriesIDSetIterator(nil)
assert.Nil(t, sisi)
}

4
tsdb/series_set.go
View File

@ -48,10 +48,6 @@ func (s *SeriesIDSet) Bytes() int {
return b
}
func (s *SeriesIDSet) IsEmpty() bool {
return s == nil || s.bitmap == nil || s.bitmap.IsEmpty()
}
// Add adds the series id to the set.
func (s *SeriesIDSet) Add(id SeriesID) {
s.Lock()