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

[0.10.2] Backport #5716 to 0.10.0 #5911

Conversation

jonseymour
Copy link
Contributor

This PR makes the #5716 fix available in 0.10.x.

These commits are actually the same commits that have already been merged into master - this PR will simply merge these commits into 0.10.0 and aim to eliminate a panic that occurs in the 0.10.x builds.

  • CHANGELOG.md updated
  • Rebased/mergable
  • Tests pass
  • Sign CLA (if not already signed)

e-dard and others added 3 commits February 17, 2016 12:31
These tests check that NewPoint and NewPointFromBytes return an error if:

* arguments specify a point with no fields
* arguments specify a point with a field that has an empty name

These tests also check that Point.Fields() always returns, even in the presence
of corrupt binary data read with NewPointFromBytes.

These tests fail at this commit and are fixed by a subsequent commit.

Signed-off-by: Jon Seymour <jon@wildducktheories.com>
…fields

Influx does not support fields with empty names or points
with no fields.

NewPoint is changed to validate that all field names are non-empty.

AddField is removed because we now require that all fields are
specified on construction.

NewPointFromByte is changed to return an error if a unmarshaled
binary point does not have any fields.

newFieldsFromBinary is changed to prevent an infinite loop that
can arise while attempting to parse corrupt binary point data.

TestNewPointsWithBytesWithCorruptData is changed to reflect the
change in the behaviour of NewPointFromByte.

Signed-off-by: Jon Seymour <jon@wildducktheories.com>
@jonseymour jonseymour mentioned this pull request Mar 4, 2016
@zstyblik
Copy link

zstyblik commented Mar 5, 2016

@jonseymour, but v0.10.2 has already been released.

@jonseymour jonseymour changed the title [0.10.2] Backport #5716 to 0.10.0 [0.10.3] Backport #5716 to 0.10.0 Mar 5, 2016
@jonseymour
Copy link
Contributor Author

@zstyblik sorry I interpreted [0.10.2] as being a statement about which version had the issue, rather than which version the fix will be delivered in. I have adjusted the title accordingly.

@jonseymour jonseymour changed the title [0.10.3] Backport #5716 to 0.10.0 [fix for 0.10.2] Backport #5716 to 0.10.0 Mar 5, 2016
@jonseymour jonseymour changed the title [fix for 0.10.2] Backport #5716 to 0.10.0 [fix for v0.10.2] Backport #5716 to 0.10.0 Mar 5, 2016
@zstyblik
Copy link

zstyblik commented Mar 5, 2016

@jonseymour, I see and you're right. I got confused by backport stuff V. the usual vX.Y has such and such issue. My bad. Now, I'm even more confused, because this means life ov v0.10 will be prolonged even more which is a bit unexpected. In other words, my expectation was v0.10.2 was the last one before v0.11 is here.

@jonseymour jonseymour changed the title [fix for v0.10.2] Backport #5716 to 0.10.0 [0.10.2] Backport #5716 to 0.10.0 Mar 5, 2016
@jonseymour
Copy link
Contributor Author

@zstyblik The existence of this PR does not mean there will be a 0.10.3 - that's a call for inlfuxdata to make, not me.

This PR contains a fix that could be trivially included in a hypothetical 0.10.3 if influxdata decides to build one. I opened the PR so that the fix is easily at hand, should they choose to use it.

@jonseymour jonseymour force-pushed the jss-5716-tolerate-empty-field-names-0.10.0 branch from aa873bc to 409f9a6 Compare March 8, 2016 06:54
@jwilder
Copy link
Contributor

jwilder commented Mar 8, 2016

@jonseymour Could you rebase?

@jwilder jwilder added this to the 0.10.3 milestone Mar 8, 2016
@jonseymour jonseymour force-pushed the jss-5716-tolerate-empty-field-names-0.10.0 branch from 409f9a6 to eb2f3c8 Compare March 8, 2016 23:08
@jonseymour jonseymour mentioned this pull request Mar 8, 2016
4 tasks
@jonseymour jonseymour force-pushed the jss-5716-tolerate-empty-field-names-0.10.0 branch from eb2f3c8 to 7662c16 Compare March 8, 2016 23:32
@jonseymour
Copy link
Contributor Author

@jwilder conflict resolved in #5911 now.

Signed-off-by: Jon Seymour <jon@wildducktheories.com>
@jonseymour jonseymour force-pushed the jss-5716-tolerate-empty-field-names-0.10.0 branch from 7662c16 to ffa5f89 Compare March 9, 2016 00:49
@jonseymour
Copy link
Contributor Author

Repushed to deal with (spurious?) CI test failure.

jwilder added a commit that referenced this pull request Mar 9, 2016
@jwilder jwilder merged commit b6f91ea into influxdata:0.10.0 Mar 9, 2016
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.

4 participants