fix: Rename compactor2_test_utils to compactor_test_utils

Cargo.lock

@@ -1010,7 +1010,7 @@ dependencies = [
  "async-trait",
  "backoff",
  "bytes",
- "compactor2_test_utils",
+ "compactor_test_utils",
  "data_types",
  "datafusion",
  "futures",
@@ -1037,7 +1037,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "compactor2_test_utils"
+name = "compactor_test_utils"
 version = "0.1.0"
 dependencies = [
  "async-trait",

Cargo.toml

@@ -7,7 +7,7 @@ members = [
     "cache_system",
     "clap_blocks",
     "client_util",
-    "compactor2_test_utils",
+    "compactor_test_utils",
     "compactor",
     "data_types",
     "datafusion_util",

compactor/Cargo.toml

@@ -33,7 +33,7 @@ workspace-hack = { version = "0.1", path = "../workspace-hack" }
 [dev-dependencies]
 arrow_util = { path = "../arrow_util" }
 assert_matches = "1"
-compactor2_test_utils = { path = "../compactor2_test_utils" }
+compactor_test_utils = { path = "../compactor_test_utils" }
 iox_tests = { path = "../iox_tests" }
 test_helpers = { path = "../test_helpers"}
 insta = { version = "1.29.0", features = ["yaml"] }

compactor/src/components/files_split/non_overlap_split.rs

@@ -128,7 +128,7 @@ impl FilesSplit for NonOverlapSplit {
 #[cfg(test)]
 mod tests {
 
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_l1_files, create_overlapped_files, create_overlapped_files_2,
         create_overlapped_l0_l1_files, create_overlapped_l1_l2_files, format_files,
         format_files_split,

compactor/src/components/files_split/target_level_split.rs

@@ -35,7 +35,7 @@ impl FilesSplit for TargetLevelSplit {
 #[cfg(test)]
 mod tests {
 
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_l0_files, create_l1_files, create_l2_files, create_overlapped_files, format_files,
         format_files_split,
     };

compactor/src/components/files_split/upgrade_split.rs

@@ -140,7 +140,7 @@ impl FilesSplit for UpgradeSplit {
 #[cfg(test)]
 mod tests {
 
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_l0_files, create_l1_files, create_l1_files_mix_size, create_overlapped_files,
         create_overlapped_files_2, create_overlapped_files_3, create_overlapped_files_3_mix_size,
         create_overlapped_l0_l1_files, create_overlapped_l1_l2_files,

compactor/src/components/partitions_source/not_empty.rs

@@ -59,7 +59,7 @@ mod tests {
     use iox_time::{MockProvider, Time};
 
     use crate::components::partitions_source::mock::MockPartitionsSource;
-    use compactor2_test_utils::AssertFutureExt;
+    use compactor_test_utils::AssertFutureExt;
 
     use super::*;
 

compactor/src/components/scratchpad/prod.rs

@@ -257,7 +257,7 @@ mod tests {
     use test_helpers::{maybe_start_logging, tracing::TracingCapture};
 
     use crate::components::scratchpad::test_util::{assert_content, file_path, stores};
-    use compactor2_test_utils::list_object_store;
+    use compactor_test_utils::list_object_store;
 
     use super::*;
 

compactor/src/components/scratchpad/test_util.rs

@@ -5,7 +5,7 @@ use object_store::{memory::InMemory, DynObjectStore};
 use parquet_file::ParquetFilePath;
 use uuid::Uuid;
 
-use compactor2_test_utils::list_object_store;
+use compactor_test_utils::list_object_store;
 
 pub fn stores() -> (
     Arc<DynObjectStore>,

compactor/src/components/split_or_compact/files_to_compact.rs

@@ -63,7 +63,7 @@ use crate::components::{
 ///  4. Largest compacting set: All input files
 ///    - files_to_compact: All input files
 ///    - files_to_keep: None
-///  
+///
 pub fn limit_files_to_compact(
     max_compact_size: usize,
     files: Vec<ParquetFile>,
@@ -232,7 +232,7 @@ pub enum CompactOrFurtherSplit {
 
 #[cfg(test)]
 mod tests {
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_l1_files, create_overlapped_files, create_overlapped_l0_l1_files_2,
         create_overlapped_l0_l1_files_3, create_overlapped_start_target_files, format_files,
         format_files_split,

compactor/src/components/split_or_compact/large_files_to_split.rs

@@ -69,7 +69,7 @@ pub fn compute_split_times_for_large_files(
 mod tests {
     use std::sync::Arc;
 
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_overlapped_l0_l1_files_3, create_overlapped_two_overlapped_files, format_files,
         format_files_split, TestTimes,
     };

compactor/src/components/split_or_compact/metrics.rs

@@ -99,7 +99,7 @@ mod tests {
 
     use std::sync::Arc;
 
-    use compactor2_test_utils::{create_overlapped_l0_l1_files_2, create_overlapped_l1_l2_files_2};
+    use compactor_test_utils::{create_overlapped_l0_l1_files_2, create_overlapped_l1_l2_files_2};
     use data_types::CompactionLevel;
     use metric::{assert_counter, assert_histogram};
 

compactor/src/components/split_or_compact/split_compact.rs

@@ -152,7 +152,7 @@ impl SplitOrCompact for SplitCompact {
 mod tests {
     use std::sync::Arc;
 
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_overlapped_l0_l1_files_2, create_overlapped_l1_l2_files_2, format_files,
         format_files_split,
     };

compactor/src/components/split_or_compact/start_level_files_to_split.rs

@@ -417,7 +417,7 @@ pub fn identify_start_level_files_to_split(
 
 #[cfg(test)]
 mod tests {
-    use compactor2_test_utils::{
+    use compactor_test_utils::{
         create_l1_files, create_overlapped_files, create_overlapped_l0_l1_files_2, format_files,
         format_files_split,
     };

compactor/tests/integration.rs

@@ -1,5 +1,5 @@
 use arrow_util::assert_batches_sorted_eq;
-use compactor2_test_utils::{format_files, list_object_store, TestSetup, TestSetupBuilder};
+use compactor_test_utils::{format_files, list_object_store, TestSetup, TestSetupBuilder};
 use data_types::{CompactionLevel, ParquetFile, PartitionId};
 use iox_tests::TestParquetFileBuilder;
 use test_helpers::{assert_contains, tracing::TracingCapture};

compactor/tests/layouts/common_use_cases.rs

@@ -5,7 +5,7 @@
 //!
 //! See [crate::layout] module for detailed documentation
 
-use compactor2_test_utils::format_files;
+use compactor_test_utils::format_files;
 use data_types::CompactionLevel;
 use iox_time::Time;
 

compactor/tests/layouts/mod.rs

@@ -60,7 +60,7 @@ mod single_timestamp;
 
 use std::{sync::atomic::Ordering, time::Duration};
 
-use compactor2_test_utils::{display_size, format_files, TestSetup, TestSetupBuilder};
+use compactor_test_utils::{display_size, format_files, TestSetup, TestSetupBuilder};
 use data_types::{CompactionLevel, ParquetFile};
 use iox_tests::TestParquetFileBuilder;
 use iox_time::Time;

compactor_test_utils/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "compactor2_test_utils"
+name = "compactor_test_utils"
 description = "Utilities for writing tests for compactor"
 version.workspace = true
 authors.workspace = true