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

Fix rebase

pull/4956/head
Jason Wilder 2015-12-02 09:47:16 -07:00
parent 751d1dd467
commit 6847a6ba0c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,7 @@ func (c *Cache) ValuesRange(key string, min, max uint64) Values {
if values == nil { if values == nil {
return nil return nil
} }
return values.Deduplicate() return values.Deduplicate(true)
} }
// evict instructs the cache to evict data up to and including the current checkpoint. // evict instructs the cache to evict data up to and including the current checkpoint.

4
tsdb/engine/tsm1/compact.go
View File

@ -403,7 +403,7 @@ func (m *MergeIterator) Next() bool {
} }
if dedup { if dedup {
m.values = Values(m.values).Deduplicate() m.values = Values(m.values).Deduplicate(true)
} }
// We need to find the index of the min and max values that are within // We need to find the index of the min and max values that are within
@ -643,7 +643,7 @@ func (k *tsmKeyIterator) Next() bool {
} else if values[len(values)-1].Time().Before(existing[0].Time()) { } else if values[len(values)-1].Time().Before(existing[0].Time()) {
k.values[key] = append(values, existing...) k.values[key] = append(values, existing...)
} else { } else {
k.values[key] = Values(append(existing, values...)).Deduplicate() k.values[key] = Values(append(existing, values...)).Deduplicate(true)
} }
} }
} }