Skip to content

Commit 6edf4c5

Browse files
timsaucertimsaucer
authored
Merge branch 'main' into feat/ffi-plan-optimizer
2 parents 995cc6b + 6ef4cef commit 6edf4c5

62 files changed

Lines changed: 222 additions & 426 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎datafusion/functions-nested/src/array_has.rs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ use datafusion_common::{DataFusionError, Result, ScalarValue, exec_err};
3131
use datafusion_expr::expr::ScalarFunction;
3232
use datafusion_expr::simplify::ExprSimplifyResult;
3333
use datafusion_expr::{
34-
ColumnarValue, Documentation, Expr, ScalarUDFImpl, Signature, Volatility, in_list,
34+
ColumnarValue, Documentation, Expr, ScalarFunctionArgs, ScalarUDFImpl, Signature,
35+
Volatility, in_list,
3536
};
3637
use datafusion_macros::user_doc;
3738
use datafusion_physical_expr_common::datum::compare_with_eq;
@@ -181,10 +182,7 @@ impl ScalarUDFImpl for ArrayHas {
181182
Ok(ExprSimplifyResult::Original(args))
182183
}
183184

184-
fn invoke_with_args(
185-
&self,
186-
args: datafusion_expr::ScalarFunctionArgs,
187-
) -> Result<ColumnarValue> {
185+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
188186
let [first_arg, second_arg] = take_function_args(self.name(), &args.args)?;
189187
if first_arg.data_type().is_null() {
190188
// Always return null if the first argument is null
@@ -844,10 +842,7 @@ impl ScalarUDFImpl for ArrayHasAll {
844842
Ok(DataType::Boolean)
845843
}
846844

847-
fn invoke_with_args(
848-
&self,
849-
args: datafusion_expr::ScalarFunctionArgs,
850-
) -> Result<ColumnarValue> {
845+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
851846
make_scalar_function(array_has_all_inner)(&args.args)
852847
}
853848

@@ -918,10 +913,7 @@ impl ScalarUDFImpl for ArrayHasAny {
918913
Ok(DataType::Boolean)
919914
}
920915

921-
fn invoke_with_args(
922-
&self,
923-
args: datafusion_expr::ScalarFunctionArgs,
924-
) -> Result<ColumnarValue> {
916+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
925917
let [first_arg, second_arg] = take_function_args(self.name(), &args.args)?;
926918

927919
// If either argument is scalar, use the fast path.

‎datafusion/functions-nested/src/arrays_zip.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ use datafusion_common::cast::{
2929
};
3030
use datafusion_common::{Result, exec_err};
3131
use datafusion_expr::{
32-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
32+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
33+
Volatility,
3334
};
3435
use datafusion_macros::user_doc;
3536
use std::any::Any;
@@ -134,10 +135,7 @@ impl ScalarUDFImpl for ArraysZip {
134135
))))
135136
}
136137

137-
fn invoke_with_args(
138-
&self,
139-
args: datafusion_expr::ScalarFunctionArgs,
140-
) -> Result<ColumnarValue> {
138+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
141139
make_scalar_function(arrays_zip_inner)(&args.args)
142140
}
143141

‎datafusion/functions-nested/src/cardinality.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use datafusion_common::exec_err;
3131
use datafusion_common::utils::{ListCoercion, take_function_args};
3232
use datafusion_expr::{
3333
ArrayFunctionArgument, ArrayFunctionSignature, ColumnarValue, Documentation,
34-
ScalarUDFImpl, Signature, TypeSignature, Volatility,
34+
ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility,
3535
};
3636
use datafusion_macros::user_doc;
3737
use std::any::Any;
@@ -105,10 +105,7 @@ impl ScalarUDFImpl for Cardinality {
105105
Ok(UInt64)
106106
}
107107

108-
fn invoke_with_args(
109-
&self,
110-
args: datafusion_expr::ScalarFunctionArgs,
111-
) -> Result<ColumnarValue> {
108+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
112109
make_scalar_function(cardinality_inner)(&args.args)
113110
}
114111

