IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Fix an edge case while parsing table response (#78802)

Browse Source 
* Prepare the test files

* use json files everywhere

* update golden json files

* disable update

* update test file

* fix naming

* lint

* InfluxDB: Add metadata information to first frame only (#78664)

* executedString in first frame only

* lint

* fix tests

* update tests

* don't update

* linting

* update

* update again

* handle nil values

* append in the right array

* add comments

* remove redundant if condition
This commit is contained in:
ismail simsek 2023-12-01 18:31:49 +01:00 committed by GitHub
parent ab0ef5276f
commit 2b0e7afb4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 2520 additions and 1588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/tsdb/influxdb/influxql/response_parser.go
View File

@ -138,6 +138,15 @@ func newValueFields(rows []models.Row, labels data.Labels, colIdxStart, colIdxEn
case "string":
value, ok := valuePair[colIdx].(string)
if ok {
// we handle null values by adding nil to floatArray
// if then we see the valueField should be a sting field
// we append those nil elements into the stringArray
// then we clear the floatArray
// these steps are necessary for the responses like in string_column_with_null_value.json
for range floatArray {
stringArray = append(stringArray, nil)
}
floatArray = nil
stringArray = append(stringArray, &value)
} else {
stringArray = append(stringArray, nil)
@ -148,12 +157,37 @@ func newValueFields(rows []models.Row, labels data.Labels, colIdxStart, colIdxEn
case "bool":
value, ok := valuePair[colIdx].(bool)
if ok {
// we handle null values by adding nil to floatArray
// if then we see the valueField should be a bool field
// we append those nil elements into the boolArray
// then we clear the floatArray
for range floatArray {
boolArray = append(boolArray, nil)
}
floatArray = nil
boolArray = append(boolArray, &value)
} else {
boolArray = append(boolArray, nil)
}
case "null":
floatArray = append(floatArray, nil)
// If there is already a valueField, instead of adding nil to floatArray
// we add nil to the valueField and to the array of valueField constructed from
if valueField != nil {
valueFieldType := valueField.Type()
switch valueFieldType {
case data.FieldTypeNullableString:
stringArray = append(stringArray, nil)
case data.FieldTypeNullableBool:
boolArray = append(boolArray, nil)
default:
floatArray = append(floatArray, nil)
}
valueField.Append(nil)
} else {
// If there is no valueField created before we add the nil value to floatArray
// when we have the real value of the field these will be appended to the field
floatArray = append(floatArray, nil)
}
}
}
@ -165,7 +199,9 @@ func newValueFields(rows []models.Row, labels data.Labels, colIdxStart, colIdxEn
case "bool":
valueField = data.NewField(row.Columns[colIdx], labels, boolArray)
case "null":
valueField = data.NewField(row.Columns[colIdx], labels, floatArray)
if valueField == nil {
valueField = data.NewField(row.Columns[colIdx], labels, floatArray)
}
}
valueField.SetConfig(&data.FieldConfig{DisplayNameFromDS: row.Columns[colIdx]})

4
pkg/tsdb/influxdb/influxql/response_parser_test.go
View File

@ -55,7 +55,9 @@ var testFiles = []string{
"retention_policy",
"simple_response_with_diverse_data_types",
"multiple_measurements",
// "many_columns", skipped for now
"string_column_with_null_value",
"string_column_with_null_value2",
"many_columns",
"response_with_nil_bools_and_nil_strings",
"invalid_value_format",
}

2
pkg/tsdb/influxdb/influxql/testdata/many_columns.json vendored
View File

@ -1 +1 @@
{"results":[{"statement_id":0,"series":[{"name":"series_name","tags":{"series_tag_1":"-248","series_tag_2":"3167640"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"589051IR",1678734134503,"",16.726718841369227,null,null,53,null,48.72,null,null,null,null,"BYOD",null,null]]},{"name":"series_name","tags":{"series_tag_1":"-258","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"tertggdfs",1678734188679,"",23.432988173518233,null,null,64,null,70.92,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-28","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-28","series_tag_2":"2249908"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"ASDWQ234",1678734167565,"",10.772527844239201,null,null,25,null,58.33,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-327","series_tag_2":"3415374"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"123SDQWE",1678734222642,"ADSADS",40.61198862661182,null,null,33,null,51.41,null,null,null,null,"SCCM",null,null]]},{"name":"series_name","tags":{"series_tag_1":"-331","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"-331","series_tag_2":"2191438"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"SDF32R",1678734212872,"",15.267734587695077,null,null,43,null,58.43,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"0","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_1":"00-00-00-08-1E-0C","series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]}]}]}
{"results":[{"statement_id":0,"series":[{"name":"series_name","tags":{"series_tag_2":"3167640"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"589051IR",1678734134503,"",16.726718841369227,null,null,53,null,48.72,null,null,null,null,"BYOD",null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"tertggdfs",1678734188679,"",23.432988173518233,null,null,64,null,70.92,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"2249908"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"ASDWQ234",1678734167565,"",10.772527844239201,null,null,25,null,58.33,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"3415374"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"123SDQWE",1678734222642,"ADSADS",40.61198862661182,null,null,33,null,51.41,null,null,null,null,"SCCM",null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"2191438"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,"SDF32R",1678734212872,"",15.267734587695077,null,null,43,null,58.43,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]},{"name":"series_name","tags":{"series_tag_2":"0"},"columns":["time","col_1_name","timestamp","c_name","mem_used","dbytes","ubytes","dused","jitter","free","late","core","ploss","idletime","sol","isp","vpn"],"values":[[1678723623474,null,null,"Unknown",null,null,null,null,null,null,null,null,null,null,null,null,null]]}]}]}

446
pkg/tsdb/influxdb/influxql/testdata/many_columns.table.golden.jsonc vendored Normal file
View File

@ -0,0 +1,446 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0] {
// "typeVersion": [
// 0,
// 0
// ],
// "preferredVisualisationType": "table",
// "executedQueryString": "Test raw query"
// }
// Name: series_name
// Dimensions: 18 Fields by 9 Rows
// +-----------------------------------+--------------------+------------------+--------------------+-----------------+--------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+-----------------+------------------+------------------+
// | Name: Time | Name: series_tag_2 | Name: col_1_name | Name: timestamp | Name: c_name | Name: mem_used | Name: dbytes | Name: ubytes | Name: dused | Name: jitter | Name: free | Name: late | Name: core | Name: ploss | Name: idletime | Name: sol | Name: isp | Name: vpn |
// | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []time.Time | Type: []*string | Type: []*string | Type: []*float64 | Type: []*string | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*float64 | Type: []*string | Type: []*float64 | Type: []*float64 |
// +-----------------------------------+--------------------+------------------+--------------------+-----------------+--------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+-----------------+------------------+------------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | 3167640 | 589051IR | 1.678734134503e+12 | | 16.726718841369227 | null | null | 53 | null | 48.72 | null | null | null | null | BYOD | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 0 | tertggdfs | 1.678734188679e+12 | | 23.432988173518233 | null | null | 64 | null | 70.92 | null | null | null | null | null | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 0 | null | null | Unknown | null | null | null | null | null | null | null | null | null | null | null | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 2249908 | ASDWQ234 | 1.678734167565e+12 | | 10.772527844239201 | null | null | 25 | null | 58.33 | null | null | null | null | null | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 3415374 | 123SDQWE | 1.678734222642e+12 | ADSADS | 40.61198862661182 | null | null | 33 | null | 51.41 | null | null | null | null | SCCM | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 0 | null | null | Unknown | null | null | null | null | null | null | null | null | null | null | null | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 2191438 | SDF32R | 1.678734212872e+12 | | 15.267734587695077 | null | null | 43 | null | 58.43 | null | null | null | null | null | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 0 | null | null | Unknown | null | null | null | null | null | null | null | null | null | null | null | null | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | 0 | null | null | Unknown | null | null | null | null | null | null | null | null | null | null | null | null | null |
// +-----------------------------------+--------------------+------------------+--------------------+-----------------+--------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+------------------+-----------------+------------------+------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"name": "series_name",
"meta": {
"typeVersion": [
0,
0
],
"preferredVisualisationType": "table",
"executedQueryString": "Test raw query"
},
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "series_tag_2",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"config": {
"displayNameFromDS": "series_tag_2"
}
},
{
"name": "col_1_name",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"config": {
"displayNameFromDS": "col_1_name"
}
},
{
"name": "timestamp",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "timestamp"
}
},
{
"name": "c_name",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"config": {
"displayNameFromDS": "c_name"
}
},
{
"name": "mem_used",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "mem_used"
}
},
{
"name": "dbytes",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "dbytes"
}
},
{
"name": "ubytes",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "ubytes"
}
},
{
"name": "dused",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "dused"
}
},
{
"name": "jitter",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "jitter"
}
},
{
"name": "free",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "free"
}
},
{
"name": "late",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "late"
}
},
{
"name": "core",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "core"
}
},
{
"name": "ploss",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "ploss"
}
},
{
"name": "idletime",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "idletime"
}
},
{
"name": "sol",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"config": {
"displayNameFromDS": "sol"
}
},
{
"name": "isp",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "isp"
}
},
{
"name": "vpn",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"config": {
"displayNameFromDS": "vpn"
}
}
]
},
"data": {
"values": [
[
1678723623474,
1678723623474,
1678723623474,
1678723623474,
1678723623474,
1678723623474,
1678723623474,
1678723623474,
1678723623474
],
[
"3167640",
"0",
"0",
"2249908",
"3415374",
"0",
"2191438",
"0",
"0"
],
[
"589051IR",
"tertggdfs",
null,
"ASDWQ234",
"123SDQWE",
null,
"SDF32R",
null,
null
],
[
1678734134503,
1678734188679,
null,
1678734167565,
1678734222642,
null,
1678734212872,
null,
null
],
[
"",
"",
"Unknown",
"",
"ADSADS",
"Unknown",
"",
"Unknown",
"Unknown"
],
[
16.726718841369227,
23.432988173518233,
null,
10.772527844239201,
40.61198862661182,
null,
15.267734587695077,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
53,
64,
null,
25,
33,
null,
43,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
48.72,
70.92,
null,
58.33,
51.41,
null,
58.43,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
"BYOD",
null,
null,
null,
"SCCM",
null,
null,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
],
[
null,
null,
null,
null,
null,
null,
null,
null,
null
]
]
}
}
]
}

