Skip to content

Commit

Permalink
Merge remote-tracking branch 'apache/main' into array_contains
Browse files Browse the repository at this point in the history
  • Loading branch information
alamb committed Jun 26, 2023
2 parents b9192db + 7d3cae0 commit 44540a1
Show file tree
Hide file tree
Showing 205 changed files with 7,239 additions and 3,362 deletions.
13 changes: 7 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ repository = "https://github.com/apache/arrow-datafusion"
rust-version = "1.64"

[workspace.dependencies]
arrow = { version = "41.0.0", features = ["prettyprint"] }
arrow-flight = { version = "41.0.0", features = ["flight-sql-experimental"] }
arrow-buffer = { version = "41.0.0", default-features = false }
arrow-schema = { version = "41.0.0", default-features = false }
arrow-array = { version = "41.0.0", default-features = false, features = ["chrono-tz"] }
parquet = { version = "41.0.0", features = ["arrow", "async", "object_store"] }
arrow = { version = "42.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
arrow-flight = { version = "42.0.0", features = ["flight-sql-experimental"] }
arrow-buffer = { version = "42.0.0", default-features = false }
arrow-schema = { version = "42.0.0", default-features = false }
arrow-array = { version = "42.0.0", default-features = false, features = ["chrono-tz"] }
parquet = { version = "42.0.0", features = ["arrow", "async", "object_store"] }
sqlparser = { version = "0.35", features = ["visitor"] }

[profile.release]
codegen-units = 1
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/src/bin/tpch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,14 @@ async fn execute_query(
if debug {
println!(
"=== Physical plan ===\n{}\n",
displayable(physical_plan.as_ref()).indent()
displayable(physical_plan.as_ref()).indent(true)
);
}
let result = collect(physical_plan.clone(), state.task_ctx()).await?;
if debug {
println!(
"=== Physical plan with metrics ===\n{}\n",
DisplayableExecutionPlan::with_metrics(physical_plan.as_ref()).indent()
DisplayableExecutionPlan::with_metrics(physical_plan.as_ref()).indent(true)
);
if !result.is_empty() {
// do not call print_batches if there are no batches as the result is confusing
Expand Down
Loading

0 comments on commit 44540a1

Please sign in to comment.