Merge pull request #6 from alamb/alamb/just_use_arc

Use Arc all the way down

Author: Omega359

datafusion/core/src/execution/session_state.rs

@@ -734,18 +734,13 @@ impl SessionState {
     }
 
     /// return the configuration options
-    pub fn config_options(&self) -> &ConfigOptions {
+    pub fn config_options(&self) -> &Arc<ConfigOptions> {
         self.config.options()
     }
 
-    /// return the configuration options
-    pub fn config_options_arc(&self) -> Arc<ConfigOptions> {
-        self.config.options_arc()
-    }
-
     /// Mark the start of the execution
     pub fn start_execution(&mut self) {
-        let config = self.config.options_arc();
+        let config = Arc::clone(self.config.options());
         self.execution_props.start_execution(config);
     }
 
@@ -1899,7 +1894,7 @@ impl OptimizerConfig for SessionState {
     }
 
     fn options(&self) -> Arc<ConfigOptions> {
-        self.config_options_arc()
+        Arc::clone(self.config.options())
     }
 
     fn function_registry(&self) -> Option<&dyn FunctionRegistry> {

datafusion/core/tests/parquet/file_statistics.rs

@@ -38,6 +38,7 @@ use datafusion_execution::runtime_env::RuntimeEnvBuilder;
 use datafusion_expr::{col, lit, Expr};
 
 use datafusion::datasource::physical_plan::FileScanConfig;
+use datafusion_common::config::ConfigOptions;
 use datafusion_physical_optimizer::filter_pushdown::FilterPushdown;
 use datafusion_physical_optimizer::PhysicalOptimizerRule;
 use datafusion_physical_plan::filter::FilterExec;
@@ -55,7 +56,7 @@ async fn check_stats_precision_with_filter_pushdown() {
     let table = get_listing_table(&table_path, None, &opt).await;
 
     let (_, _, state) = get_cache_runtime_state();
-    let mut options = state.config().options().clone();
+    let mut options: ConfigOptions = state.config().options().as_ref().clone();
     options.execution.parquet.pushdown_filters = true;
 
     // Scan without filter, stats are exact

datafusion/execution/src/config.rs

@@ -136,15 +136,10 @@ impl SessionConfig {
     /// let config = SessionConfig::new();
     /// assert!(config.options().execution.batch_size > 0);
     /// ```
-    pub fn options(&self) -> &ConfigOptions {
+    pub fn options(&self) -> &Arc<ConfigOptions> {
         &self.options
     }
 
-    /// Returns the config options as an Arc
-    pub fn options_arc(&self) -> Arc<ConfigOptions> {
-        Arc::clone(&self.options)
-    }
-
     /// Return a mutable handle to the configuration options.
     ///
     /// Can be used to set configuration options.

datafusion/ffi/src/session_config.rs

@@ -15,17 +15,17 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::{
-    collections::HashMap,
-    ffi::{c_char, c_void, CString},
-};
-
 use abi_stable::{
     std_types::{RHashMap, RString},
     StableAbi,
 };
 use datafusion::{config::ConfigOptions, error::Result};
 use datafusion::{error::DataFusionError, prelude::SessionConfig};
+use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    ffi::{c_char, c_void, CString},
+};
 
 /// A stable struct for sharing [`SessionConfig`] across FFI boundaries.
 /// Instead of attempting to expose the entire SessionConfig interface, we
@@ -85,11 +85,9 @@ unsafe extern "C" fn release_fn_wrapper(config: &mut FFI_SessionConfig) {
 
 unsafe extern "C" fn clone_fn_wrapper(config: &FFI_SessionConfig) -> FFI_SessionConfig {
     let old_private_data = config.private_data as *mut SessionConfigPrivateData;
-    let old_config = &(*old_private_data).config;
+    let old_config = Arc::clone(&(*old_private_data).config);
 
-    let private_data = Box::new(SessionConfigPrivateData {
-        config: old_config.clone(),
-    });
+    let private_data = Box::new(SessionConfigPrivateData { config: old_config });
 
     FFI_SessionConfig {
         config_options: config_options_fn_wrapper,
@@ -100,7 +98,7 @@ unsafe extern "C" fn clone_fn_wrapper(config: &FFI_SessionConfig) -> FFI_Session
 }
 
 struct SessionConfigPrivateData {
-    pub config: ConfigOptions,
+    pub config: Arc<ConfigOptions>,
 }
 
 impl From<&SessionConfig> for FFI_SessionConfig {
@@ -120,7 +118,7 @@ impl From<&SessionConfig> for FFI_SessionConfig {
         }
 
         let private_data = Box::new(SessionConfigPrivateData {
-            config: session.options().clone(),
+            config: Arc::clone(session.options()),
         });
 
         Self {

datafusion/physical-plan/src/async_func.rs

@@ -176,7 +176,7 @@ impl ExecutionPlan for AsyncFuncExec {
         // now, for each record batch, evaluate the async expressions and add the columns to the result
         let async_exprs_captured = Arc::new(self.async_exprs.clone());
         let schema_captured = self.schema();
-        let config_options_ref = Arc::new(context.session_config().options().clone());
+        let config_options_ref = Arc::clone(context.session_config().options());
 
         let stream_with_async_functions = input_stream.then(move |batch| {
             // need to clone *again* to capture the async_exprs and schema in the