diff --git a/garbage_collector/src/retention/flagger.rs b/garbage_collector/src/retention/flagger.rs index bd3479c146..d3dee69e79 100644 --- a/garbage_collector/src/retention/flagger.rs +++ b/garbage_collector/src/retention/flagger.rs @@ -11,25 +11,16 @@ pub(crate) async fn perform( sleep_interval_minutes: u64, ) -> Result<()> { loop { - let parquet_file_flagged = catalog + let flagged = catalog .repositories() .await .parquet_files() .flag_for_delete_by_retention() .await - .context(ParquetFileFlaggingSnafu)?; - info!(parquet_file_flagged_count = %parquet_file_flagged.len(), "iox_catalog::parquet_file::flag_for_delete_by_retention()"); + .context(FlaggingSnafu)?; + info!(flagged_count = %flagged.len(), "iox_catalog::flag_for_delete_by_retention()"); - let partition_flagged = catalog - .repositories() - .await - .partitions() - .flag_for_delete_by_retention() - .await - .context(PartitionFlaggingSnafu)?; - info!(partition_flagged_count = %partition_flagged.len(), "iox_catalog::partition::flag_for_delete_by_retention()"); - - if parquet_file_flagged.is_empty() && partition_flagged.is_empty() { + if flagged.is_empty() { select! { _ = shutdown.cancelled() => { break @@ -47,12 +38,7 @@ pub(crate) async fn perform( #[allow(missing_docs)] pub enum Error { #[snafu(display("Failed to flag parquet files for deletion by retention policy"))] - ParquetFileFlagging { - source: iox_catalog::interface::Error, - }, - - #[snafu(display("Failed to flag partitions for deletion by retention policy"))] - PartitionFlagging { + Flagging { source: iox_catalog::interface::Error, }, }