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

Fix remote execution for partially replicated clusters #5843

Merged
merged 1 commit into from
Feb 25, 2016
Merged

Fix remote execution for partially replicated clusters #5843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cluster/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,15 @@ func (s *Service) handleConn(conn net.Conn) {
case createIteratorRequestMessage:
s.statMap.Add(createIteratorReq, 1)
s.processCreateIteratorRequest(conn)
return
case fieldDimensionsRequestMessage:
s.statMap.Add(fieldDimensionsReq, 1)
s.processFieldDimensionsRequest(conn)
return
case seriesKeysRequestMessage:
s.statMap.Add(seriesKeysReq, 1)
s.processSeriesKeysRequest(conn)
return
default:
s.Logger.Printf("cluster service message type not found: %d", typ)
}
Expand Down
8 changes: 5 additions & 3 deletions influxql/iterator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,9 @@ func drainIterator(itr Iterator) {
// NewReaderIterator returns an iterator that streams from a reader.
func NewReaderIterator(r io.Reader) (Iterator, error) {
var p Point
if err := NewPointDecoder(r).DecodePoint(&p); err != nil {
if err := NewPointDecoder(r).DecodePoint(&p); err == io.EOF {
return &nilFloatIterator{}, nil
} else if err != nil {
return nil, err
}

Expand Down Expand Up @@ -502,8 +504,8 @@ func (a IteratorCreators) FieldDimensions(sources Sources) (fields, dimensions m
// into a single Series by calling Combine on it.
func (a IteratorCreators) SeriesKeys(opt IteratorOptions) (SeriesList, error) {
seriesMap := make(map[string]Series)
for _, sh := range a {
series, err := sh.SeriesKeys(opt)
for _, ic := range a {
series, err := ic.SeriesKeys(opt)
if err != nil {
return nil, err
}
Expand Down