Update examples and tests

Author: timsaucer

examples/datafusion-ffi-example/Cargo.toml

@@ -51,3 +51,11 @@ pyo3-build-config = { workspace = true }
 [lib]
 name = "datafusion_ffi_example"
 crate-type = ["cdylib", "rlib"]
+
+[patch.crates-io]
+datafusion-catalog = { git = "https://github.com/timsaucer/datafusion", rev = "33ea91c5fa37aa0cfa787d58c6bf84ec4628db88" }
+datafusion-common = { git = "https://github.com/timsaucer/datafusion", rev = "33ea91c5fa37aa0cfa787d58c6bf84ec4628db88" }
+datafusion-functions-aggregate = { git = "https://github.com/timsaucer/datafusion", rev = "33ea91c5fa37aa0cfa787d58c6bf84ec4628db88" }
+datafusion-functions-window = { git = "https://github.com/timsaucer/datafusion", rev = "33ea91c5fa37aa0cfa787d58c6bf84ec4628db88" }
+datafusion-expr = { git = "https://github.com/timsaucer/datafusion", rev = "33ea91c5fa37aa0cfa787d58c6bf84ec4628db88" }
+datafusion-ffi = { git = "https://github.com/timsaucer/datafusion", rev = "33ea91c5fa37aa0cfa787d58c6bf84ec4628db88" }

examples/datafusion-ffi-example/python/tests/_test_config.py

@@ -1,8 +1,18 @@
-import pyarrow as pa
-from datafusion import SessionConfig
+from datafusion import SessionConfig, SessionContext
 from datafusion_ffi_example import MyConfig
 
+
 def test_catalog_provider():
     config = MyConfig()
-    config = SessionConfig().with_extension(config)
+    config = SessionConfig(
+        {"datafusion.catalog.information_schema": "true"}
+    ).with_extension(config)
     config.set("my_config.baz_count", "42")
+    ctx = SessionContext(config)
+
+    result = ctx.sql("SHOW my_config.baz_count;").collect()
+    assert result[0][1][0].as_py() == "42"
+
+    ctx.sql("SET my_config.baz_count=1;")
+    result = ctx.sql("SHOW my_config.baz_count;").collect()
+    assert result[0][1][0].as_py() == "1"

examples/datafusion-ffi-example/src/config.rs

@@ -1,10 +1,13 @@
-use datafusion::common::{config_err, DataFusionError};
-use datafusion::config::{ConfigEntry, ConfigExtension, ConfigField, ExtensionOptions, Visit};
-use pyo3::{pyclass, pymethods, Bound, PyResult, Python};
 use std::any::Any;
+
+use datafusion_common::config::{
+    ConfigEntry, ConfigExtension, ConfigField, ExtensionOptions, Visit,
+};
+use datafusion_common::{DataFusionError, config_err};
 use datafusion_ffi::config::extension_options::FFI_ExtensionOptions;
 use pyo3::exceptions::PyRuntimeError;
 use pyo3::types::PyCapsule;
+use pyo3::{Bound, PyResult, Python, pyclass, pymethods};
 
 /// My own config options.
 #[pyclass(name = "MyConfig", module = "datafusion_ffi_example", subclass)]
@@ -24,15 +27,16 @@ impl MyConfig {
         Self::default()
     }
 
-
     fn __datafusion_extension_options__<'py>(
         &self,
         py: Python<'py>,
     ) -> PyResult<Bound<'py, PyCapsule>> {
         let name = cr"datafusion_extension_options".into();
 
         let mut config = FFI_ExtensionOptions::default();
-        config.add_config(self).map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
+        config
+            .add_config(self)
+            .map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
 
         PyCapsule::new(py, config, Some(name))
     }
@@ -64,8 +68,8 @@ impl ExtensionOptions for MyConfig {
         Box::new(self.clone())
     }
 
-    fn set(&mut self, key: &str, value: &str) -> datafusion::common::Result<()> {
-        datafusion::config::ConfigField::set(self, key, value)
+    fn set(&mut self, key: &str, value: &str) -> datafusion_common::Result<()> {
+        datafusion_common::config::ConfigField::set(self, key, value)
     }
 
     fn entries(&self) -> Vec<ConfigEntry> {
@@ -103,6 +107,5 @@ impl ConfigField for MyConfig {
 
             _ => config_err!("Config value \"{}\" not found on MyConfig", key),
         }
-
     }
 }

examples/datafusion-ffi-example/src/lib.rs

@@ -19,6 +19,7 @@ use pyo3::prelude::*;
 
 use crate::aggregate_udf::MySumUDF;
 use crate::catalog_provider::{FixedSchemaProvider, MyCatalogProvider, MyCatalogProviderList};
+use crate::config::MyConfig;
 use crate::scalar_udf::IsNullUDF;
 use crate::table_function::MyTableFunction;
 use crate::table_provider::MyTableProvider;
@@ -27,6 +28,7 @@ use crate::window_udf::MyRankUDF;
 
 pub(crate) mod aggregate_udf;
 pub(crate) mod catalog_provider;
+pub(crate) mod config;
 pub(crate) mod scalar_udf;
 pub(crate) mod table_function;
 pub(crate) mod table_provider;
@@ -46,5 +48,6 @@ fn datafusion_ffi_example(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<IsNullUDF>()?;
     m.add_class::<MySumUDF>()?;
     m.add_class::<MyRankUDF>()?;
+    m.add_class::<MyConfig>()?;
     Ok(())
 }