Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
12 changes: 10 additions & 2 deletions datafusion/common/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ use std::collections::{BTreeMap, HashMap};
use std::error::Error;
use std::fmt::{self, Display};
use std::str::FromStr;
#[cfg(feature = "parquet_encryption")]
use std::sync::Arc;
use std::sync::{Arc, LazyLock};

/// A macro that wraps a configuration struct and automatically derives
/// [`Default`] and [`ConfigField`] for it, allowing it to be used
Expand Down Expand Up @@ -1382,12 +1381,21 @@ impl ConfigField for ConfigOptions {
/// (FFI) based configuration extensions.
pub const DATAFUSION_FFI_CONFIG_NAMESPACE: &str = "datafusion_ffi";

/// Global default configuration options
static DEFAULT_CONFIG: LazyLock<Arc<ConfigOptions>> =
LazyLock::new(|| Arc::new(ConfigOptions::new()));

impl ConfigOptions {
/// Creates a new [`ConfigOptions`] with default values
pub fn new() -> Self {
Self::default()
}

/// Return a reference to the default configuration options
pub fn default_arc() -> Arc<Self> {
Arc::clone(&DEFAULT_CONFIG)
}

/// Set extensions to provided value
pub fn with_extensions(mut self, extensions: Extensions) -> Self {
self.extensions = extensions;
Expand Down
2 changes: 1 addition & 1 deletion datafusion/core/tests/fuzz_cases/equivalence/ordering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fn test_ordering_satisfy_with_equivalence_complex_random() -> Result<()> {
Arc::clone(&test_fun),
vec![col_a],
&test_schema,
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)?);
let a_plus_b = Arc::new(BinaryExpr::new(
col("a", &test_schema)?,
Expand Down
4 changes: 2 additions & 2 deletions datafusion/core/tests/fuzz_cases/equivalence/projection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn project_orderings_random() -> Result<()> {
Arc::clone(&test_fun),
vec![col_a],
&test_schema,
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)?);
// a + b
let a_plus_b = Arc::new(BinaryExpr::new(
Expand Down Expand Up @@ -124,7 +124,7 @@ fn ordering_satisfy_after_projection_random() -> Result<()> {
Arc::clone(&test_fun),
vec![col_a],
&test_schema,
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)?) as PhysicalExprRef;
// a + b
let a_plus_b = Arc::new(BinaryExpr::new(
Expand Down
2 changes: 1 addition & 1 deletion datafusion/core/tests/fuzz_cases/equivalence/properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn test_find_longest_permutation_random() -> Result<()> {
Arc::clone(&test_fun),
vec![col_a],
&test_schema,
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)?) as _;

let a_plus_b = Arc::new(BinaryExpr::new(
Expand Down
4 changes: 2 additions & 2 deletions datafusion/core/tests/physical_optimizer/filter_pushdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ fn test_pushdown_volatile_functions_not_allowed() {
// Test that we do not push down filters with volatile functions
// Use random() as an example of a volatile function
let scan = TestScanBuilder::new(schema()).with_support(true).build();
let cfg = Arc::new(ConfigOptions::default());
let cfg = ConfigOptions::default_arc();
let predicate = Arc::new(BinaryExpr::new(
Arc::new(Column::new_with_schema("a", &schema()).unwrap()),
Operator::Eq,
Expand Down Expand Up @@ -695,7 +695,7 @@ fn test_filter_with_fetch_partially_pushed_to_scan() {
let scan = TestScanBuilder::new(schema()).with_support(true).build();
let pushed_predicate = col_lit_predicate("a", "foo", &schema());
let volatile_predicate = {
let cfg = Arc::new(ConfigOptions::default());
let cfg = ConfigOptions::default_arc();
Arc::new(BinaryExpr::new(
Arc::new(Column::new_with_schema("a", &schema()).unwrap()),
Operator::Eq,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fn test_update_matching_exprs() -> Result<()> {
)),
],
Field::new("f", DataType::Int32, true).into(),
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)),
Arc::new(CaseExpr::try_new(
Some(Arc::new(Column::new("d", 2))),
Expand Down Expand Up @@ -196,7 +196,7 @@ fn test_update_matching_exprs() -> Result<()> {
)),
],
Field::new("f", DataType::Int32, true).into(),
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)),
Arc::new(CaseExpr::try_new(
Some(Arc::new(Column::new("d", 3))),
Expand Down Expand Up @@ -271,7 +271,7 @@ fn test_update_projected_exprs() -> Result<()> {
)),
],
Field::new("f", DataType::Int32, true).into(),
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)),
Arc::new(CaseExpr::try_new(
Some(Arc::new(Column::new("d", 2))),
Expand Down Expand Up @@ -337,7 +337,7 @@ fn test_update_projected_exprs() -> Result<()> {
)),
],
Field::new("f", DataType::Int32, true).into(),
Arc::new(ConfigOptions::default()),
ConfigOptions::default_arc(),
)),
Arc::new(CaseExpr::try_new(
Some(Arc::new(Column::new("d_new", 3))),
Expand Down
2 changes: 1 addition & 1 deletion datafusion/execution/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub struct SessionConfig {
impl Default for SessionConfig {
fn default() -> Self {
Self {
options: Arc::new(ConfigOptions::new()),
options: ConfigOptions::default_arc(),
// Assume no extensions by default.
extensions: HashMap::with_capacity_and_hasher(
0,
Expand Down
2 changes: 1 addition & 1 deletion datafusion/expr/src/execution_props.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl ExecutionProps {

#[deprecated(since = "50.0.0", note = "Use mark_start_execution instead")]
pub fn start_execution(&mut self) -> &Self {
let default_config = Arc::new(ConfigOptions::default());
let default_config = ConfigOptions::default_arc();
self.mark_start_execution(default_config)
}

Expand Down
2 changes: 1 addition & 1 deletion datafusion/expr/src/simplify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl Default for SimplifyContext {
Self {
schema: Arc::new(DFSchema::empty()),
query_execution_start_time: None,
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions datafusion/functions-nested/benches/array_has.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn criterion_benchmark(c: &mut Criterion) {
fn bench_array_has(c: &mut Criterion, array_size: usize) {
let mut group = c.benchmark_group("array_has_i64");
let list_array = create_int64_list_array(NUM_ROWS, array_size, NULL_DENSITY);
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();
let arg_fields: Vec<Arc<Field>> = vec![
Field::new("arr", list_array.data_type().clone(), false).into(),
Expand Down Expand Up @@ -123,7 +123,7 @@ fn bench_array_has_all(c: &mut Criterion, array_size: usize) {
let mut group = c.benchmark_group("array_has_all");
let haystack = create_int64_list_array(NUM_ROWS, array_size, NULL_DENSITY);
let list_type = haystack.data_type().clone();
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();
let arg_fields: Vec<Arc<Field>> = vec![
Field::new("haystack", list_type.clone(), false).into(),
Expand Down Expand Up @@ -192,7 +192,7 @@ fn bench_array_has_any(c: &mut Criterion, array_size: usize) {
let mut group = c.benchmark_group("array_has_any");
let first_arr = create_int64_list_array(NUM_ROWS, array_size, NULL_DENSITY);
let list_type = first_arr.data_type().clone();
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();
let arg_fields: Vec<Arc<Field>> = vec![
Field::new("first", list_type.clone(), false).into(),
Expand Down Expand Up @@ -313,7 +313,7 @@ fn bench_array_has_any(c: &mut Criterion, array_size: usize) {

fn bench_array_has_strings(c: &mut Criterion) {
let mut group = c.benchmark_group("array_has_strings");
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();

let sizes = vec![10, 100, 500];
Expand Down Expand Up @@ -371,7 +371,7 @@ fn bench_array_has_strings(c: &mut Criterion) {

fn bench_array_has_all_strings(c: &mut Criterion) {
let mut group = c.benchmark_group("array_has_all_strings");
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();

let sizes = vec![10, 100, 500];
Expand Down Expand Up @@ -433,7 +433,7 @@ fn bench_array_has_all_strings(c: &mut Criterion) {

fn bench_array_has_any_strings(c: &mut Criterion) {
let mut group = c.benchmark_group("array_has_any_strings");
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();

let sizes = vec![10, 100, 500];
Expand Down Expand Up @@ -550,7 +550,7 @@ fn bench_array_has_any_strings(c: &mut Criterion) {
/// size while keeping the columnar array small (3 elements per row).
fn bench_array_has_any_scalar(c: &mut Criterion) {
let mut group = c.benchmark_group("array_has_any_scalar");
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();

let array_size = 3;
Expand Down
4 changes: 2 additions & 2 deletions datafusion/functions-nested/benches/array_position.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fn bench_array_position(c: &mut Criterion, array_size: usize) {
Field::new("needle", DataType::Int64, false).into(),
];
let return_field: Arc<Field> = Field::new("result", DataType::UInt64, true).into();
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let needle = ScalarValue::Int64(Some(SENTINEL_NEEDLE));

// Benchmark: one match per row.
Expand Down Expand Up @@ -175,7 +175,7 @@ fn bench_array_positions(c: &mut Criterion, array_size: usize) {
true,
)
.into();
let config_options = Arc::new(ConfigOptions::default());
let config_options = ConfigOptions::default_arc();
let needle = ScalarValue::Int64(Some(SENTINEL_NEEDLE));

let args_found_once = vec![
Expand Down
14 changes: 7 additions & 7 deletions datafusion/functions-nested/benches/array_remove.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fn bench_array_remove_int64(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -121,7 +121,7 @@ fn bench_array_remove_f64(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -162,7 +162,7 @@ fn bench_array_remove_strings(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -203,7 +203,7 @@ fn bench_array_remove_binary(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -244,7 +244,7 @@ fn bench_array_remove_boolean(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -286,7 +286,7 @@ fn bench_array_remove_decimal64(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -329,7 +329,7 @@ fn bench_array_remove_fixed_size_binary(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down
12 changes: 6 additions & 6 deletions datafusion/functions-nested/benches/array_repeat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ fn bench_array_repeat_int64(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -131,7 +131,7 @@ fn bench_array_repeat_string(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -184,7 +184,7 @@ fn bench_array_repeat_nested_int64_list(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -233,7 +233,7 @@ fn bench_array_repeat_float64(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -282,7 +282,7 @@ fn bench_array_repeat_boolean(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -335,7 +335,7 @@ fn bench_array_repeat_nested_string_list(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down
6 changes: 3 additions & 3 deletions datafusion/functions-nested/benches/array_set_ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fn invoke_udf(udf: &impl ScalarUDFImpl, array1: &ArrayRef, array2: &ArrayRef) {
],
number_rows: NUM_ROWS,
return_field: Field::new("result", array1.data_type().clone(), false).into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
);
Expand Down Expand Up @@ -155,7 +155,7 @@ fn bench_array_distinct(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down Expand Up @@ -374,7 +374,7 @@ fn bench_array_distinct_sliced(c: &mut Criterion) {
false,
)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down
2 changes: 1 addition & 1 deletion datafusion/functions-nested/benches/array_slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn array_slice_benchmark(
number_rows: size,
return_field: Field::new_list_field(args[0].data_type(), true)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down
2 changes: 1 addition & 1 deletion datafusion/functions-nested/benches/array_to_string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fn bench_array_to_string(
number_rows: NUM_ROWS,
return_field: Field::new("result", DataType::Utf8, true)
.into(),
config_options: Arc::new(ConfigOptions::default()),
config_options: ConfigOptions::default_arc(),
})
.unwrap(),
)
Expand Down
Loading
Loading