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

ExplodePoints now complies with new keys

pull/12391/head
Edd Robinson 2019-03-04 13:58:54 +00:00
parent 9949fef2a5
commit 1cb20b654d
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tsdb/explode.go
View File

@ -34,10 +34,11 @@ func ExplodePoints(org, bucket platform.ID, points []models.Point) ([]models.Poi
ob := EncodeName(org, bucket)
name := string(ob[:])
tags := make(models.Tags, 2)
tags := make(models.Tags, 1)
for _, pt := range points {
tags = tags[:2]
tags[1] = models.NewTag(models.MeasurementTagKeyBytes, pt.Name())
tags = tags[:1] // reset buffer for next point.
tags[0] = models.NewTag(models.MeasurementTagKeyBytes, pt.Name())
pt.ForEachTag(func(k, v []byte) bool {
tags = append(tags, models.NewTag(k, v))
return true
@ -45,8 +46,10 @@ func ExplodePoints(org, bucket platform.ID, points []models.Point) ([]models.Poi
t := pt.Time()
itr := pt.FieldIterator()
tags = append(tags, models.Tag{}) // Make room for
for itr.Next() {
tags[0] = models.NewTag(models.FieldKeyTagKeyBytes, itr.FieldKey())
tags[len(tags)-1] = models.NewTag(models.FieldKeyTagKeyBytes, itr.FieldKey())
var err error
field := make(models.Fields, 1)

18
tsdb/explode_test.go
View File

@ -70,15 +70,15 @@ func TestExplodePoints(t *testing.T) {
sort.Strings(lines)
expected := []string{
`OOOOOOOOBBBBBBBB,_f=f1,_m=cpu,t1=a,t2=q f1=5 9`,
`OOOOOOOOBBBBBBBB,_f=f1,_m=mem,t1=b,t2=w f1=6 8`,
`OOOOOOOOBBBBBBBB,_f=f1,_m=mem,t1=d,t2=r,t4=g f1=8 6`,
`OOOOOOOOBBBBBBBB,_f=f2,_m=cpu,t1=a,t2=q f2="f" 9`,
`OOOOOOOOBBBBBBBB,_f=f2,_m=mem,t1=b,t2=w f2="g" 8`,
`OOOOOOOOBBBBBBBB,_f=f2,_m=mem,t1=d,t2=r,t4=g f2="i" 6`,
`OOOOOOOOBBBBBBBB,_f=f3,_m=cpu,t1=c,t3=e f3=7 7`,
`OOOOOOOOBBBBBBBB,_f=f3,_m=mem,t1=b,t2=w f3=true 8`,
`OOOOOOOOBBBBBBBB,_f=f4,_m=cpu,t1=c,t3=e f4="h" 7`,
"OOOOOOOOBBBBBBBB,\x00=cpu,t1=a,t2=q,\xff=f1 f1=5 9",
"OOOOOOOOBBBBBBBB,\x00=cpu,t1=a,t2=q,\xff=f2 f2=\"f\" 9",
"OOOOOOOOBBBBBBBB,\x00=cpu,t1=c,t3=e,\xff=f3 f3=7 7",
"OOOOOOOOBBBBBBBB,\x00=cpu,t1=c,t3=e,\xff=f4 f4=\"h\" 7",
"OOOOOOOOBBBBBBBB,\x00=mem,t1=b,t2=w,\xff=f1 f1=6 8",
"OOOOOOOOBBBBBBBB,\x00=mem,t1=b,t2=w,\xff=f2 f2=\"g\" 8",
"OOOOOOOOBBBBBBBB,\x00=mem,t1=b,t2=w,\xff=f3 f3=true 8",
"OOOOOOOOBBBBBBBB,\x00=mem,t1=d,t2=r,t4=g,\xff=f1 f1=8 6",
"OOOOOOOOBBBBBBBB,\x00=mem,t1=d,t2=r,t4=g,\xff=f2 f2=\"i\" 6",
}
if !reflect.DeepEqual(lines, expected) {