‎datafusion/functions-nested/src/concat.rs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ use datafusion_common::{
3939
};
4040
use datafusion_expr::binary::type_union_resolution;
4141
use datafusion_expr::{
42-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
42+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
43+
Volatility,
4344
};
4445
use datafusion_macros::user_doc;
4546
use itertools::Itertools;
@@ -117,10 +118,7 @@ impl ScalarUDFImpl for ArrayAppend {
117118
}
118119
}
119120

120-
fn invoke_with_args(
121-
&self,
122-
args: datafusion_expr::ScalarFunctionArgs,
123-
) -> Result<ColumnarValue> {
121+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
124122
make_scalar_function(array_append_inner)(&args.args)
125123
}
126124

@@ -206,10 +204,7 @@ impl ScalarUDFImpl for ArrayPrepend {
206204
}
207205
}
208206

209-
fn invoke_with_args(
210-
&self,
211-
args: datafusion_expr::ScalarFunctionArgs,
212-
) -> Result<ColumnarValue> {
207+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
213208
make_scalar_function(array_prepend_inner)(&args.args)
214209
}
215210

@@ -326,10 +321,7 @@ impl ScalarUDFImpl for ArrayConcat {
326321
}
327322
}
328323

329-
fn invoke_with_args(
330-
&self,
331-
args: datafusion_expr::ScalarFunctionArgs,
332-
) -> Result<ColumnarValue> {
324+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
333325
make_scalar_function(array_concat_inner)(&args.args)
334326
}
335327

‎datafusion/functions-nested/src/dimension.rs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ use datafusion_common::{Result, exec_err, utils::take_function_args};
3333
use crate::utils::{compute_array_dims, make_scalar_function};
3434
use datafusion_common::utils::list_ndims;
3535
use datafusion_expr::{
36-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
36+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
37+
Volatility,
3738
};
3839
use datafusion_macros::user_doc;
3940
use itertools::Itertools;
@@ -101,10 +102,7 @@ impl ScalarUDFImpl for ArrayDims {
101102
Ok(DataType::new_list(UInt64, true))
102103
}
103104

104-
fn invoke_with_args(
105-
&self,
106-
args: datafusion_expr::ScalarFunctionArgs,
107-
) -> Result<ColumnarValue> {
105+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
108106
make_scalar_function(array_dims_inner)(&args.args)
109107
}
110108

@@ -173,10 +171,7 @@ impl ScalarUDFImpl for ArrayNdims {
173171
Ok(UInt64)
174172
}
175173

176-
fn invoke_with_args(
177-
&self,
178-
args: datafusion_expr::ScalarFunctionArgs,
179-
) -> Result<ColumnarValue> {
174+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
180175
make_scalar_function(array_ndims_inner)(&args.args)
181176
}
182177

