Skip to content

Commit ad72077

Browse files
committed
fix conflict
1 parent e152f8a commit ad72077

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

benchmarks/src/clickbench.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ impl RunOpt {
132132
parquet_options.binary_as_string = true;
133133
}
134134

135+
config
136+
.options_mut()
137+
.optimizer
138+
.prefer_round_robin_repartition = self.prefer_round_robin;
135139
let rt_builder = self.common.runtime_env_builder()?;
136140
let ctx = SessionContext::new_with_config_rt(config, rt_builder.build_arc()?);
137141
self.register_hits(&ctx).await?;

benchmarks/src/tpch/run.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ impl RunOpt {
126126
.config()
127127
.with_collect_statistics(!self.disable_statistics);
128128
config.options_mut().optimizer.prefer_hash_join = self.prefer_hash_join;
129+
config
130+
.options_mut()
131+
.optimizer
132+
.prefer_round_robin_repartition = self.prefer_round_robin;
129133
let rt_builder = self.common.runtime_env_builder()?;
130134
let ctx = SessionContext::new_with_config_rt(config, rt_builder.build_arc()?);
131135

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,11 +1672,7 @@ mod tests {
16721672
)
16731673
.unwrap()
16741674
}
1675-
1676-
#[cfg(test)]
1677-
mod test {
16781675
use arrow::compute::SortOptions;
1679-
use arrow::datatypes::{DataType, Field, Schema};
16801676

16811677
use crate::source::DataSourceExec;
16821678
use crate::union::UnionExec;

0 commit comments

Comments
 (0)