Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes a memory leak when NewReaderIterator creates a nilFloatIterator #8681

Merged
merged 3 commits into from
Aug 9, 2017
Merged

fixes a memory leak when NewReaderIterator creates a nilFloatIterator #8681

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91e7aae
fixes a memory leak when NewReaderIterator creates a nilFloatIterator
stuartcarnie Aug 9, 2017
bf30282
update CHANGELOG
stuartcarnie Aug 9, 2017
f2d0142
release io.Reader
stuartcarnie Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion influxql/iterator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ func NewReaderIterator(r io.Reader, typ DataType, stats IteratorStats) Iterator
case Boolean:
return newBooleanReaderIterator(r, stats)
default:
return &nilFloatIterator{}
return &nilFloatReaderIterator{r: r}
}
}

Expand Down Expand Up @@ -1233,6 +1233,19 @@ func (*nilFloatIterator) Stats() IteratorStats { return IteratorStats{} }
func (*nilFloatIterator) Close() error { return nil }
func (*nilFloatIterator) Next() (*FloatPoint, error) { return nil, nil }

type nilFloatReaderIterator struct {
r io.Reader
}

func (*nilFloatReaderIterator) Stats() IteratorStats { return IteratorStats{} }
func (itr *nilFloatReaderIterator) Close() error {
if r, ok := itr.r.(io.ReadCloser); ok {
return r.Close()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe set itr.r = nil to help the GC a bit?

}
return nil
}
func (*nilFloatReaderIterator) Next() (*FloatPoint, error) { return nil, nil }

// integerFloatTransformIterator executes a function to modify an existing point for every
// output of the input iterator.
type integerFloatTransformIterator struct {
Expand Down