‎datafusion/functions-nested/src/distance.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ use datafusion_common::cast::{
3232
use datafusion_common::utils::{ListCoercion, coerced_type_with_base_type_only};
3333
use datafusion_common::{Result, exec_err, plan_err, utils::take_function_args};
3434
use datafusion_expr::{
35-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
35+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
36+
Volatility,
3637
};
3738
use datafusion_functions::downcast_arg;
3839
use datafusion_macros::user_doc;
@@ -125,10 +126,7 @@ impl ScalarUDFImpl for ArrayDistance {
125126
arg_types.try_collect()
126127
}
127128

128-
fn invoke_with_args(
129-
&self,
130-
args: datafusion_expr::ScalarFunctionArgs,
131-
) -> Result<ColumnarValue> {
129+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
132130
make_scalar_function(array_distance_inner)(&args.args)
133131
}
134132

‎datafusion/functions-nested/src/empty.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ use arrow::datatypes::{
2727
use datafusion_common::cast::as_generic_list_array;
2828
use datafusion_common::{Result, exec_err, utils::take_function_args};
2929
use datafusion_expr::{
30-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
30+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
31+
Volatility,
3132
};
3233
use datafusion_macros::user_doc;
3334
use std::any::Any;
@@ -94,10 +95,7 @@ impl ScalarUDFImpl for ArrayEmpty {
9495
Ok(Boolean)
9596
}
9697

97-
fn invoke_with_args(
98-
&self,
99-
args: datafusion_expr::ScalarFunctionArgs,
100-
) -> Result<ColumnarValue> {
98+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
10199
make_scalar_function(array_empty_inner)(&args.args)
102100
}
103101

‎datafusion/functions-nested/src/except.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ use arrow::row::{RowConverter, SortField};
3030
use datafusion_common::utils::{ListCoercion, take_function_args};
3131
use datafusion_common::{HashSet, Result, internal_err};
3232
use datafusion_expr::{
33-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
33+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
34+
Volatility,
3435
};
3536
use datafusion_macros::user_doc;
3637
use itertools::Itertools;
@@ -119,10 +120,7 @@ impl ScalarUDFImpl for ArrayExcept {
119120
}
120121
}
121122

122-
fn invoke_with_args(
123-
&self,
124-
args: datafusion_expr::ScalarFunctionArgs,
125-
) -> Result<ColumnarValue> {
123+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
126124
make_scalar_function(array_except_inner)(&args.args)
127125
}
128126

‎datafusion/functions-nested/src/extract.rs‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ use datafusion_common::{
3939
utils::take_function_args,
4040
};
4141
use datafusion_expr::{
42-
ArrayFunctionArgument, ArrayFunctionSignature, Expr, TypeSignature,
42+
ArrayFunctionArgument, ArrayFunctionSignature, Expr, ScalarFunctionArgs,
43+
TypeSignature,
4344
};
4445
use datafusion_expr::{
4546
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
@@ -172,10 +173,7 @@ impl ScalarUDFImpl for ArrayElement {
172173
}
173174
}
174175

175-
fn invoke_with_args(
176-
&self,
177-
args: datafusion_expr::ScalarFunctionArgs,
178-
) -> Result<ColumnarValue> {
176+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
179177
make_scalar_function(array_element_inner)(&args.args)
180178
}
181179

@@ -395,10 +393,7 @@ impl ScalarUDFImpl for ArraySlice {
395393
Ok(arg_types[0].clone())
396394
}
397395

398-
fn invoke_with_args(
399-
&self,
400-
args: datafusion_expr::ScalarFunctionArgs,
401-
) -> Result<ColumnarValue> {
396+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
402397
make_scalar_function(array_slice_inner)(&args.args)
403398
}
404399

@@ -842,10 +837,7 @@ impl ScalarUDFImpl for ArrayPopFront {
842837
Ok(arg_types[0].clone())
843838
}
844839

845-
fn invoke_with_args(
846-
&self,
847-
args: datafusion_expr::ScalarFunctionArgs,
848-
) -> Result<ColumnarValue> {
840+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
849841
make_scalar_function(array_pop_front_inner)(&args.args)
850842
}
851843

@@ -938,10 +930,7 @@ impl ScalarUDFImpl for ArrayPopBack {
938930
Ok(arg_types[0].clone())
939931
}
940932

941-
fn invoke_with_args(
942-
&self,
943-
args: datafusion_expr::ScalarFunctionArgs,
944-
) -> Result<ColumnarValue> {
933+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
945934
make_scalar_function(array_pop_back_inner)(&args.args)
946935
}
947936

@@ -1043,10 +1032,7 @@ impl ScalarUDFImpl for ArrayAnyValue {
10431032
}
10441033
}
10451034

1046-
fn invoke_with_args(
1047-
&self,
1048-
args: datafusion_expr::ScalarFunctionArgs,
1049-
) -> Result<ColumnarValue> {
1035+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
10501036
make_scalar_function(array_any_value_inner)(&args.args)
10511037
}
10521038

‎datafusion/functions-nested/src/flatten.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ use arrow::datatypes::{
2727
use datafusion_common::cast::{as_large_list_array, as_list_array};
2828
use datafusion_common::{Result, exec_err, utils::take_function_args};
2929
use datafusion_expr::{
30-
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
30+
ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,
31+
Volatility,
3132
};
3233
use datafusion_macros::user_doc;
3334
use std::any::Any;
@@ -114,10 +115,7 @@ impl ScalarUDFImpl for Flatten {
114115
Ok(data_type)
115116
}
116117

117-
fn invoke_with_args(
118-
&self,
119-
args: datafusion_expr::ScalarFunctionArgs,
120-
) -> Result<ColumnarValue> {
118+
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
121119
make_scalar_function(flatten_inner)(&args.args)
122120
}
123121

0 commit comments

Comments
 (0)