github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

vmctl: explicitly set ::tag type for labels selector in influx mode (#1310)

Browse source 
The `::tag` type is needed in cases when field and tag names are equal, which
results into unexpected results in InfluxQL. Setting the type explicitly helps
InfluxDB to understand which exact column we apply filter to.

https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1299
This commit is contained in:
Roman Khavronenko 2021-05-20 10:03:16 +01:00 committed by Aliaksandr Valialkin
parent 2cc5567ab8
commit 12d0c6b6e0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/vmctl/influx/influx.go
View file

@ -61,7 +61,7 @@ func (s Series) fetchQuery(timeFilter string) string {
} }
for i, pair := range s.LabelPairs { for i, pair := range s.LabelPairs {
pairV := valueEscaper.Replace(pair.Value) pairV := valueEscaper.Replace(pair.Value)
fmt.Fprintf(f, " %q='%s'", pair.Name, pairV) fmt.Fprintf(f, " %q::tag='%s'", pair.Name, pairV)
if i != len(s.LabelPairs)-1 { if i != len(s.LabelPairs)-1 {
f.WriteString(" and") f.WriteString(" and")
} }

8
app/vmctl/influx/influx_test.go
View file

@ -19,7 +19,7 @@ func TestFetchQuery(t *testing.T) {
}, },
}, },
}, },
expected: `select "value" from "cpu" where "foo"='bar'`, expected: `select "value" from "cpu" where "foo"::tag='bar'`,
}, },
{ {
s: Series{ s: Series{
@ -36,7 +36,7 @@ func TestFetchQuery(t *testing.T) {
}, },
}, },
}, },
expected: `select "value" from "cpu" where "foo"='bar' and "baz"='qux'`, expected: `select "value" from "cpu" where "foo"::tag='bar' and "baz"::tag='qux'`,
}, },
{ {
s: Series{ s: Series{
@ -50,7 +50,7 @@ func TestFetchQuery(t *testing.T) {
}, },
}, },
timeFilter: "time >= now()", timeFilter: "time >= now()",
expected: `select "value" from "cpu" where "foo"='b\'ar' and time >= now()`, expected: `select "value" from "cpu" where "foo"::tag='b\'ar' and time >= now()`,
}, },
{ {
s: Series{ s: Series{
@ -68,7 +68,7 @@ func TestFetchQuery(t *testing.T) {
}, },
}, },
timeFilter: "time >= now()", timeFilter: "time >= now()",
expected: `select "value" from "cpu" where "name"='dev-mapper-centos\\x2dswap.swap' and "state"='dev-mapp\'er-c\'en\'tos' and time >= now()`, expected: `select "value" from "cpu" where "name"::tag='dev-mapper-centos\\x2dswap.swap' and "state"::tag='dev-mapp\'er-c\'en\'tos' and time >= now()`,
}, },
{ {
s: Series{ s: Series{