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

refactor: Extract a conversion for convenience in tests

pull/24376/head
Carol (Nichols || Goulding) 2022-09-15 11:09:58 -04:00
parent dcab9d0ffc
commit f5497a3a3d
No known key found for this signature in database
GPG Key ID: E907EE5A736F87D4
3 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compactor/src/cold.rs
View File

@ -186,9 +186,7 @@ fn group_by_size(
#[cfg(test)]
mod tests {
use super::*;
use crate::{
compact_one_partition, handler::CompactorConfig, parquet_file_filtering, ReadyToCompact,
};
use crate::{compact_one_partition, handler::CompactorConfig, parquet_file_filtering};
use ::parquet_file::storage::ParquetStorage;
use arrow_util::assert_batches_sorted_eq;
use backoff::BackoffConfig;
@ -408,19 +406,7 @@ mod tests {
&compactor.parquet_file_candidate_bytes,
);
let parquet_file_filtering::FilteredFiles {
filter_result,
partition,
} = to_compact;
let files =
if let parquet_file_filtering::FilterResult::Proceed { files, .. } = filter_result {
files
} else {
panic!("Expected to get FilterResult::Proceed, got {filter_result:?}");
};
let to_compact = ReadyToCompact { files, partition };
let to_compact = to_compact.into();
compact_one_partition(&compactor, to_compact, "cold")
.await
@ -603,19 +589,7 @@ mod tests {
&compactor.parquet_file_candidate_bytes,
);
let parquet_file_filtering::FilteredFiles {
filter_result,
partition,
} = to_compact;
let files =
if let parquet_file_filtering::FilterResult::Proceed { files, .. } = filter_result {
files
} else {
panic!("Expected to get FilterResult::Proceed, got {filter_result:?}");
};
let to_compact = ReadyToCompact { files, partition };
let to_compact = to_compact.into();
compact_one_partition(&compactor, to_compact, "cold")
.await

15
compactor/src/hot.rs
View File

@ -77,7 +77,6 @@ mod tests {
handler::CompactorConfig,
parquet_file_filtering, parquet_file_lookup,
tests::{test_setup, TestSetup},
ReadyToCompact,
};
use arrow_util::assert_batches_sorted_eq;
use backoff::BackoffConfig;
@ -516,19 +515,7 @@ mod tests {
&compactor.parquet_file_candidate_bytes,
);
let parquet_file_filtering::FilteredFiles {
filter_result,
partition,
} = to_compact;
let files =
if let parquet_file_filtering::FilterResult::Proceed { files, .. } = filter_result {
files
} else {
panic!("Expected to get FilterResult::Proceed, got {filter_result:?}");
};
let to_compact = ReadyToCompact { files, partition };
let to_compact = to_compact.into();
compact_one_partition(&compactor, to_compact, "hot")
.await

23
compactor/src/lib.rs
View File

@ -334,6 +334,29 @@ pub mod tests {
sync::{Arc, Mutex},
};
// In tests that are verifying successful compaction not affected by the memory budget, this
// converts a `parquet_file_filtering::FilteredFiles` that has a `filter_result` of
// `parquet_file_filtering::FilterResult::Proceed` into a `ReadyToCompact` and panics if it
// gets any other variant.
impl From<parquet_file_filtering::FilteredFiles> for ReadyToCompact {
fn from(filtered_files: parquet_file_filtering::FilteredFiles) -> Self {
let parquet_file_filtering::FilteredFiles {
filter_result,
partition,
} = filtered_files;
let files = if let parquet_file_filtering::FilterResult::Proceed { files, .. } =
filter_result
{
files
} else {
panic!("Expected to get FilterResult::Proceed, got {filter_result:?}");
};
Self { files, partition }
}
}
#[tokio::test]
async fn empty_candidates_compacts_nothing() {
test_helpers::maybe_start_logging();