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

fix(storage): Sort keys were incorrectly sorted when concatenated 

This manifested as incorrect sort ordering when serialized via RPC,
resulting in an `invalid partition key order` error.

This fix introduces a delimiter to ensure sort keys cannot collide.
pull/13743/head
Stuart Carnie 2019-05-01 13:37:28 -07:00
parent 050c6e35c5
commit d858bd6f77
No known key found for this signature in database
GPG Key ID: 848D9C9718D78B4F
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/reads/group_resultset.go
View File

@ -244,7 +244,7 @@ func groupBySort(g *groupResultSet) (int, error) {
nr.SeriesTags = tagsBuf.copyTags(nr.SeriesTags)
nr.Tags = tagsBuf.copyTags(nr.Tags)
l := 0
l := len(g.keys) // for sort key separators
for i, k := range g.keys {
vals[i] = nr.Tags.Get(k)
if len(vals[i]) == 0 {
@ -256,6 +256,7 @@ func groupBySort(g *groupResultSet) (int, error) {
nr.SortKey = make([]byte, 0, l)
for _, v := range vals {
nr.SortKey = append(nr.SortKey, v...)
nr.SortKey = append(nr.SortKey, ',')
}
rows = append(rows, &nr)

43
storage/reads/group_resultset_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/influxdata/influxdb/storage/reads/datatypes"
)
func TestGroupGroupResultSetSorting(t *testing.T) {
func TestNewGroupResultSet_Sorting(t *testing.T) {
tests := []struct {
name string
cur reads.SeriesCursor
@ -49,6 +49,40 @@ group:
partition key: val12
series: _m=cpu,tag0=val00,tag1=val12
series: _m=cpu,tag0=val01,tag1=val12
`,
},
{
name: "group by tags key collision",
cur: &sliceSeriesCursor{
rows: newSeriesRows(
"cpu,tag0=000,tag1=111",
"cpu,tag0=00,tag1=0111",
"cpu,tag0=0,tag1=00111",
"cpu,tag0=0001,tag1=11",
"cpu,tag0=00011,tag1=1",
)},
group: datatypes.GroupBy,
keys: []string{"tag0","tag1"},
exp: `group:
tag key : _m,tag0,tag1
partition key: 0,00111
series: _m=cpu,tag0=0,tag1=00111
group:
tag key : _m,tag0,tag1
partition key: 00,0111
series: _m=cpu,tag0=00,tag1=0111
group:
tag key : _m,tag0,tag1
partition key: 000,111
series: _m=cpu,tag0=000,tag1=111
group:
tag key : _m,tag0,tag1
partition key: 0001,11
series: _m=cpu,tag0=0001,tag1=11
group:
tag key : _m,tag0,tag1
partition key: 00011,1
series: _m=cpu,tag0=00011,tag1=1
`,
},
{
@ -231,7 +265,7 @@ func TestNewGroupResultSet_GroupBy_NoDataReturnsNil(t *testing.T) {
}
}
func TestNewGroupResultSet_Sorting(t *testing.T) {
func TestNewGroupResultSet_SortOrder(t *testing.T) {
tests := []struct {
name string
keys []string
@ -378,8 +412,11 @@ func BenchmarkNewGroupResultSet_GroupBy(b *testing.B) {
b.ResetTimer()
b.ReportAllocs()
var hints datatypes.HintFlags
hints.SetHintSchemaAllTime()
for i := 0; i < b.N; i++ {
rs := reads.NewGroupResultSet(context.Background(), &datatypes.ReadGroupRequest{Group: datatypes.GroupBy, GroupKeys: []string{"tag2"}}, newCursor)
rs := reads.NewGroupResultSet(context.Background(), &datatypes.ReadGroupRequest{Group: datatypes.GroupBy, GroupKeys: []string{"tag2"}, Hints: hints}, newCursor)
rs.Close()
}
}