Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rust/arrow-flight/src/arrow.flight.protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,9 @@ pub mod flight_service_server {
#[async_trait]
pub trait FlightService: Send + Sync + 'static {
#[doc = "Server streaming response type for the Handshake method."]
type HandshakeStream: Stream<Item = Result<super::HandshakeResponse, tonic::Status>>
+ Send
type HandshakeStream: Stream<
Item = Result<super::HandshakeResponse, tonic::Status>,
> + Send
+ Sync
+ 'static;
#[doc = ""]
Expand Down
3 changes: 2 additions & 1 deletion rust/benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ parquet = { path = "../parquet" }
datafusion = { path = "../datafusion" }
structopt = { version = "0.3", default-features = false }
tokio = { version = "0.2", features = ["macros", "rt-core", "rt-threaded"] }
futures = "0.3"
futures = "0.3"
env_logger = "^0.8"
2 changes: 2 additions & 0 deletions rust/benchmarks/src/bin/tpch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ async fn main() -> Result<()> {
}

async fn benchmark(opt: BenchmarkOpt) -> Result<()> {
env_logger::init();

println!("Running benchmarks with the following options: {:?}", opt);
let config = ExecutionConfig::new()
.with_concurrency(opt.concurrency)
Expand Down
1 change: 1 addition & 0 deletions rust/datafusion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ chrono = "0.4"
async-trait = "0.1.41"
futures = "0.3"
pin-project-lite= "^0.2.0"
log = "^0.4"
tokio = { version = "0.2", features = ["macros", "rt-core", "rt-threaded"] }

[dev-dependencies]
Expand Down
4 changes: 3 additions & 1 deletion rust/datafusion/src/execution/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// under the License.

//! ExecutionContext contains methods for registering data sources and executing queries
use crate::optimizer::hash_build_probe_order::HashBuildProbeOrder;
use log::debug;
use std::fs;
use std::path::Path;
use std::string::String;
Expand Down Expand Up @@ -316,9 +316,11 @@ impl ExecutionContext {
/// Optimize the logical plan by applying optimizer rules
pub fn optimize(&self, plan: &LogicalPlan) -> Result<LogicalPlan> {
// Apply standard rewrites and optimizations
debug!("Logical plan:\n {:?}", plan);
let mut plan = ProjectionPushDown::new().optimize(&plan)?;
plan = FilterPushDown::new().optimize(&plan)?;
plan = HashBuildProbeOrder::new().optimize(&plan)?;
debug!("Optimized logical plan:\n {:?}", plan);

self.state
.lock()
Expand Down