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 regex binary encoding for a measurement #6934

Merged
merged 1 commit into from
Jul 5, 2016
Merged

Fix regex binary encoding for a measurement #6934

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ With this release the systemd configuration files for InfluxDB will use the syst
- [#6738](https://github.com/influxdata/influxdb/issues/6738): Time sorting broken with overwritten points
- [#6829](https://github.com/influxdata/influxdb/issues/6829): Fix panic: runtime error: index out of range
- [#6911](https://github.com/influxdata/influxdb/issues/6911): Fix fill(previous) when used with math operators.
- [#6934](https://github.com/influxdata/influxdb/issues/6934): Fix regex binary encoding for a measurement.

## v0.13.0 [2016-05-12]

Expand Down
2 changes: 1 addition & 1 deletion influxql/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3071,7 +3071,7 @@ func encodeMeasurement(mm *Measurement) *internal.Measurement {
IsTarget: proto.Bool(mm.IsTarget),
}
if mm.Regex != nil {
pb.Regex = proto.String(mm.Regex.String())
pb.Regex = proto.String(mm.Regex.Val.String())
}
return pb
}
Expand Down
2 changes: 1 addition & 1 deletion influxql/iterator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ func TestIteratorOptions_MarshalBinary_Measurement_Regex(t *testing.T) {
var other influxql.IteratorOptions
if err := other.UnmarshalBinary(buf); err != nil {
t.Fatal(err)
} else if v := other.Sources[0].(*influxql.Measurement).Regex.Val.String(); v != `/series.+/` {
} else if v := other.Sources[0].(*influxql.Measurement).Regex.Val.String(); v != `series.+` {
t.Fatalf("unexpected measurement regex: %s", v)
}
}
Expand Down