Skip to content

Commit e866aba

Browse files
authored
Merge branch 'main' into feat_migrate_ffi_to_stabby
2 parents 21246e2 + 415bd42 commit e866aba

130 files changed

Lines changed: 292 additions & 310 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/catalog-listing/src/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ mod tests {
462462
use std::ops::Not;
463463

464464
use super::*;
465-
use datafusion_expr::{Expr, case, col, lit};
465+
use datafusion_expr::{case, col};
466466

467467
#[test]
468468
fn test_split_files() {

datafusion/catalog-listing/src/table.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,6 @@ mod tests {
920920
use arrow::compute::SortOptions;
921921
use datafusion_physical_expr::expressions::Column;
922922
use datafusion_physical_expr_common::sort_expr::PhysicalSortExpr;
923-
use std::sync::Arc;
924923

925924
/// Helper to create a PhysicalSortExpr
926925
fn sort_expr(

datafusion/common/src/config.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,12 @@ config_namespace! {
10881088
/// process to reorder the join keys
10891089
pub top_down_join_key_reordering: bool, default = true
10901090

1091+
/// When set to true, the physical plan optimizer may swap join inputs
1092+
/// based on statistics. When set to false, statistics-driven join
1093+
/// input reordering is disabled and the original join order in the
1094+
/// query is used.
1095+
pub join_reordering: bool, default = true
1096+
10911097
/// When set to true, the physical plan optimizer will prefer HashJoin over SortMergeJoin.
10921098
/// HashJoin can work more efficiently than SortMergeJoin but consumes more memory
10931099
pub prefer_hash_join: bool, default = true

datafusion/common/src/scalar/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5336,7 +5336,6 @@ impl ScalarType<i32> for Date32Type {
53365336

53375337
#[cfg(test)]
53385338
mod tests {
5339-
use std::sync::Arc;
53405339

53415340
use super::*;
53425341
use crate::cast::{as_list_array, as_map_array, as_struct_array};
@@ -5354,7 +5353,6 @@ mod tests {
53545353
};
53555354
use arrow::error::ArrowError;
53565355
use arrow::util::pretty::pretty_format_columns;
5357-
use chrono::NaiveDate;
53585356
use insta::assert_snapshot;
53595357
use rand::Rng;
53605358

datafusion/common/src/types/logical.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ mod tests {
143143
LogicalField, LogicalFields, logical_boolean, logical_date, logical_float32,
144144
logical_float64, logical_int32, logical_int64, logical_null, logical_string,
145145
};
146-
use arrow::datatypes::{DataType, Field, Fields};
146+
use arrow::datatypes::{Field, Fields};
147147
use insta::assert_snapshot;
148148

149149
#[test]

datafusion/common/src/types/native.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,6 @@ impl NativeType {
565565
mod tests {
566566
use super::*;
567567
use crate::types::LogicalField;
568-
use arrow::datatypes::Field;
569568
use insta::assert_snapshot;
570569

571570
#[test]

datafusion/core/src/dataframe/parquet.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ impl DataFrame {
107107
#[cfg(test)]
108108
mod tests {
109109
use std::collections::HashMap;
110-
use std::sync::Arc;
111110

112111
use super::super::Result;
113112
use super::*;

datafusion/core/src/datasource/listing_table_factory.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,17 +557,13 @@ mod tests {
557557

558558
#[tokio::test]
559559
async fn test_create_with_invalid_session() {
560-
use async_trait::async_trait;
561-
use datafusion_catalog::Session;
562-
use datafusion_common::Result;
563560
use datafusion_common::config::TableOptions;
564561
use datafusion_execution::TaskContext;
565562
use datafusion_execution::config::SessionConfig;
566563
use datafusion_physical_expr::PhysicalExpr;
567564
use datafusion_physical_plan::ExecutionPlan;
568565
use std::any::Any;
569566
use std::collections::HashMap;
570-
use std::sync::Arc;
571567

572568
// A mock Session that is NOT SessionState
573569
#[derive(Debug)]

datafusion/datasource-arrow/src/file_format.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ mod tests {
557557
use datafusion_expr::execution_props::ExecutionProps;
558558
use datafusion_expr::{AggregateUDF, Expr, LogicalPlan, ScalarUDF, WindowUDF};
559559
use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
560-
use object_store::{chunked::ChunkedStore, memory::InMemory, path::Path};
560+
use object_store::{chunked::ChunkedStore, memory::InMemory};
561561

562562
struct MockSession {
563563
config: SessionConfig,

0 commit comments

Comments
 (0)