3024
pkg/tsdb/influxdb/influxql/testdata/many_columns.time_series.golden.jsonc vendored
View File

File diff suppressed because it is too large Load Diff

51
pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.json vendored Normal file
View File

@ -0,0 +1,51 @@
{
"results": [
{
"statement_id": 0,
"series": [
{
"name": "series_name",
"tags": {},
"columns": [
"time",
"col_1_name"
],
"values": [
[
1678723623474,
"589051IR"
]
]
},
{
"name": "series_name",
"tags": {},
"columns": [
"time",
"col_1_name"
],
"values": [
[
1678723623474,
null
]
]
},
{
"name": "series_name",
"tags": {},
"columns": [
"time",
"col_1_name"
],
"values": [
[
1678723623474,
null
]
]
}
]
}
]
}

76
pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.table.golden.jsonc vendored Normal file
View File

@ -0,0 +1,76 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0] {
// "typeVersion": [
// 0,
// 0
// ],
// "preferredVisualisationType": "table",
// "executedQueryString": "Test raw query"
// }
// Name: series_name
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: col_1_name |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*string |
// +-----------------------------------+------------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | 589051IR |
// | 2023-03-13 16:07:03.474 +0000 UTC | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | null |
// +-----------------------------------+------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"name": "series_name",
"meta": {
"typeVersion": [
0,
0
],
"preferredVisualisationType": "table",
"executedQueryString": "Test raw query"
},
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "col_1_name",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"config": {
"displayNameFromDS": "col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474,
1678723623474,
1678723623474
],
[
"589051IR",
null,
null
]
]
}
}
]
}

