This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 75c77204fc minor: Improve hygiene for `datafusion-functions` macros
(#17638)
75c77204fc is described below
commit 75c77204fc3aa2b531939a4c3e2006bf35511fc5
Author: Jeffrey Vo <[email protected]>
AuthorDate: Sat Sep 20 11:42:28 2025 +1000
minor: Improve hygiene for `datafusion-functions` macros (#17638)
---
datafusion/functions-nested/src/distance.rs | 6 ++----
datafusion/functions-nested/src/length.rs | 4 ++--
datafusion/functions-nested/src/string.rs | 6 ++----
datafusion/functions/src/macros.rs | 10 +++++-----
datafusion/functions/src/math/abs.rs | 4 +---
datafusion/functions/src/math/factorial.rs | 4 +---
datafusion/functions/src/math/lcm.rs | 4 +---
datafusion/functions/src/math/power.rs | 4 ++--
datafusion/spark/src/function/bitmap/bitmap_count.rs | 4 ++--
9 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/datafusion/functions-nested/src/distance.rs
b/datafusion/functions-nested/src/distance.rs
index 1ccd22cdf5..e2e38fbd0d 100644
--- a/datafusion/functions-nested/src/distance.rs
+++ b/datafusion/functions-nested/src/distance.rs
@@ -30,13 +30,11 @@ use datafusion_common::cast::{
as_int64_array,
};
use datafusion_common::utils::{coerced_type_with_base_type_only, ListCoercion};
-use datafusion_common::{
- exec_err, internal_datafusion_err, plan_err, utils::take_function_args,
Result,
-};
+use datafusion_common::{exec_err, plan_err, utils::take_function_args, Result};
use datafusion_expr::{
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
};
-use datafusion_functions::{downcast_arg, downcast_named_arg};
+use datafusion_functions::downcast_arg;
use datafusion_macros::user_doc;
use itertools::Itertools;
use std::any::Any;
diff --git a/datafusion/functions-nested/src/length.rs
b/datafusion/functions-nested/src/length.rs
index 5c6afb9612..90e7fcc047 100644
--- a/datafusion/functions-nested/src/length.rs
+++ b/datafusion/functions-nested/src/length.rs
@@ -29,11 +29,11 @@ use arrow::datatypes::{
use datafusion_common::cast::{
as_fixed_size_list_array, as_generic_list_array, as_int64_array,
};
-use datafusion_common::{exec_err, internal_datafusion_err, plan_err, Result};
+use datafusion_common::{exec_err, plan_err, Result};
use datafusion_expr::{
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
};
-use datafusion_functions::{downcast_arg, downcast_named_arg};
+use datafusion_functions::downcast_arg;
use datafusion_macros::user_doc;
use std::any::Any;
use std::sync::Arc;
diff --git a/datafusion/functions-nested/src/string.rs
b/datafusion/functions-nested/src/string.rs
index f7bcdb547f..63fd11cb3e 100644
--- a/datafusion/functions-nested/src/string.rs
+++ b/datafusion/functions-nested/src/string.rs
@@ -25,9 +25,7 @@ use arrow::array::{
};
use arrow::datatypes::{DataType, Field};
-use datafusion_common::{
- internal_datafusion_err, not_impl_err, plan_err, DataFusionError, Result,
-};
+use datafusion_common::{not_impl_err, plan_err, DataFusionError, Result};
use std::any::Any;
@@ -48,7 +46,7 @@ use datafusion_expr::{
Coercion, ColumnarValue, Documentation, ScalarUDFImpl, Signature,
TypeSignature,
TypeSignatureClass, Volatility,
};
-use datafusion_functions::{downcast_arg, downcast_named_arg};
+use datafusion_functions::downcast_arg;
use datafusion_macros::user_doc;
use std::sync::Arc;
diff --git a/datafusion/functions/src/macros.rs
b/datafusion/functions/src/macros.rs
index 1972535325..228d704e29 100644
--- a/datafusion/functions/src/macros.rs
+++ b/datafusion/functions/src/macros.rs
@@ -45,7 +45,7 @@ macro_rules! export_functions {
($(($FUNC:ident, $DOC:expr, $($arg:tt)*)),*) => {
$(
// switch to single-function cases below
- export_functions!(single $FUNC, $DOC, $($arg)*);
+ $crate::export_functions!(single $FUNC, $DOC, $($arg)*);
)*
};
@@ -122,7 +122,7 @@ macro_rules! make_stub_package {
macro_rules! downcast_named_arg {
($ARG:expr, $NAME:expr, $ARRAY_TYPE:ident) => {{
$ARG.as_any().downcast_ref::<$ARRAY_TYPE>().ok_or_else(|| {
- internal_datafusion_err!(
+ datafusion_common::internal_datafusion_err!(
"could not cast {} to {}",
$NAME,
std::any::type_name::<$ARRAY_TYPE>()
@@ -139,7 +139,7 @@ macro_rules! downcast_named_arg {
#[macro_export]
macro_rules! downcast_arg {
($ARG:expr, $ARRAY_TYPE:ident) => {{
- downcast_named_arg!($ARG, "", $ARRAY_TYPE)
+ $crate::downcast_named_arg!($ARG, "", $ARRAY_TYPE)
}};
}
@@ -155,7 +155,7 @@ macro_rules! downcast_arg {
/// $GET_DOC: the function to get the documentation of the UDF
macro_rules! make_math_unary_udf {
($UDF:ident, $NAME:ident, $UNARY_FUNC:ident, $OUTPUT_ORDERING:expr,
$EVALUATE_BOUNDS:expr, $GET_DOC:expr) => {
- make_udf_function!($NAME::$UDF, $NAME);
+ $crate::make_udf_function!($NAME::$UDF, $NAME);
mod $NAME {
use std::any::Any;
@@ -269,7 +269,7 @@ macro_rules! make_math_unary_udf {
/// $GET_DOC: the function to get the documentation of the UDF
macro_rules! make_math_binary_udf {
($UDF:ident, $NAME:ident, $BINARY_FUNC:ident, $OUTPUT_ORDERING:expr,
$GET_DOC:expr) => {
- make_udf_function!($NAME::$UDF, $NAME);
+ $crate::make_udf_function!($NAME::$UDF, $NAME);
mod $NAME {
use std::any::Any;
diff --git a/datafusion/functions/src/math/abs.rs
b/datafusion/functions/src/math/abs.rs
index 45c32e660e..5c5ad40b98 100644
--- a/datafusion/functions/src/math/abs.rs
+++ b/datafusion/functions/src/math/abs.rs
@@ -26,9 +26,7 @@ use arrow::array::{
};
use arrow::datatypes::DataType;
use arrow::error::ArrowError;
-use datafusion_common::{
- internal_datafusion_err, not_impl_err, utils::take_function_args, Result,
-};
+use datafusion_common::{not_impl_err, utils::take_function_args, Result};
use datafusion_expr::interval_arithmetic::Interval;
use datafusion_expr::sort_properties::{ExprProperties, SortProperties};
use datafusion_expr::{
diff --git a/datafusion/functions/src/math/factorial.rs
b/datafusion/functions/src/math/factorial.rs
index bd95f5b47b..1423eeafed 100644
--- a/datafusion/functions/src/math/factorial.rs
+++ b/datafusion/functions/src/math/factorial.rs
@@ -26,9 +26,7 @@ use arrow::datatypes::DataType;
use arrow::datatypes::DataType::Int64;
use crate::utils::make_scalar_function;
-use datafusion_common::{
- arrow_datafusion_err, exec_err, internal_datafusion_err, DataFusionError,
Result,
-};
+use datafusion_common::{arrow_datafusion_err, exec_err, DataFusionError,
Result};
use datafusion_expr::{
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
Volatility,
diff --git a/datafusion/functions/src/math/lcm.rs
b/datafusion/functions/src/math/lcm.rs
index ca7dbb5856..8b2d849ef8 100644
--- a/datafusion/functions/src/math/lcm.rs
+++ b/datafusion/functions/src/math/lcm.rs
@@ -23,9 +23,7 @@ use arrow::datatypes::DataType;
use arrow::datatypes::DataType::Int64;
use arrow::error::ArrowError;
-use datafusion_common::{
- arrow_datafusion_err, exec_err, internal_datafusion_err, DataFusionError,
Result,
-};
+use datafusion_common::{arrow_datafusion_err, exec_err, DataFusionError,
Result};
use datafusion_expr::{
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
Volatility,
diff --git a/datafusion/functions/src/math/power.rs
b/datafusion/functions/src/math/power.rs
index 73325de4cf..a0db444421 100644
--- a/datafusion/functions/src/math/power.rs
+++ b/datafusion/functions/src/math/power.rs
@@ -24,8 +24,8 @@ use super::log::LogFunc;
use arrow::array::{ArrayRef, AsArray, Int64Array};
use arrow::datatypes::{ArrowNativeTypeOp, DataType, Float64Type};
use datafusion_common::{
- arrow_datafusion_err, exec_datafusion_err, exec_err,
internal_datafusion_err,
- plan_datafusion_err, DataFusionError, Result, ScalarValue,
+ arrow_datafusion_err, exec_datafusion_err, exec_err, plan_datafusion_err,
+ DataFusionError, Result, ScalarValue,
};
use datafusion_expr::expr::ScalarFunction;
use datafusion_expr::simplify::{ExprSimplifyResult, SimplifyInfo};
diff --git a/datafusion/spark/src/function/bitmap/bitmap_count.rs
b/datafusion/spark/src/function/bitmap/bitmap_count.rs
index e9eb751035..15bd33229a 100644
--- a/datafusion/spark/src/function/bitmap/bitmap_count.rs
+++ b/datafusion/spark/src/function/bitmap/bitmap_count.rs
@@ -27,13 +27,13 @@ use arrow::datatypes::DataType::{
Binary, BinaryView, FixedSizeBinary, Int64, LargeBinary,
};
use datafusion_common::utils::take_function_args;
-use datafusion_common::{internal_datafusion_err, internal_err, Result};
+use datafusion_common::{internal_err, Result};
use datafusion_expr::{
Coercion, ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature,
TypeSignatureClass, Volatility,
};
+use datafusion_functions::downcast_arg;
use datafusion_functions::utils::make_scalar_function;
-use datafusion_functions::{downcast_arg, downcast_named_arg};
#[derive(Debug, PartialEq, Eq, Hash)]
pub struct BitmapCount {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
