Skip to content

Commit cc0178c

Browse files
committed
Change all usages to global arc
1 parent d218c2e commit cc0178c

File tree

110 files changed

+212
-216
lines changed

Some content is hidden

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

110 files changed

+212
-216
lines changed

datafusion/common/src/config.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ use std::collections::{BTreeMap, HashMap};
3434
use std::error::Error;
3535
use std::fmt::{self, Display};
3636
use std::str::FromStr;
37-
#[cfg(feature = "parquet_encryption")]
38-
use std::sync::Arc;
39-
use std::sync::LazyLock;
37+
use std::sync::{Arc, LazyLock};
4038

4139
/// A macro that wraps a configuration struct and automatically derives
4240
/// [`Default`] and [`ConfigField`] for it, allowing it to be used

datafusion/core/tests/fuzz_cases/equivalence/ordering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn test_ordering_satisfy_with_equivalence_complex_random() -> Result<()> {
111111
Arc::clone(&test_fun),
112112
vec![col_a],
113113
&test_schema,
114-
Arc::new(ConfigOptions::default()),
114+
ConfigOptions::default_arc(),
115115
)?);
116116
let a_plus_b = Arc::new(BinaryExpr::new(
117117
col("a", &test_schema)?,

datafusion/core/tests/fuzz_cases/equivalence/projection.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn project_orderings_random() -> Result<()> {
5050
Arc::clone(&test_fun),
5151
vec![col_a],
5252
&test_schema,
53-
Arc::new(ConfigOptions::default()),
53+
ConfigOptions::default_arc(),
5454
)?);
5555
// a + b
5656
let a_plus_b = Arc::new(BinaryExpr::new(
@@ -124,7 +124,7 @@ fn ordering_satisfy_after_projection_random() -> Result<()> {
124124
Arc::clone(&test_fun),
125125
vec![col_a],
126126
&test_schema,
127-
Arc::new(ConfigOptions::default()),
127+
ConfigOptions::default_arc(),
128128
)?) as PhysicalExprRef;
129129
// a + b
130130
let a_plus_b = Arc::new(BinaryExpr::new(

datafusion/core/tests/fuzz_cases/equivalence/properties.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn test_find_longest_permutation_random() -> Result<()> {
5050
Arc::clone(&test_fun),
5151
vec![col_a],
5252
&test_schema,
53-
Arc::new(ConfigOptions::default()),
53+
ConfigOptions::default_arc(),
5454
)?) as _;
5555

5656
let a_plus_b = Arc::new(BinaryExpr::new(

datafusion/core/tests/physical_optimizer/filter_pushdown.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn test_pushdown_volatile_functions_not_allowed() {
9898
// Test that we do not push down filters with volatile functions
9999
// Use random() as an example of a volatile function
100100
let scan = TestScanBuilder::new(schema()).with_support(true).build();
101-
let cfg = Arc::new(ConfigOptions::default());
101+
let cfg = ConfigOptions::default_arc();
102102
let predicate = Arc::new(BinaryExpr::new(
103103
Arc::new(Column::new_with_schema("a", &schema()).unwrap()),
104104
Operator::Eq,
@@ -695,7 +695,7 @@ fn test_filter_with_fetch_partially_pushed_to_scan() {
695695
let scan = TestScanBuilder::new(schema()).with_support(true).build();
696696
let pushed_predicate = col_lit_predicate("a", "foo", &schema());
697697
let volatile_predicate = {
698-
let cfg = Arc::new(ConfigOptions::default());
698+
let cfg = ConfigOptions::default_arc();
699699
Arc::new(BinaryExpr::new(
700700
Arc::new(Column::new_with_schema("a", &schema()).unwrap()),
701701
Operator::Eq,

datafusion/core/tests/physical_optimizer/projection_pushdown.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn test_update_matching_exprs() -> Result<()> {
130130
)),
131131
],
132132
Field::new("f", DataType::Int32, true).into(),
133-
Arc::new(ConfigOptions::default()),
133+
ConfigOptions::default_arc(),
134134
)),
135135
Arc::new(CaseExpr::try_new(
136136
Some(Arc::new(Column::new("d", 2))),
@@ -196,7 +196,7 @@ fn test_update_matching_exprs() -> Result<()> {
196196
)),
197197
],
198198
Field::new("f", DataType::Int32, true).into(),
199-
Arc::new(ConfigOptions::default()),
199+
ConfigOptions::default_arc(),
200200
)),
201201
Arc::new(CaseExpr::try_new(
202202
Some(Arc::new(Column::new("d", 3))),
@@ -271,7 +271,7 @@ fn test_update_projected_exprs() -> Result<()> {
271271
)),
272272
],
273273
Field::new("f", DataType::Int32, true).into(),
274-
Arc::new(ConfigOptions::default()),
274+
ConfigOptions::default_arc(),
275275
)),
276276
Arc::new(CaseExpr::try_new(
277277
Some(Arc::new(Column::new("d", 2))),
@@ -337,7 +337,7 @@ fn test_update_projected_exprs() -> Result<()> {
337337
)),
338338
],
339339
Field::new("f", DataType::Int32, true).into(),
340-
Arc::new(ConfigOptions::default()),
340+
ConfigOptions::default_arc(),
341341
)),
342342
Arc::new(CaseExpr::try_new(
343343
Some(Arc::new(Column::new("d_new", 3))),

datafusion/execution/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pub struct SessionConfig {
106106
impl Default for SessionConfig {
107107
fn default() -> Self {
108108
Self {
109-
options: Arc::new(ConfigOptions::new()),
109+
options: ConfigOptions::default_arc(),
110110
// Assume no extensions by default.
111111
extensions: HashMap::with_capacity_and_hasher(
112112
0,

datafusion/expr/src/execution_props.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl ExecutionProps {
7272

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

datafusion/functions-nested/benches/array_has.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn criterion_benchmark(c: &mut Criterion) {
5959
fn bench_array_has(c: &mut Criterion, array_size: usize) {
6060
let mut group = c.benchmark_group("array_has_i64");
6161
let list_array = create_int64_list_array(NUM_ROWS, array_size, NULL_DENSITY);
62-
let config_options = Arc::new(ConfigOptions::default());
62+
let config_options = ConfigOptions::default_arc();
6363
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();
6464
let arg_fields: Vec<Arc<Field>> = vec![
6565
Field::new("arr", list_array.data_type().clone(), false).into(),
@@ -123,7 +123,7 @@ fn bench_array_has_all(c: &mut Criterion, array_size: usize) {
123123
let mut group = c.benchmark_group("array_has_all");
124124
let haystack = create_int64_list_array(NUM_ROWS, array_size, NULL_DENSITY);
125125
let list_type = haystack.data_type().clone();
126-
let config_options = Arc::new(ConfigOptions::default());
126+
let config_options = ConfigOptions::default_arc();
127127
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();
128128
let arg_fields: Vec<Arc<Field>> = vec![
129129
Field::new("haystack", list_type.clone(), false).into(),
@@ -192,7 +192,7 @@ fn bench_array_has_any(c: &mut Criterion, array_size: usize) {
192192
let mut group = c.benchmark_group("array_has_any");
193193
let first_arr = create_int64_list_array(NUM_ROWS, array_size, NULL_DENSITY);
194194
let list_type = first_arr.data_type().clone();
195-
let config_options = Arc::new(ConfigOptions::default());
195+
let config_options = ConfigOptions::default_arc();
196196
let return_field: Arc<Field> = Field::new("result", DataType::Boolean, true).into();
197197
let arg_fields: Vec<Arc<Field>> = vec![
198198
Field::new("first", list_type.clone(), false).into(),
@@ -313,7 +313,7 @@ fn bench_array_has_any(c: &mut Criterion, array_size: usize) {
313313

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

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

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

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

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

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

556556
let array_size = 3;

datafusion/functions-nested/benches/array_position.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn bench_array_position(c: &mut Criterion, array_size: usize) {
6666
Field::new("needle", DataType::Int64, false).into(),
6767
];
6868
let return_field: Arc<Field> = Field::new("result", DataType::UInt64, true).into();
69-
let config_options = Arc::new(ConfigOptions::default());
69+
let config_options = ConfigOptions::default_arc();
7070
let needle = ScalarValue::Int64(Some(SENTINEL_NEEDLE));
7171

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

181181
let args_found_once = vec![

0 commit comments

Comments
 (0)