Merge branch 'main' into 12118/substrait-serialize-views

apache · Sep 6, 2024 · c587f99 · c587f99
2 parents 831017c + 9d819e1
commit c587f99
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/datafusion/core/src/execution/session_state.rs b/datafusion/core/src/execution/session_state.rs
@@ -1035,17 +1035,15 @@ impl SessionStateBuilder {
         }
     }
 
-    /// Set defaults for table_factories, file formats, expr_planners and builtin
-    /// scalar and aggregate functions.
-    pub fn with_default_features(mut self) -> Self {
-        self.table_factories = Some(SessionStateDefaults::default_table_factories());
-        self.file_formats = Some(SessionStateDefaults::default_file_formats());
-        self.expr_planners = Some(SessionStateDefaults::default_expr_planners());
-        self.scalar_functions = Some(SessionStateDefaults::default_scalar_functions());
-        self.aggregate_functions =
-            Some(SessionStateDefaults::default_aggregate_functions());
-        self.window_functions = Some(SessionStateDefaults::default_window_functions());
-        self
+    /// Create default builder with defaults for table_factories, file formats, expr_planners and builtin
+    /// scalar, aggregate and windows functions.
+    pub fn with_default_features(self) -> Self {
+        self.with_table_factories(SessionStateDefaults::default_table_factories())
+            .with_file_formats(SessionStateDefaults::default_file_formats())
+            .with_expr_planners(SessionStateDefaults::default_expr_planners())
+            .with_scalar_functions(SessionStateDefaults::default_scalar_functions())
+            .with_aggregate_functions(SessionStateDefaults::default_aggregate_functions())
+            .with_window_functions(SessionStateDefaults::default_window_functions())
     }
 
     /// Set the session id.

diff --git a/datafusion/functions/benches/repeat.rs b/datafusion/functions/benches/repeat.rs
@@ -67,7 +67,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args::<i32>(size, 32, repeat_times, true);
         group.bench_function(
-            &format!(
+            format!(
                 "repeat_string_view [size={}, repeat_times={}]",
                 size, repeat_times
             ),
@@ -76,7 +76,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args::<i32>(size, 32, repeat_times, false);
         group.bench_function(
-            &format!(
+            format!(
                 "repeat_string [size={}, repeat_times={}]",
                 size, repeat_times
             ),
@@ -85,7 +85,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args::<i64>(size, 32, repeat_times, false);
         group.bench_function(
-            &format!(
+            format!(
                 "repeat_large_string [size={}, repeat_times={}]",
                 size, repeat_times
             ),
@@ -103,7 +103,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args::<i32>(size, 32, repeat_times, true);
         group.bench_function(
-            &format!(
+            format!(
                 "repeat_string_view [size={}, repeat_times={}]",
                 size, repeat_times
             ),
@@ -112,7 +112,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args::<i32>(size, 32, repeat_times, false);
         group.bench_function(
-            &format!(
+            format!(
                 "repeat_string [size={}, repeat_times={}]",
                 size, repeat_times
             ),
@@ -121,7 +121,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args::<i64>(size, 32, repeat_times, false);
         group.bench_function(
-            &format!(
+            format!(
                 "repeat_large_string [size={}, repeat_times={}]",
                 size, repeat_times
             ),

diff --git a/datafusion/functions/benches/substr.rs b/datafusion/functions/benches/substr.rs
@@ -106,19 +106,19 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_without_count::<i32>(size, len, true, true);
         group.bench_function(
-            &format!("substr_string_view [size={}, strlen={}]", size, len),
+            format!("substr_string_view [size={}, strlen={}]", size, len),
             |b| b.iter(|| black_box(substr.invoke(&args))),
         );
 
         let args = create_args_without_count::<i32>(size, len, false, false);
         group.bench_function(
-            &format!("substr_string [size={}, strlen={}]", size, len),
+            format!("substr_string [size={}, strlen={}]", size, len),
             |b| b.iter(|| black_box(substr.invoke(&args))),
         );
 
         let args = create_args_without_count::<i64>(size, len, true, false);
         group.bench_function(
-            &format!("substr_large_string [size={}, strlen={}]", size, len),
+            format!("substr_large_string [size={}, strlen={}]", size, len),
             |b| b.iter(|| black_box(substr.invoke(&args))),
         );
 
@@ -133,7 +133,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_with_count::<i32>(size, len, count, true);
         group.bench_function(
-            &format!(
+            format!(
                 "substr_string_view [size={}, count={}, strlen={}]",
                 size, count, len,
             ),
@@ -142,7 +142,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_with_count::<i32>(size, len, count, false);
         group.bench_function(
-            &format!(
+            format!(
                 "substr_string [size={}, count={}, strlen={}]",
                 size, count, len,
             ),
@@ -151,7 +151,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_with_count::<i64>(size, len, count, false);
         group.bench_function(
-            &format!(
+            format!(
                 "substr_large_string [size={}, count={}, strlen={}]",
                 size, count, len,
             ),
@@ -169,7 +169,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_with_count::<i32>(size, len, count, true);
         group.bench_function(
-            &format!(
+            format!(
                 "substr_string_view [size={}, count={}, strlen={}]",
                 size, count, len,
             ),
@@ -178,7 +178,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_with_count::<i32>(size, len, count, false);
         group.bench_function(
-            &format!(
+            format!(
                 "substr_string [size={}, count={}, strlen={}]",
                 size, count, len,
             ),
@@ -187,7 +187,7 @@ fn criterion_benchmark(c: &mut Criterion) {
 
         let args = create_args_with_count::<i64>(size, len, count, false);
         group.bench_function(
-            &format!(
+            format!(
                 "substr_large_string [size={}, count={}, strlen={}]",
                 size, count, len,
             ),