Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request from influxdata/js-cache-panic-fix 

Truncate the slice when merging the caches
pull/6919/head
Jonathan A. Sternberg 2016-07-05 12:28:44 -05:00 committed by GitHub
parent e19cc044ac 2f82d9a525
commit 51954a08a9
2 changed files with 3 additions and 1 deletions
tsdb/engine/tsm1

3
CHANGELOG.md
View File

@ -79,7 +79,8 @@ 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 - [#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 - [#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. - [#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. - [#6934](https://github.com/influxdata/influxdb/pull/6934): Fix regex binary encoding for a measurement.
- [#6942](https://github.com/influxdata/influxdb/pull/6942): Fix panic: truncate the slice when merging the caches.
## v0.13.0 [2016-05-12] ## v0.13.0 [2016-05-12]

1
tsdb/engine/tsm1/cache.go
View File

@ -419,6 +419,7 @@ func (c *Cache) merged(key string) Values {
n += copy(values[n:], e.values) n += copy(values[n:], e.values)
e.mu.RUnlock() e.mu.RUnlock()
} }
values = values[:n]
if needSort { if needSort {
values = values.Deduplicate() values = values.Deduplicate()