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

fix: flaky end to end system_tables test (#3397)

pull/24376/head
Andrew Lamb 2021-12-17 03:13:09 -05:00 committed by GitHub
parent c6ddfb4799
commit 64f915d860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
influxdb_iox/tests/end_to_end_cases/system_tables.rs
View File

@ -115,7 +115,15 @@ async fn test_queries() {
.unwrap(); .unwrap();
// Note: don't select issue_time as that changes from run to run // Note: don't select issue_time as that changes from run to run
let query = "select query_type, query_text from system.queries"; //
// Note 2: it is possible for another test to issue queries
// against this database concurrently and appear in the queries
// list (sql observer mode does it) so only select for what we
// expect
//
// See https://github.com/influxdata/influxdb_iox/issues/3396
let query =
"select query_type, query_text from system.queries where query_type = 'read_filter'";
// Query system.queries and should have an entry for the storage rpc // Query system.queries and should have an entry for the storage rpc
let batches = fixture let batches = fixture
@ -129,21 +137,43 @@ async fn test_queries() {
let batches = normalize_batches(batches, scenario.normalizer()); let batches = normalize_batches(batches, scenario.normalizer());
let expected_read_data = vec![ let expected_read_data = vec![
"+-------------+---------------------------------------------------+", "+-------------+---------------------------------+",
"| query_type | query_text |", "| query_type | query_text |",
"+-------------+---------------------------------------------------+", "+-------------+---------------------------------+",
"| read_filter | { |", "| read_filter | { |",
"| | \"ReadSource\": { |", "| | \"ReadSource\": { |",
"| | \"typeUrl\": \"/TODO\", |", "| | \"typeUrl\": \"/TODO\", |",
"| | \"value\": \"ZZZZZZZZZZZZZZZZ\" |", "| | \"value\": \"ZZZZZZZZZZZZZZZZ\" |",
"| | }, |", "| | }, |",
"| | \"range\": { |", "| | \"range\": { |",
"| | \"start\": \"111111\", |", "| | \"start\": \"111111\", |",
"| | \"end\": \"222222\" |", "| | \"end\": \"222222\" |",
"| | } |", "| | } |",
"| | } |", "| | } |",
"| sql | select query_type, query_text from system.queries |", "+-------------+---------------------------------+",
"+-------------+---------------------------------------------------+", ];
assert_batches_eq!(expected_read_data, &batches);
// Query system.queries and should also have an entry for the sql
// we just wrote (and what we are about to write)
let query = "select query_type, query_text from system.queries where query_type = 'sql' and query_text like '%read_filter%'";
let batches = fixture
.flight_client()
.perform_query(&db_name, query)
.await
.unwrap()
.collect()
.await
.unwrap();
let batches = normalize_batches(batches, scenario.normalizer());
let expected_read_data = vec![
"+------------+----------------------------------------------------------------------------------------------------------------+",
"| query_type | query_text |",
"+------------+----------------------------------------------------------------------------------------------------------------+",
"| sql | select query_type, query_text from system.queries where query_type = 'read_filter' |",
"| sql | select query_type, query_text from system.queries where query_type = 'sql' and query_text like '%read_filter%' |",
"+------------+----------------------------------------------------------------------------------------------------------------+",
]; ];
assert_batches_eq!(expected_read_data, &batches); assert_batches_eq!(expected_read_data, &batches);
} }