169
pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value.time_series.golden.jsonc vendored Normal file
View File

@ -0,0 +1,169 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0] {
// "typeVersion": [
// 0,
// 0
// ],
// "preferredVisualisationType": "graph",
// "executedQueryString": "Test raw query"
// }
// Name: series_name.col_1_name
// Dimensions: 2 Fields by 1 Rows
// +-----------------------------------+-----------------+
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*string |
// +-----------------------------------+-----------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | 589051IR |
// +-----------------------------------+-----------------+
//
//
//
// Frame[1]
// Name: series_name.col_1_name
// Dimensions: 2 Fields by 1 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*float64 |
// +-----------------------------------+------------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | null |
// +-----------------------------------+------------------+
//
//
//
// Frame[2]
// Name: series_name.col_1_name
// Dimensions: 2 Fields by 1 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*float64 |
// +-----------------------------------+------------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | null |
// +-----------------------------------+------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"name": "series_name.col_1_name",
"meta": {
"typeVersion": [
0,
0
],
"preferredVisualisationType": "graph",
"executedQueryString": "Test raw query"
},
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "Value",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "series_name.col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474
],
[
"589051IR"
]
]
}
},
{
"schema": {
"name": "series_name.col_1_name",
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "series_name.col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474
],
[
null
]
]
}
},
{
"schema": {
"name": "series_name.col_1_name",
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "series_name.col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474
],
[
null
]
]
}
}
]
}

