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.

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

Merge same-series data if not chunking #3697

Merged
merged 2 commits into from
Aug 18, 2015
Merged

Merge same-series data if not chunking #3697

merged 2 commits into from
Aug 18, 2015

Conversation

otoolep
Copy link
Contributor

@otoolep otoolep commented Aug 17, 2015

If no chunking was requested by the user, the co-ordinating node buffers all results in RAM before emitting a single result. However buffering was not merging results for rows which had data for the same series. This change fixes this. Fixes issue #3242.

This issue has been present since before the distributed query work.

@otoolep otoolep changed the title Add failing test of 10,001 points Merged series data if not chunking Aug 17, 2015
If no chunking was requested by the user, the co-ordinating node buffers all
results in RAM before emitting a single result. However buffering was not
merging results for rows which had data for the same series. This change fixes this.

Fixes issue #3242.
@otoolep otoolep changed the title Merged series data if not chunking Merge same-series data if not chunking Aug 17, 2015
@otoolep otoolep self-assigned this Aug 17, 2015
@otoolep otoolep added this to the 0.9.3 milestone Aug 17, 2015
@otoolep
Copy link
Contributor Author

otoolep commented Aug 17, 2015

@pauldix

@@ -31,6 +31,11 @@ type Row struct {
Err error `json:"err,omitempty"`
}

// SameSeries returns true if r contains values for the same series as o.
func (r *Row) SameSeries(o *Row) bool {
return r.tagsHash() == o.tagsHash() && r.Name == o.Name
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jwilder -- you think this is OK?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok

@pauldix
Copy link
Member

pauldix commented Aug 18, 2015

+1

otoolep added a commit that referenced this pull request Aug 18, 2015
Merge same-series data if not chunking
@otoolep otoolep merged commit 28a6b1f into master Aug 18, 2015
@otoolep otoolep deleted the chunking_10k branch August 18, 2015 20:23
dleutnant added a commit to dleutnant/influxdbr that referenced this pull request Sep 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants