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

Merge pull request #3360 from influxdb/Name_to_name 

Correct JSON tag name
pull/3361/head
Philip O'Toole 2015-07-16 21:41:57 -07:00
parent 6402079808 a1ac8e49cc
commit dfdffb6401
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsdb/mapper.go
View File

@ -23,7 +23,7 @@ func (a rawMapperValues) Less(i, j int) bool { return a[i].Time < a[j].Time }
func (a rawMapperValues) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
type rawMapperOutput struct {
Name string `json:"Name,omitempty"`
Name string `json:"name,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
Values rawMapperValues `json:"values,omitempty"`
}

28
tsdb/mapper_test.go
View File

@ -109,38 +109,38 @@ func TestShardMapper_WriteAndSingleMapperRawQuery(t *testing.T) {
}{
{
stmt: `SELECT value FROM cpu`,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu`,
chunkSize: 1,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42}]}`, `{"Name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42}]}`, `{"name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu`,
chunkSize: 2,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`},
},
{
stmt: `SELECT value FROM cpu`,
chunkSize: 3,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`},
},
{
stmt: `SELECT value FROM cpu GROUP BY host`,
expected: []string{`{"Name":"cpu","tags":{"host":"serverA"},"values":[{"time":1000000000,"value":42}]}`, `{"Name":"cpu","tags":{"host":"serverB"},"values":[{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","tags":{"host":"serverA"},"values":[{"time":1000000000,"value":42}]}`, `{"name":"cpu","tags":{"host":"serverB"},"values":[{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu GROUP BY region`,
expected: []string{`{"Name":"cpu","tags":{"region":"us-east"},"values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","tags":{"region":"us-east"},"values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu WHERE host='serverA'`,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu WHERE host='serverB'`,
expected: []string{`{"Name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu WHERE host='serverC'`,
@ -148,19 +148,19 @@ func TestShardMapper_WriteAndSingleMapperRawQuery(t *testing.T) {
},
{
stmt: `SELECT value FROM cpu WHERE value = 60`,
expected: []string{`{"Name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT value FROM cpu WHERE value != 60`,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42}]}`, `null`},
},
{
stmt: fmt.Sprintf(`SELECT value FROM cpu WHERE time = '%s'`, pt1time.Format(influxql.DateTimeFormat)),
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42}]}`, `null`},
},
{
stmt: fmt.Sprintf(`SELECT value FROM cpu WHERE time > '%s'`, pt1time.Format(influxql.DateTimeFormat)),
expected: []string{`{"Name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: fmt.Sprintf(`SELECT value FROM cpu WHERE time > '%s'`, pt2time.Format(influxql.DateTimeFormat)),
@ -213,11 +213,11 @@ func TestShardMapper_WriteAndSingleMapperRawQueryMultiValue(t *testing.T) {
}{
{
stmt: `SELECT foo FROM cpu`,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":42},{"time":2000000000,"value":60}]}`, `null`},
},
{
stmt: `SELECT foo,bar FROM cpu`,
expected: []string{`{"Name":"cpu","values":[{"time":1000000000,"value":{"bar":43,"foo":42}},{"time":2000000000,"value":{"bar":61,"foo":60}}]}`, `null`},
expected: []string{`{"name":"cpu","values":[{"time":1000000000,"value":{"bar":43,"foo":42}},{"time":2000000000,"value":{"bar":61,"foo":60}}]}`, `null`},
},
}