51
pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.json vendored Normal file
View File

@ -0,0 +1,51 @@
{
"results": [
{
"statement_id": 0,
"series": [
{
"name": "series_name",
"tags": {},
"columns": [
"time",
"col_1_name"
],
"values": [
[
1678723623474,
null
]
]
},
{
"name": "series_name",
"tags": {},
"columns": [
"time",
"col_1_name"
],
"values": [
[
1678723623474,
"someval"
]
]
},
{
"name": "series_name",
"tags": {},
"columns": [
"time",
"col_1_name"
],
"values": [
[
1678723623474,
"anotherval"
]
]
}
]
}
]
}

76
pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.table.golden.jsonc vendored Normal file
View File

@ -0,0 +1,76 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0] {
// "typeVersion": [
// 0,
// 0
// ],
// "preferredVisualisationType": "table",
// "executedQueryString": "Test raw query"
// }
// Name: series_name
// Dimensions: 2 Fields by 3 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: col_1_name |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*string |
// +-----------------------------------+------------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | null |
// | 2023-03-13 16:07:03.474 +0000 UTC | someval |
// | 2023-03-13 16:07:03.474 +0000 UTC | anotherval |
// +-----------------------------------+------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"name": "series_name",
"meta": {
"typeVersion": [
0,
0
],
"preferredVisualisationType": "table",
"executedQueryString": "Test raw query"
},
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "col_1_name",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"config": {
"displayNameFromDS": "col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474,
1678723623474,
1678723623474
],
[
null,
"someval",
"anotherval"
]
]
}
}
]
}

169
pkg/tsdb/influxdb/influxql/testdata/string_column_with_null_value2.time_series.golden.jsonc vendored Normal file
View File

@ -0,0 +1,169 @@
// 🌟 This was machine generated. Do not edit. 🌟
//
// Frame[0] {
// "typeVersion": [
// 0,
// 0
// ],
// "preferredVisualisationType": "graph",
// "executedQueryString": "Test raw query"
// }
// Name: series_name.col_1_name
// Dimensions: 2 Fields by 1 Rows
// +-----------------------------------+------------------+
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*float64 |
// +-----------------------------------+------------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | null |
// +-----------------------------------+------------------+
//
//
//
// Frame[1]
// Name: series_name.col_1_name
// Dimensions: 2 Fields by 1 Rows
// +-----------------------------------+-----------------+
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*string |
// +-----------------------------------+-----------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | someval |
// +-----------------------------------+-----------------+
//
//
//
// Frame[2]
// Name: series_name.col_1_name
// Dimensions: 2 Fields by 1 Rows
// +-----------------------------------+-----------------+
// | Name: Time | Name: Value |
// | Labels: | Labels: |
// | Type: []time.Time | Type: []*string |
// +-----------------------------------+-----------------+
// | 2023-03-13 16:07:03.474 +0000 UTC | anotherval |
// +-----------------------------------+-----------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
{
"status": 200,
"frames": [
{
"schema": {
"name": "series_name.col_1_name",
"meta": {
"typeVersion": [
0,
0
],
"preferredVisualisationType": "graph",
"executedQueryString": "Test raw query"
},
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "Value",
"type": "number",
"typeInfo": {
"frame": "float64",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "series_name.col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474
],
[
null
]
]
}
},
{
"schema": {
"name": "series_name.col_1_name",
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "Value",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "series_name.col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474
],
[
"someval"
]
]
}
},
{
"schema": {
"name": "series_name.col_1_name",
"fields": [
{
"name": "Time",
"type": "time",
"typeInfo": {
"frame": "time.Time"
}
},
{
"name": "Value",
"type": "string",
"typeInfo": {
"frame": "string",
"nullable": true
},
"labels": {},
"config": {
"displayNameFromDS": "series_name.col_1_name"
}
}
]
},
"data": {
"values": [
[
1678723623474
],
[
"anotherval"
]
]
}
}
]
}