diff --git a/arrow_util/src/bitset.rs b/arrow_util/src/bitset.rs index 35499882b2..94f02bcedb 100644 --- a/arrow_util/src/bitset.rs +++ b/arrow_util/src/bitset.rs @@ -330,7 +330,7 @@ mod tests { } fn make_rng() -> StdRng { - let seed = OsRng::default().next_u64(); + let seed = OsRng.next_u64(); println!("Seed: {seed}"); StdRng::seed_from_u64(seed) } diff --git a/cache_system/src/backend/policy/lru.rs b/cache_system/src/backend/policy/lru.rs index c3a90fb0d2..6d9d88e8d5 100644 --- a/cache_system/src/backend/policy/lru.rs +++ b/cache_system/src/backend/policy/lru.rs @@ -583,7 +583,7 @@ where metric_count, metric_usage, metric_evicted, - _phantom: PhantomData::default(), + _phantom: PhantomData, })); pool.inner.lock().register_member( diff --git a/cache_system/src/backend/policy/mod.rs b/cache_system/src/backend/policy/mod.rs index ac41debfe1..4cb794c76b 100644 --- a/cache_system/src/backend/policy/mod.rs +++ b/cache_system/src/backend/policy/mod.rs @@ -327,7 +327,7 @@ where lock_inner!(guard = self.inner); InnerBackendRef { inner: guard.inner.lock_arc(), - _phantom: PhantomData::default(), + _phantom: PhantomData, } } } diff --git a/cache_system/src/backend/policy/refresh.rs b/cache_system/src/backend/policy/refresh.rs index 1f7481a0ee..a5961981e9 100644 --- a/cache_system/src/backend/policy/refresh.rs +++ b/cache_system/src/backend/policy/refresh.rs @@ -95,8 +95,8 @@ where backoff_cfg_some: Option, ) -> Self { Self { - _k: PhantomData::default(), - _v: PhantomData::default(), + _k: PhantomData, + _v: PhantomData, backoff_cfg_none, backoff_cfg_some, } diff --git a/cache_system/src/backend/policy/remove_if.rs b/cache_system/src/backend/policy/remove_if.rs index 00d477c4b6..bcba3e0264 100644 --- a/cache_system/src/backend/policy/remove_if.rs +++ b/cache_system/src/backend/policy/remove_if.rs @@ -56,7 +56,7 @@ where let policy_constructor = move |callback_handle| { *handle_captured.callback_handle.lock() = Some(callback_handle); Self { - _phantom: PhantomData::default(), + _phantom: PhantomData, } }; diff --git a/cache_system/src/backend/policy/ttl.rs b/cache_system/src/backend/policy/ttl.rs index 3c1aca38ad..fee9e62172 100644 --- a/cache_system/src/backend/policy/ttl.rs +++ b/cache_system/src/backend/policy/ttl.rs @@ -76,8 +76,8 @@ where /// Create new provider with the given TTL value. pub fn new(ttl: Option) -> Self { Self { - _k: PhantomData::default(), - _v: PhantomData::default(), + _k: PhantomData, + _v: PhantomData, ttl, } } @@ -122,8 +122,8 @@ where /// Create new provider with the given TTL values for `None` and `Some(...)`. pub fn new(ttl_none: Option, ttl_some: Option) -> Self { Self { - _k: PhantomData::default(), - _v: PhantomData::default(), + _k: PhantomData, + _v: PhantomData, ttl_none, ttl_some, } diff --git a/cache_system/src/loader/mod.rs b/cache_system/src/loader/mod.rs index eb9124f0d0..ca7ab7375d 100644 --- a/cache_system/src/loader/mod.rs +++ b/cache_system/src/loader/mod.rs @@ -93,7 +93,7 @@ where pub fn new(loader: T) -> Self { Self { loader, - _phantom: PhantomData::default(), + _phantom: PhantomData, } } } diff --git a/cache_system/src/resource_consumption.rs b/cache_system/src/resource_consumption.rs index 066d88fc7e..23bcd4ed97 100644 --- a/cache_system/src/resource_consumption.rs +++ b/cache_system/src/resource_consumption.rs @@ -97,7 +97,7 @@ where pub fn new(f: F) -> Self { Self { estimator: f, - _phantom: PhantomData::default(), + _phantom: PhantomData, } } } diff --git a/compactor/src/components/df_plan_exec/noop.rs b/compactor/src/components/df_plan_exec/noop.rs index 9c50b38d46..347f42e119 100644 --- a/compactor/src/components/df_plan_exec/noop.rs +++ b/compactor/src/components/df_plan_exec/noop.rs @@ -12,7 +12,7 @@ pub struct NoopDataFusionPlanExec; impl NoopDataFusionPlanExec { pub fn new() -> Self { - Self::default() + Self } } diff --git a/compactor/src/components/df_planner/panic.rs b/compactor/src/components/df_planner/panic.rs index 79956fdd0c..1cd6ac571e 100644 --- a/compactor/src/components/df_planner/panic.rs +++ b/compactor/src/components/df_planner/panic.rs @@ -24,7 +24,7 @@ pub struct PanicDataFusionPlanner; impl PanicDataFusionPlanner { /// Create a new planner pub fn new() -> Self { - Self::default() + Self } } diff --git a/compactor/src/components/divide_initial/multiple_branches.rs b/compactor/src/components/divide_initial/multiple_branches.rs index 31322fd70b..3fb67beebe 100644 --- a/compactor/src/components/divide_initial/multiple_branches.rs +++ b/compactor/src/components/divide_initial/multiple_branches.rs @@ -16,7 +16,7 @@ pub struct MultipleBranchesDivideInitial; impl MultipleBranchesDivideInitial { pub fn new() -> Self { - Self::default() + Self } } diff --git a/compactor/src/components/partition_filter/has_files.rs b/compactor/src/components/partition_filter/has_files.rs index ad3b35b100..617699cd56 100644 --- a/compactor/src/components/partition_filter/has_files.rs +++ b/compactor/src/components/partition_filter/has_files.rs @@ -11,7 +11,7 @@ pub struct HasFilesPartitionFilter; impl HasFilesPartitionFilter { pub fn new() -> Self { - Self::default() + Self } } diff --git a/compactor/src/components/round_split/many_files.rs b/compactor/src/components/round_split/many_files.rs index c409e189d7..c165037e2f 100644 --- a/compactor/src/components/round_split/many_files.rs +++ b/compactor/src/components/round_split/many_files.rs @@ -11,7 +11,7 @@ pub struct ManyFilesRoundSplit; impl ManyFilesRoundSplit { pub fn new() -> Self { - Self::default() + Self } } diff --git a/compactor/src/components/scratchpad/noop.rs b/compactor/src/components/scratchpad/noop.rs index b5a77b8c8b..0ae1200ded 100644 --- a/compactor/src/components/scratchpad/noop.rs +++ b/compactor/src/components/scratchpad/noop.rs @@ -12,7 +12,7 @@ pub struct NoopScratchpadGen; impl NoopScratchpadGen { pub fn new() -> Self { - Self::default() + Self } } diff --git a/grpc-binary-logger/src/middleware.rs b/grpc-binary-logger/src/middleware.rs index a9dc78a4b3..f3a1282d8f 100644 --- a/grpc-binary-logger/src/middleware.rs +++ b/grpc-binary-logger/src/middleware.rs @@ -258,7 +258,7 @@ where inner, headers: parts.headers.clone(), call: call.clone(), - _phantom_error_logger: PhantomData::default(), + _phantom_error_logger: PhantomData, }); call.log(LogEntry::ServerHeaders(&parts.headers)); if body.is_end_stream() { diff --git a/ingester/benches/wal.rs b/ingester/benches/wal.rs index d8eb0fbc3e..4eaec4fd14 100644 --- a/ingester/benches/wal.rs +++ b/ingester/benches/wal.rs @@ -61,7 +61,7 @@ fn wal_replay_bench(c: &mut Criterion) { // Pass all writes into a NOP that discards them with no // overhead. - let sink = NopSink::default(); + let sink = NopSink; let persist = MockPersistQueue::default(); diff --git a/ingester/src/init.rs b/ingester/src/init.rs index 96468b2077..30bb586cc6 100644 --- a/ingester/src/init.rs +++ b/ingester/src/init.rs @@ -304,7 +304,7 @@ where Arc::clone(&catalog), // Register a post-persistence observer that emits Parquet file // attributes as metrics. - ParquetFileInstrumentation::new(NopObserver::default(), &metrics), + ParquetFileInstrumentation::new(NopObserver, &metrics), &metrics, ); let persist_handle = Arc::new(persist_handle); diff --git a/ingester/src/persist/handle.rs b/ingester/src/persist/handle.rs index a6fdefcf94..35eadac8cd 100644 --- a/ingester/src/persist/handle.rs +++ b/ingester/src/persist/handle.rs @@ -885,7 +885,7 @@ mod tests { Arc::new(Executor::new_testing()), storage, catalog, - NopObserver::default(), + NopObserver, &metrics, ); assert!(ingest_state.read().is_ok()); @@ -955,7 +955,7 @@ mod tests { Arc::new(Executor::new_testing()), storage, catalog, - NopObserver::default(), + NopObserver, &metrics, ); diff --git a/ingester/src/wal/wal_sink.rs b/ingester/src/wal/wal_sink.rs index 0510097cc5..d6956d8f9f 100644 --- a/ingester/src/wal/wal_sink.rs +++ b/ingester/src/wal/wal_sink.rs @@ -285,7 +285,7 @@ mod tests { .await .expect("failed to initialise WAL"); - let wal_sink = WalSink::new(BlockingDmlSink::default(), wal); + let wal_sink = WalSink::new(BlockingDmlSink, wal); // Allow tokio to automatically advance time past the timeout duration, // when all threads are blocked on await points. diff --git a/iox_query/src/logical_optimizer/handle_gapfill.rs b/iox_query/src/logical_optimizer/handle_gapfill.rs index 5bb719cf2f..ab484aba7c 100644 --- a/iox_query/src/logical_optimizer/handle_gapfill.rs +++ b/iox_query/src/logical_optimizer/handle_gapfill.rs @@ -587,7 +587,7 @@ mod test { } fn optimize(plan: &LogicalPlan) -> Result> { - let optimizer = Optimizer::with_rules(vec![Arc::new(HandleGapFill::default())]); + let optimizer = Optimizer::with_rules(vec![Arc::new(HandleGapFill)]); optimizer.optimize_recursively( optimizer.rules.get(0).unwrap(), plan, diff --git a/iox_query/src/physical_optimizer/combine_chunks.rs b/iox_query/src/physical_optimizer/combine_chunks.rs index 65e822b982..939a86084e 100644 --- a/iox_query/src/physical_optimizer/combine_chunks.rs +++ b/iox_query/src/physical_optimizer/combine_chunks.rs @@ -104,7 +104,7 @@ mod tests { 2, ), ])); - let opt = CombineChunks::default(); + let opt = CombineChunks; let mut config = ConfigOptions::default(); config.execution.target_partitions = 2; insta::assert_yaml_snapshot!( @@ -145,7 +145,7 @@ mod tests { .unwrap(), ), ])); - let opt = CombineChunks::default(); + let opt = CombineChunks; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -175,7 +175,7 @@ mod tests { let chunk1 = TestChunk::new("table").with_id(1); let schema = chunk1.schema().as_arrow(); let plan = chunks_to_physical_nodes(&schema, None, vec![], 2); - let opt = CombineChunks::default(); + let opt = CombineChunks; let mut config = ConfigOptions::default(); config.execution.target_partitions = 2; insta::assert_yaml_snapshot!( @@ -202,7 +202,7 @@ mod tests { ) .unwrap(), )])); - let opt = CombineChunks::default(); + let opt = CombineChunks; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/dedup/dedup_null_columns.rs b/iox_query/src/physical_optimizer/dedup/dedup_null_columns.rs index 23d5d0ea11..de1a5cdffd 100644 --- a/iox_query/src/physical_optimizer/dedup/dedup_null_columns.rs +++ b/iox_query/src/physical_optimizer/dedup/dedup_null_columns.rs @@ -111,7 +111,7 @@ mod tests { fn test_no_chunks() { let schema = chunk(1).schema().clone(); let plan = dedup_plan(schema, vec![]); - let opt = DedupNullColumns::default(); + let opt = DedupNullColumns; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -132,7 +132,7 @@ mod tests { let chunk = chunk(1).with_dummy_parquet_file(); let schema = chunk.schema().clone(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupNullColumns::default(); + let opt = DedupNullColumns; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -155,7 +155,7 @@ mod tests { let chunk = chunk(1).with_dummy_parquet_file(); let schema = chunk.schema().clone(); let plan = dedup_plan_with_chunk_order_col(schema, vec![chunk]); - let opt = DedupNullColumns::default(); + let opt = DedupNullColumns; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -187,7 +187,7 @@ mod tests { .build() .unwrap(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupNullColumns::default(); + let opt = DedupNullColumns; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -228,7 +228,7 @@ mod tests { .build() .unwrap(); let plan = dedup_plan(schema, vec![chunk1, chunk2]); - let opt = DedupNullColumns::default(); + let opt = DedupNullColumns; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/dedup/dedup_sort_order.rs b/iox_query/src/physical_optimizer/dedup/dedup_sort_order.rs index eb692aa4f5..eeb6367514 100644 --- a/iox_query/src/physical_optimizer/dedup/dedup_sort_order.rs +++ b/iox_query/src/physical_optimizer/dedup/dedup_sort_order.rs @@ -183,7 +183,7 @@ mod tests { fn test_no_chunks() { let schema = chunk(1).schema().clone(); let plan = dedup_plan(schema, vec![]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -204,7 +204,7 @@ mod tests { let chunk = chunk(1).with_dummy_parquet_file(); let schema = chunk.schema().clone(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -233,7 +233,7 @@ mod tests { ])); let schema = chunk.schema().clone(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -262,7 +262,7 @@ mod tests { ])); let schema = chunk.schema().clone(); let plan = dedup_plan_with_chunk_order_col(schema, vec![chunk]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -291,7 +291,7 @@ mod tests { ])); let schema = chunk.schema().clone(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -320,7 +320,7 @@ mod tests { ])); let schema = chunk.schema().clone(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -353,7 +353,7 @@ mod tests { .build() .unwrap(); let plan = dedup_plan(schema, vec![chunk]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -389,7 +389,7 @@ mod tests { ])); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -424,7 +424,7 @@ mod tests { ])); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -454,7 +454,7 @@ mod tests { let chunk2 = chunk(2).with_dummy_parquet_file(); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -511,7 +511,7 @@ mod tests { ])); let schema = chunk3.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -562,7 +562,7 @@ mod tests { ])); let schema = chunk3.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -615,7 +615,7 @@ mod tests { ])); let schema = chunk3.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = DedupSortOrder::default(); + let opt = DedupSortOrder; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/dedup/partition_split.rs b/iox_query/src/physical_optimizer/dedup/partition_split.rs index bfb582ead3..9f72bf7467 100644 --- a/iox_query/src/physical_optimizer/dedup/partition_split.rs +++ b/iox_query/src/physical_optimizer/dedup/partition_split.rs @@ -122,7 +122,7 @@ mod tests { fn test_no_chunks() { let schema = chunk(1).schema().clone(); let plan = dedup_plan(schema, vec![]); - let opt = PartitionSplit::default(); + let opt = PartitionSplit; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -145,7 +145,7 @@ mod tests { let chunk3 = chunk(3).with_dummy_parquet_file(); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = PartitionSplit::default(); + let opt = PartitionSplit; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -176,7 +176,7 @@ mod tests { let chunk6 = chunk(6).with_dummy_parquet_file().with_partition_id(1); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3, chunk4, chunk5, chunk6]); - let opt = PartitionSplit::default(); + let opt = PartitionSplit; let mut config = ConfigOptions::default(); config.execution.target_partitions = 2; insta::assert_yaml_snapshot!( @@ -210,7 +210,7 @@ mod tests { let chunk3 = chunk(3).with_partition_id(3); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = PartitionSplit::default(); + let opt = PartitionSplit; let mut config = ConfigOptions::default(); config.extensions.insert(IoxConfigExt { max_dedup_partition_split: 2, diff --git a/iox_query/src/physical_optimizer/dedup/remove_dedup.rs b/iox_query/src/physical_optimizer/dedup/remove_dedup.rs index 617b499f71..65926b3f28 100644 --- a/iox_query/src/physical_optimizer/dedup/remove_dedup.rs +++ b/iox_query/src/physical_optimizer/dedup/remove_dedup.rs @@ -73,7 +73,7 @@ mod tests { fn test_no_chunks() { let schema = chunk(1).schema().clone(); let plan = dedup_plan(schema, vec![]); - let opt = RemoveDedup::default(); + let opt = RemoveDedup; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -93,7 +93,7 @@ mod tests { let chunk1 = chunk(1).with_may_contain_pk_duplicates(false); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1]); - let opt = RemoveDedup::default(); + let opt = RemoveDedup; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -115,7 +115,7 @@ mod tests { let chunk1 = chunk(1).with_may_contain_pk_duplicates(true); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1]); - let opt = RemoveDedup::default(); + let opt = RemoveDedup; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -139,7 +139,7 @@ mod tests { let chunk2 = chunk(2).with_may_contain_pk_duplicates(false); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2]); - let opt = RemoveDedup::default(); + let opt = RemoveDedup; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/dedup/time_split.rs b/iox_query/src/physical_optimizer/dedup/time_split.rs index 93665cdabf..1e09d2b075 100644 --- a/iox_query/src/physical_optimizer/dedup/time_split.rs +++ b/iox_query/src/physical_optimizer/dedup/time_split.rs @@ -112,7 +112,7 @@ mod tests { fn test_no_chunks() { let schema = chunk(1).schema().clone(); let plan = dedup_plan(schema, vec![]); - let opt = TimeSplit::default(); + let opt = TimeSplit; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -137,7 +137,7 @@ mod tests { .with_timestamp_min_max(8, 9); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = TimeSplit::default(); + let opt = TimeSplit; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -176,7 +176,7 @@ mod tests { .with_timestamp_min_max(0, 0); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3, chunk4, chunk5, chunk6]); - let opt = TimeSplit::default(); + let opt = TimeSplit; let mut config = ConfigOptions::default(); config.execution.target_partitions = 2; insta::assert_yaml_snapshot!( @@ -210,7 +210,7 @@ mod tests { let chunk3 = chunk(3).with_timestamp_min_max(3, 3); let schema = chunk1.schema().clone(); let plan = dedup_plan(schema, vec![chunk1, chunk2, chunk3]); - let opt = TimeSplit::default(); + let opt = TimeSplit; let mut config = ConfigOptions::default(); config.extensions.insert(IoxConfigExt { max_dedup_time_split: 2, diff --git a/iox_query/src/physical_optimizer/mod.rs b/iox_query/src/physical_optimizer/mod.rs index 40800a2359..c12331e427 100644 --- a/iox_query/src/physical_optimizer/mod.rs +++ b/iox_query/src/physical_optimizer/mod.rs @@ -30,17 +30,17 @@ pub fn register_iox_physical_optimizers(state: SessionState) -> SessionState { // prepend IOx-specific rules to DataFusion builtins // The optimizer rules have to be done in this order let mut optimizers: Vec> = vec![ - Arc::new(PartitionSplit::default()), - Arc::new(TimeSplit::default()), - Arc::new(RemoveDedup::default()), - Arc::new(CombineChunks::default()), - Arc::new(DedupNullColumns::default()), - Arc::new(DedupSortOrder::default()), - Arc::new(PredicatePushdown::default()), - Arc::new(ProjectionPushdown::default()), - Arc::new(ParquetSortness::default()) as _, - Arc::new(NestedUnion::default()), - Arc::new(OneUnion::default()), + Arc::new(PartitionSplit), + Arc::new(TimeSplit), + Arc::new(RemoveDedup), + Arc::new(CombineChunks), + Arc::new(DedupNullColumns), + Arc::new(DedupSortOrder), + Arc::new(PredicatePushdown), + Arc::new(ProjectionPushdown), + Arc::new(ParquetSortness) as _, + Arc::new(NestedUnion), + Arc::new(OneUnion), ]; optimizers.append(&mut state.physical_optimizers().to_vec()); diff --git a/iox_query/src/physical_optimizer/predicate_pushdown.rs b/iox_query/src/physical_optimizer/predicate_pushdown.rs index 75bccc5b5e..13af7337f5 100644 --- a/iox_query/src/physical_optimizer/predicate_pushdown.rs +++ b/iox_query/src/physical_optimizer/predicate_pushdown.rs @@ -190,7 +190,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -215,7 +215,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -245,7 +245,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -280,7 +280,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -328,7 +328,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -358,7 +358,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -390,7 +390,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -429,7 +429,7 @@ mod tests { ) .unwrap(), ); - let opt = PredicatePushdown::default(); + let opt = PredicatePushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/projection_pushdown.rs b/iox_query/src/physical_optimizer/projection_pushdown.rs index d3c2c8879e..8e2bb26ba7 100644 --- a/iox_query/src/physical_optimizer/projection_pushdown.rs +++ b/iox_query/src/physical_optimizer/projection_pushdown.rs @@ -457,7 +457,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -496,7 +496,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -535,7 +535,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -564,7 +564,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -593,7 +593,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -619,7 +619,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -648,7 +648,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -685,7 +685,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -756,7 +756,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -800,7 +800,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -833,7 +833,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -867,7 +867,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -899,7 +899,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -939,7 +939,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -980,7 +980,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -1025,7 +1025,7 @@ mod tests { assert_unknown_partitioning(plan.output_partitioning(), 2); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -1067,7 +1067,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -1113,7 +1113,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -1151,7 +1151,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -1197,7 +1197,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -1253,7 +1253,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -1289,7 +1289,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -1359,7 +1359,7 @@ mod tests { ) .unwrap(), ); - let opt = ProjectionPushdown::default(); + let opt = ProjectionPushdown; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/sort/parquet_sortness.rs b/iox_query/src/physical_optimizer/sort/parquet_sortness.rs index 80b44cbc55..3aa6f31079 100644 --- a/iox_query/src/physical_optimizer/sort/parquet_sortness.rs +++ b/iox_query/src/physical_optimizer/sort/parquet_sortness.rs @@ -212,7 +212,7 @@ mod tests { SortExec::new(ordering(["col2", "col1"], &schema), Arc::new(inner)) .with_fetch(Some(42)), ); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -248,7 +248,7 @@ mod tests { ordering(["col2", "col1"], &schema), true, )); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -287,7 +287,7 @@ mod tests { assert_unknown_partitioning(plan.output_partitioning(), 2); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; let test = OptimizationTest::new(plan, opt); insta::assert_yaml_snapshot!( test, @@ -325,7 +325,7 @@ mod tests { SortExec::new(ordering(["col2", "col1"], &schema), Arc::new(inner)) .with_fetch(Some(42)), ); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -360,7 +360,7 @@ mod tests { SortExec::new(ordering(["col2", "col1"], &schema), Arc::new(inner)) .with_fetch(Some(42)), ); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -395,7 +395,7 @@ mod tests { SortExec::new(ordering(["col2", "col1"], &schema), Arc::new(inner)) .with_fetch(Some(42)), ); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -430,7 +430,7 @@ mod tests { SortExec::new(ordering(["col2", "col1"], &schema), Arc::new(inner)) .with_fetch(Some(42)), ); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; let mut config = ConfigOptions::default(); config.extensions.insert(IoxConfigExt { max_parquet_fanout: 2, @@ -459,7 +459,7 @@ mod tests { SortExec::new(ordering(["col2", "col1"], &schema), Arc::new(inner)) .with_fetch(Some(42)), ); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -490,7 +490,7 @@ mod tests { infinite_source: false, }; let plan = Arc::new(ParquetExec::new(base_config, None, None)); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -523,7 +523,7 @@ mod tests { Arc::new(SortExec::new(ordering(["col2", "col1"], &schema), plan).with_fetch(Some(42))); let plan = Arc::new(SortExec::new(ordering(["col1", "col2"], &schema), plan).with_fetch(Some(42))); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -560,7 +560,7 @@ mod tests { Arc::new(SortExec::new(ordering(["col1", "col2"], &schema), plan).with_fetch(Some(42))); let plan = Arc::new(SortExec::new(ordering(["col2", "col1"], &schema), plan).with_fetch(Some(42))); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -602,7 +602,7 @@ mod tests { ordering(["col2", "col1"], &schema), true, )); - let opt = ParquetSortness::default(); + let opt = ParquetSortness; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/union/nested_union.rs b/iox_query/src/physical_optimizer/union/nested_union.rs index 4b12cdf49a..6e94423dec 100644 --- a/iox_query/src/physical_optimizer/union/nested_union.rs +++ b/iox_query/src/physical_optimizer/union/nested_union.rs @@ -88,7 +88,7 @@ mod tests { #[test] fn test_union_not_nested() { let plan = Arc::new(UnionExec::new(vec![other_node()])); - let opt = NestedUnion::default(); + let opt = NestedUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -110,7 +110,7 @@ mod tests { Arc::new(UnionExec::new(vec![other_node(), other_node()])), other_node(), ])); - let opt = NestedUnion::default(); + let opt = NestedUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -140,7 +140,7 @@ mod tests { ])), other_node(), ])); - let opt = NestedUnion::default(); + let opt = NestedUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -165,7 +165,7 @@ mod tests { #[test] fn test_other_node() { let plan = other_node(); - let opt = NestedUnion::default(); + let opt = NestedUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/iox_query/src/physical_optimizer/union/one_union.rs b/iox_query/src/physical_optimizer/union/one_union.rs index 311ab1e831..c43bedcade 100644 --- a/iox_query/src/physical_optimizer/union/one_union.rs +++ b/iox_query/src/physical_optimizer/union/one_union.rs @@ -70,7 +70,7 @@ mod tests { #[test] fn test_union_one() { let plan = Arc::new(UnionExec::new(vec![other_node()])); - let opt = OneUnion::default(); + let opt = OneUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -88,7 +88,7 @@ mod tests { #[test] fn test_union_two() { let plan = Arc::new(UnionExec::new(vec![other_node(), other_node()])); - let opt = OneUnion::default(); + let opt = OneUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" @@ -109,7 +109,7 @@ mod tests { #[test] fn test_other_node() { let plan = other_node(); - let opt = OneUnion::default(); + let opt = OneUnion; insta::assert_yaml_snapshot!( OptimizationTest::new(plan, opt), @r###" diff --git a/mutable_batch/src/payload/filter.rs b/mutable_batch/src/payload/filter.rs index 19d90c7566..825f783755 100644 --- a/mutable_batch/src/payload/filter.rs +++ b/mutable_batch/src/payload/filter.rs @@ -85,7 +85,7 @@ mod tests { use rand::prelude::*; fn make_rng() -> StdRng { - let seed = rand::rngs::OsRng::default().next_u64(); + let seed = rand::rngs::OsRng.next_u64(); println!("Seed: {seed}"); StdRng::seed_from_u64(seed) } diff --git a/mutable_batch/src/payload/partition.rs b/mutable_batch/src/payload/partition.rs index 0399b8c1b0..84dc167e06 100644 --- a/mutable_batch/src/payload/partition.rs +++ b/mutable_batch/src/payload/partition.rs @@ -346,7 +346,7 @@ mod tests { use rand::prelude::*; fn make_rng() -> StdRng { - let seed = rand::rngs::OsRng::default().next_u64(); + let seed = rand::rngs::OsRng.next_u64(); println!("Seed: {seed}"); StdRng::seed_from_u64(seed) } diff --git a/mutable_batch/tests/writer_fuzz.rs b/mutable_batch/tests/writer_fuzz.rs index 0025f042f2..31c23f51c7 100644 --- a/mutable_batch/tests/writer_fuzz.rs +++ b/mutable_batch/tests/writer_fuzz.rs @@ -25,7 +25,7 @@ use schema::Projection; use std::{collections::BTreeMap, num::NonZeroU64, ops::Range, sync::Arc}; fn make_rng() -> StdRng { - let seed = rand::rngs::OsRng::default().next_u64(); + let seed = rand::rngs::OsRng.next_u64(); println!("Seed: {seed}"); StdRng::seed_from_u64(seed) } diff --git a/router/src/server/http/write/multi_tenant.rs b/router/src/server/http/write/multi_tenant.rs index 734777adb9..79d06b77e5 100644 --- a/router/src/server/http/write/multi_tenant.rs +++ b/router/src/server/http/write/multi_tenant.rs @@ -85,7 +85,7 @@ mod tests { #[tokio::test] async fn test_parse_v1_always_errors() { - let unifier = MultiTenantRequestUnifier::default(); + let unifier = MultiTenantRequestUnifier; let got = unifier.parse_v1(&Request::default()).await; assert_matches!(got, Err(Error::NoHandler)); @@ -100,7 +100,7 @@ mod tests { paste::paste! { #[tokio::test] async fn []() { - let unifier = MultiTenantRequestUnifier::default(); + let unifier = MultiTenantRequestUnifier; let query = $query_string; let request = Request::builder()