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

fix: replay tests should not fail when awaiting on query results

pull/24376/head
Marco Neumann 2021-07-27 14:51:38 +02:00
parent ad68817513
commit ca90e92ecc
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/src/db/replay.rs
View File

@ -191,7 +191,7 @@ mod tests {
checkpoint::{PartitionCheckpoint, PersistCheckpointBuilder, ReplayPlanner}, checkpoint::{PartitionCheckpoint, PersistCheckpointBuilder, ReplayPlanner},
min_max_sequence::OptionalMinMaxSequence, min_max_sequence::OptionalMinMaxSequence,
}; };
use query::QueryChunk; use query::{exec::ExecutorType, frontend::sql::SqlQueryPlanner, QueryChunk};
use test_helpers::assert_contains; use test_helpers::assert_contains;
use tokio_util::sync::CancellationToken; use tokio_util::sync::CancellationToken;
use write_buffer::{ use write_buffer::{
@ -199,7 +199,7 @@ mod tests {
mock::{MockBufferForReading, MockBufferSharedState}, mock::{MockBufferForReading, MockBufferSharedState},
}; };
use crate::{db::test_helpers::run_query, utils::TestDb}; use crate::utils::TestDb;
#[derive(Debug)] #[derive(Debug)]
struct TestSequencedEntry { struct TestSequencedEntry {
@ -477,18 +477,38 @@ mod tests {
) )
} }
Check::Query(query, expected) => { Check::Query(query, expected) => {
let batches = run_query(Arc::clone(&db), query).await; let db = Arc::clone(&db);
let planner = SqlQueryPlanner::default();
let executor = db.executor();
// we are throwing away the record batches after the assert, so we don't care about interior match planner.query(db, query, &executor) {
// mutability Ok(physical_plan) => {
let batches = std::panic::AssertUnwindSafe(batches); match executor.collect(physical_plan, ExecutorType::Query).await {
Ok(batches) => {
// we are throwing away the record batches after the assert, so we don't care about interior
// mutability
let batches = std::panic::AssertUnwindSafe(batches);
Self::eval_assert( Self::eval_assert(
|| { || {
assert_batches_eq!(expected, &batches); assert_batches_eq!(expected, &batches);
}, },
use_assert, use_assert,
) )
}
err if use_assert => {
err.unwrap();
unreachable!()
}
_ => false,
}
}
err if use_assert => {
err.unwrap();
unreachable!()
}
_ => false,
}
} }
}; };