Merge branch 'datafusion-contrib:main' into chore-datafusion-51

Author: lonless9

Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "datafusion-functions-json"
-version = "0.49.1"
+version = "0.50.0"
 edition = "2021"
 description = "JSON functions for DataFusion"
 readme = "README.md"
 license = "Apache-2.0"
 keywords = ["datafusion", "JSON", "SQL"]
 categories = ["database-implementations", "parsing"]
 repository = "https://github.com/datafusion-contrib/datafusion-functions-json/"
-rust-version = "1.85.1"
+rust-version = "1.86.0"
 
 # Jitter has a dependency on pyo3, which needs to match the version used in Sail.
 # https://github.com/pydantic/jiter/blob/v0.10.0/Cargo.toml

benches/main.rs

@@ -33,6 +33,7 @@ fn bench_json_contains(b: &mut Bencher) {
                 number_rows: 1,
                 arg_fields: arg_fields.clone(),
                 return_field: return_field.clone(),
+                config_options: Arc::new(datafusion::config::ConfigOptions::default()),
             })
             .unwrap()
     });
@@ -63,6 +64,7 @@ fn bench_json_get_str_scalar(b: &mut Bencher) {
                 arg_fields: arg_fields.clone(),
                 number_rows: 1,
                 return_field: return_field.clone(),
+                config_options: Arc::new(datafusion::config::ConfigOptions::default()),
             })
             .unwrap();
     });
@@ -94,6 +96,7 @@ fn bench_json_get_str_array(b: &mut Bencher) {
                 arg_fields: arg_fields.clone(),
                 number_rows: 1,
                 return_field: return_field.clone(),
+                config_options: Arc::new(datafusion::config::ConfigOptions::default()),
             })
             .unwrap();
     });
@@ -125,6 +128,7 @@ fn bench_json_get_str_view_array(b: &mut Bencher) {
                 arg_fields: arg_fields.clone(),
                 number_rows: 1,
                 return_field: return_field.clone(),
+                config_options: Arc::new(datafusion::config::ConfigOptions::default()),
             })
             .unwrap();
     });

src/common_macros.rs

@@ -30,7 +30,7 @@ macro_rules! make_udf_function {
             static [< STATIC_ $expr_fn_name:upper >]: std::sync::OnceLock<std::sync::Arc<datafusion::logical_expr::ScalarUDF>> =
                 std::sync::OnceLock::new();
 
-            /// ScalarFunction that returns a [`ScalarUDF`] for [`$udf_impl`]
+            /// `ScalarFunction` that returns a [`ScalarUDF`] for [`$udf_impl`]
             ///
             /// [`ScalarUDF`]: datafusion::logical_expr::ScalarUDF
             pub fn [< $expr_fn_name _udf >]() -> std::sync::Arc<datafusion::logical_expr::ScalarUDF> {

tests/main.rs

@@ -6,6 +6,7 @@ use datafusion::arrow::datatypes::{Field, Int64Type, Int8Type, Schema};
 use datafusion::arrow::{array::StringDictionaryBuilder, datatypes::DataType};
 use datafusion::assert_batches_eq;
 use datafusion::common::ScalarValue;
+use datafusion::config::ConfigOptions;
 use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs};
 use datafusion::prelude::SessionContext;
 use datafusion_functions_json::udfs::json_get_str_udf;
@@ -600,6 +601,7 @@ fn test_json_get_utf8() {
                 Field::new("ret_field", DataType::Utf8, false)
                     .with_metadata(HashMap::from_iter(vec![("is_json".to_string(), "true".to_string())])),
             ),
+            config_options: Arc::new(ConfigOptions::default()),
         })
         .unwrap()
     else {
@@ -633,6 +635,7 @@ fn test_json_get_large_utf8() {
                 Field::new("ret_field", DataType::Utf8, false)
                     .with_metadata(HashMap::from_iter(vec![("is_json".to_string(), "true".to_string())])),
             ),
+            config_options: Arc::new(ConfigOptions::default()),
         })
         .unwrap()
     else {
@@ -1573,6 +1576,7 @@ fn check_for_null_dictionary_values(array: &dyn Array) {
 }
 
 /// Test that we don't output nulls in dictionary values.
+#[allow(clippy::doc_markdown)]
 /// This can cause issues with arrow-rs and DataFusion; they expect nulls to be in keys.
 #[tokio::test]
 async fn test_dict_get_no_null_values() {