fix conflict

Author: Weijun-H

benchmarks/src/clickbench.rs

@@ -132,6 +132,10 @@ impl RunOpt {
             parquet_options.binary_as_string = true;
         }
 
+        config
+            .options_mut()
+            .optimizer
+            .prefer_round_robin_repartition = self.prefer_round_robin;
         let rt_builder = self.common.runtime_env_builder()?;
         let ctx = SessionContext::new_with_config_rt(config, rt_builder.build_arc()?);
         self.register_hits(&ctx).await?;

benchmarks/src/tpch/run.rs

@@ -126,6 +126,10 @@ impl RunOpt {
             .config()
             .with_collect_statistics(!self.disable_statistics);
         config.options_mut().optimizer.prefer_hash_join = self.prefer_hash_join;
+        config
+            .options_mut()
+            .optimizer
+            .prefer_round_robin_repartition = self.prefer_round_robin;
         let rt_builder = self.common.runtime_env_builder()?;
         let ctx = SessionContext::new_with_config_rt(config, rt_builder.build_arc()?);
 

datafusion/physical-plan/src/repartition/mod.rs

@@ -1129,15 +1129,13 @@ mod tests {
     use crate::{
         collect,
         expressions::col,
-        memory::MemorySourceConfig,
         test::{
             assert_is_pending,
             exec::{
                 assert_strong_count_converges_to_zero, BarrierExec, BlockingExec,
                 ErrorExec, MockExec,
             },
         },
-        {collect, expressions::col},
     };
 
     use arrow::array::{ArrayRef, StringArray, UInt32Array};
@@ -1672,12 +1670,13 @@ mod tests {
 #[cfg(test)]
 mod test {
     use arrow::compute::SortOptions;
-    use arrow::datatypes::Schema;
+    use arrow::datatypes::{DataType, Field, Schema};
 
     use super::*;
     use crate::test::TestMemoryExec;
     use crate::union::UnionExec;
 
+    use datafusion_physical_expr::expressions::col;
     use datafusion_physical_expr_common::sort_expr::{LexOrdering, PhysicalSortExpr};
 
     /// Asserts that the plan is as expected
@@ -1767,6 +1766,10 @@ mod test {
         Ok(())
     }
 
+    fn test_schema() -> Arc<Schema> {
+        Arc::new(Schema::new(vec![Field::new("c0", DataType::UInt32, false)]))
+    }
+
     fn sort_exprs(schema: &Schema) -> LexOrdering {
         let options = SortOptions::default();
         LexOrdering::new(vec![PhysicalSortExpr {