-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: upgrade influxql to latest version & fix predicate handling for …
…show tag values metaqueries (#22500) * feat: Add WITH KEY to show tag keys * fix: add tests for multi measurement tag value queries * chore: fix linter problems * chore: revert influxql changes to keep WITH KEY disabled * chore: add TODO for moving flux tests to flux repo Co-authored-by: Sam Arnold <sarnold@influxdata.com>
- Loading branch information
1 parent
33afff3
commit 1f66b31
Showing
7 changed files
with
240 additions
and
384 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
query/stdlib/influxdata/influxdb/tag_values_measurement_or_predicate_test.flux
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // TODO(whb): These tests should get ported to the flux repo and removed here | ||
| // when they are included with a flux release that InfluxDB uses to remove the | ||
| // redundancy. | ||
|
|
||
| package influxdb_test | ||
|
|
||
| import "csv" | ||
| import "testing" | ||
| import "testing/expect" | ||
|
|
||
| option now = () => 2030-01-01T00:00:00Z | ||
|
|
||
| input = " | ||
| #group,false,false,false,false,true,true,true,true,true,true,true | ||
| #datatype,string,long,dateTime:RFC3339,long,string,string,string,string,string,string,string | ||
| #default,_result,,,,,,,,,, | ||
| ,result,table,_time,_value,_field,_measurement,device,fstype,host,mode,path | ||
| ,,0,2020-10-21T20:48:30Z,4881964326,inodes_free,disk,disk1s5,apfs,euterpe.local,ro,/ | ||
| ,,0,2020-10-21T20:48:40Z,4881964326,inodes_free,disk,disk1s5,apfs,euterpe.local,ro,/ | ||
| ,,0,2020-10-21T20:48:50Z,4881964326,inodes_free,disk,disk1s5,apfs,euterpe.local,ro,/ | ||
| ,,1,2020-10-21T20:48:30Z,4294963701,inodes_free,disk,disk2s1,hfs,euterpe.local,ro,/Volumes/IntelliJ IDEA CE | ||
| ,,1,2020-10-21T20:48:40Z,4294963701,inodes_free,disk,disk2s1,hfs,euterpe.local,ro,/Volumes/IntelliJ IDEA CE | ||
| ,,1,2020-10-21T20:48:50Z,4294963701,inodes_free,disk,disk2s1,hfs,euterpe.local,ro,/Volumes/IntelliJ IDEA CE | ||
| ,,2,2020-10-21T20:48:30Z,488514,inodes_used,disk,disk1s5,apfs,euterpe.local,ro,/ | ||
| ,,2,2020-10-21T20:48:40Z,488514,inodes_used,disk,disk1s5,apfs,euterpe.local,ro,/ | ||
| ,,2,2020-10-21T20:48:50Z,488514,inodes_used,disk,disk1s5,apfs,euterpe.local,ro,/ | ||
| ,,3,2020-10-21T20:48:30Z,3578,inodes_used,disk,disk2s1,hfs,euterpe.local,ro,/Volumes/IntelliJ IDEA CE | ||
| ,,3,2020-10-21T20:48:40Z,3578,inodes_used,disk,disk2s1,hfs,euterpe.local,ro,/Volumes/IntelliJ IDEA CE | ||
| ,,3,2020-10-21T20:48:50Z,3578,inodes_used,disk,disk2s1,hfs,euterpe.local,ro,/Volumes/IntelliJ IDEA CE | ||
|
|
||
| #group,false,false,false,false,true,true,true,true,true | ||
| #datatype,string,long,dateTime:RFC3339,double,string,string,string,string,string | ||
| #default,_result,,,,,,,, | ||
| ,result,table,_time,_value,_field,_measurement,cpu,host,region | ||
| ,,4,2020-10-21T20:48:30Z,69.30000000167638,usage_idle,cpu,cpu0,euterpe.local,south | ||
| ,,4,2020-10-21T20:48:40Z,67.36736736724372,usage_idle,cpu,cpu0,euterpe.local,south | ||
| ,,4,2020-10-21T20:48:50Z,69.23076923005354,usage_idle,cpu,cpu0,euterpe.local,south | ||
| ,,5,2020-10-21T20:48:30Z,96.10000000102445,usage_idle,cpu,cpu1,euterpe.local,south | ||
| ,,5,2020-10-21T20:48:40Z,95.70000000055181,usage_idle,cpu,cpu1,euterpe.local,south | ||
| ,,5,2020-10-21T20:48:50Z,95.89999999860534,usage_idle,cpu,cpu1,euterpe.local,south | ||
|
|
||
| #group,false,false,false,false,true,true,true,true,true | ||
| #datatype,string,long,dateTime:RFC3339,double,string,string,string,string,string | ||
| #default,_result,,,,,,,, | ||
| ,result,table,_time,_value,_field,_measurement,cpu,host,region | ||
| ,,6,2020-10-21T20:48:30Z,69.30000000167638,usage_idle,cpu,cpu0,mnemosyne.local,east | ||
| ,,6,2020-10-21T20:48:40Z,67.36736736724372,usage_idle,cpu,cpu0,mnemosyne.local,east | ||
| ,,6,2020-10-21T20:48:50Z,69.23076923005354,usage_idle,cpu,cpu0,mnemosyne.local,east | ||
| ,,7,2020-10-21T20:48:30Z,96.10000000102445,usage_idle,cpu,cpu1,mnemosyne.local,east | ||
| ,,7,2020-10-21T20:48:40Z,95.70000000055181,usage_idle,cpu,cpu1,mnemosyne.local,east | ||
| ,,7,2020-10-21T20:48:50Z,95.89999999860534,usage_idle,cpu,cpu1,mnemosyne.local,east | ||
|
|
||
| #group,false,false,true,true,false,false,true,true,true | ||
| #datatype,string,long,string,string,dateTime:RFC3339,double,string,string,string | ||
| #default,_result,,,,,,,, | ||
| ,result,table,_field,_measurement,_time,_value,cpu,host,region | ||
| ,,8,usage_user,cpu,2020-10-21T20:48:30Z,19.30000000007567,cpu0,euterpe.local,north | ||
| ,,8,usage_user,cpu,2020-10-21T20:48:40Z,20.020020020038682,cpu0,euterpe.local,north | ||
| ,,8,usage_user,cpu,2020-10-21T20:48:50Z,18.581418581407107,cpu0,euterpe.local,north | ||
| ,,9,usage_user,cpu,2020-10-21T20:48:30Z,2.3000000000138243,cpu1,euterpe.local,north | ||
| ,,9,usage_user,cpu,2020-10-21T20:48:40Z,2.4000000000536965,cpu1,euterpe.local,north | ||
| ,,9,usage_user,cpu,2020-10-21T20:48:50Z,2.0999999999423746,cpu1,euterpe.local,north | ||
| " | ||
|
|
||
| testcase tag_values_measurement_or_predicate { | ||
| got = testing.loadStorage(csv: input) | ||
| |> range(start: -100y) | ||
| |> filter(fn: (r) => r["_measurement"] == "cpu") | ||
| |> filter(fn: (r) => r["_measurement"] == "someOtherThing" or r["host"] == "euterpe.local") | ||
| |> keep(columns: ["region"]) | ||
| |> group() | ||
| |> distinct(column: "region") | ||
| |> limit(n: 200) | ||
| |> sort() | ||
|
|
||
| want = csv.from(csv: "#datatype,string,long,string | ||
| #group,false,false,false | ||
| #default,0,, | ||
| ,result,table,_value | ||
| ,,0,north | ||
| ,,0,south | ||
| ") | ||
|
|
||
| expect.planner(rules: ["PushDownReadTagValuesRule": 1]) | ||
| testing.diff(got, want) | ||
| } | ||
|
|
||
| testcase tag_values_measurement_or_negation { | ||
| got = testing.loadStorage(csv: input) | ||
| |> range(start: -100y) | ||
| |> filter(fn: (r) => r["_measurement"] != "cpu") | ||
| |> filter(fn: (r) => r["_measurement"] == "someOtherThing" or r["fstype"] != "apfs") | ||
| |> keep(columns: ["fstype"]) | ||
| |> group() | ||
| |> distinct(column: "fstype") | ||
| |> limit(n: 200) | ||
| |> sort() | ||
|
|
||
| want = csv.from(csv: "#datatype,string,long,string | ||
| #group,false,false,false | ||
| #default,0,, | ||
| ,result,table,_value | ||
| ,,0,hfs | ||
| ") | ||
|
|
||
| expect.planner(rules: ["PushDownReadTagValuesRule": 1]) | ||
| testing.diff(got, want) | ||
| } | ||
|
|
||
| testcase tag_values_measurement_or_regex { | ||
| got = testing.loadStorage(csv: input) | ||
| |> range(start: -100y) | ||
| |> filter(fn: (r) => r["_measurement"] =~ /cp.*/) | ||
| |> filter(fn: (r) => r["_measurement"] == "someOtherThing" or r["host"] !~ /mnemo.*/) | ||
| |> keep(columns: ["region"]) | ||
| |> group() | ||
| |> distinct(column: "region") | ||
| |> limit(n: 200) | ||
| |> sort() | ||
|
|
||
| want = csv.from(csv: "#datatype,string,long,string | ||
| #group,false,false,false | ||
| #default,0,, | ||
| ,result,table,_value | ||
| ,,0,north | ||
| ,,0,south | ||
| ") | ||
|
|
||
| expect.planner(rules: ["PushDownReadTagValuesRule": 1]) | ||
| testing.diff(got, want) | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.