-
Notifications
You must be signed in to change notification settings - Fork 2k
feat: support array_compact builtin function
#21522
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
comphead
wants to merge
4
commits into
apache:main
Choose a base branch
from
comphead:array_compact
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+320
−0
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
08c5098
feat: support `array_compact` builtin function
comphead c0399a3
feat: support `array_compact` builtin function
comphead d280c88
feat: support `array_compact` builtin function
comphead 5075c46
feat: support `array_compact` builtin function
comphead File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| //! [`ScalarUDFImpl`] definitions for array_compact function. | ||
|
|
||
| use crate::utils::make_scalar_function; | ||
| use arrow::array::{ | ||
| Array, ArrayRef, Capacities, GenericListArray, MutableArrayData, OffsetSizeTrait, | ||
| make_array, | ||
| }; | ||
| use arrow::buffer::OffsetBuffer; | ||
| use arrow::datatypes::DataType; | ||
| use arrow::datatypes::DataType::{LargeList, List, Null}; | ||
| use datafusion_common::cast::{as_large_list_array, as_list_array}; | ||
| use datafusion_common::{Result, exec_err, utils::take_function_args}; | ||
| use datafusion_expr::{ | ||
| ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature, | ||
| Volatility, | ||
| }; | ||
| use datafusion_macros::user_doc; | ||
| use std::sync::Arc; | ||
|
|
||
| make_udf_expr_and_func!( | ||
| ArrayCompact, | ||
| array_compact, | ||
| array, | ||
| "removes null values from the array.", | ||
| array_compact_udf | ||
| ); | ||
|
|
||
| #[user_doc( | ||
| doc_section(label = "Array Functions"), | ||
| description = "Removes null values from the array.", | ||
| syntax_example = "array_compact(array)", | ||
| sql_example = r#"```sql | ||
| > select array_compact([1, NULL, 2, NULL, 3]) arr; | ||
| +-----------+ | ||
| | arr | | ||
| +-----------+ | ||
| | [1, 2, 3] | | ||
| +-----------+ | ||
| ```"#, | ||
| argument( | ||
| name = "array", | ||
| description = "Array expression. Can be a constant, column, or function, and any combination of array operators." | ||
| ) | ||
| )] | ||
| #[derive(Debug, PartialEq, Eq, Hash)] | ||
| pub struct ArrayCompact { | ||
| signature: Signature, | ||
| aliases: Vec<String>, | ||
| } | ||
|
|
||
| impl Default for ArrayCompact { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } | ||
|
|
||
| impl ArrayCompact { | ||
| pub fn new() -> Self { | ||
| Self { | ||
| signature: Signature::array(Volatility::Immutable), | ||
| aliases: vec!["list_compact".to_string()], | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ScalarUDFImpl for ArrayCompact { | ||
| fn name(&self) -> &str { | ||
| "array_compact" | ||
| } | ||
|
|
||
| fn signature(&self) -> &Signature { | ||
| &self.signature | ||
| } | ||
|
|
||
| fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> { | ||
| Ok(arg_types[0].clone()) | ||
| } | ||
|
|
||
| fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> { | ||
| make_scalar_function(array_compact_inner)(&args.args) | ||
| } | ||
|
|
||
| fn aliases(&self) -> &[String] { | ||
| &self.aliases | ||
| } | ||
|
|
||
| fn documentation(&self) -> Option<&Documentation> { | ||
| self.doc() | ||
| } | ||
| } | ||
|
|
||
| /// array_compact SQL function | ||
| fn array_compact_inner(arg: &[ArrayRef]) -> Result<ArrayRef> { | ||
| let [input_array] = take_function_args("array_compact", arg)?; | ||
|
|
||
| match &input_array.data_type() { | ||
| List(field) => { | ||
| let array = as_list_array(input_array)?; | ||
| compact_list::<i32>(array, field) | ||
| } | ||
| LargeList(field) => { | ||
| let array = as_large_list_array(input_array)?; | ||
| compact_list::<i64>(array, field) | ||
| } | ||
| Null => Ok(Arc::clone(input_array)), | ||
| array_type => exec_err!("array_compact does not support type '{array_type}'."), | ||
| } | ||
| } | ||
|
|
||
| /// Remove null elements from each row of a list array. | ||
| fn compact_list<O: OffsetSizeTrait>( | ||
| list_array: &GenericListArray<O>, | ||
| field: &Arc<arrow::datatypes::Field>, | ||
| ) -> Result<ArrayRef> { | ||
| let values = list_array.values(); | ||
|
|
||
| // Fast path: no nulls in values, return input unchanged | ||
| if values.null_count() == 0 { | ||
| return Ok(Arc::new(list_array.clone())); | ||
| } | ||
|
|
||
| let original_data = values.to_data(); | ||
| let capacity = original_data.len() - values.null_count(); | ||
| let mut offsets = Vec::<O>::with_capacity(list_array.len() + 1); | ||
| offsets.push(O::zero()); | ||
| let mut mutable = MutableArrayData::with_capacities( | ||
| vec![&original_data], | ||
| false, | ||
| Capacities::Array(capacity), | ||
| ); | ||
|
|
||
| for row_index in 0..list_array.len() { | ||
| if list_array.is_null(row_index) { | ||
| offsets.push(offsets[row_index]); | ||
| continue; | ||
| } | ||
|
|
||
| let start = list_array.offsets()[row_index].as_usize(); | ||
| let end = list_array.offsets()[row_index + 1].as_usize(); | ||
| let mut copied = 0usize; | ||
|
|
||
| // Batch consecutive non-null elements into single extend() calls | ||
| // to reduce per-element overhead. For [1, 2, NULL, 3, 4] this | ||
| // produces 2 extend calls (0..2, 3..5) instead of 4 individual ones. | ||
| let mut batch_start: Option<usize> = None; | ||
| for i in start..end { | ||
| if values.is_null(i) { | ||
| // Null breaks the current batch — flush it | ||
| if let Some(bs) = batch_start { | ||
| mutable.extend(0, bs, i); | ||
| copied += i - bs; | ||
| batch_start = None; | ||
| } | ||
| } else if batch_start.is_none() { | ||
| batch_start = Some(i); | ||
| } | ||
| } | ||
| // Flush any remaining batch after the loop | ||
| if let Some(bs) = batch_start { | ||
| mutable.extend(0, bs, end); | ||
| copied += end - bs; | ||
| } | ||
|
|
||
| offsets.push(offsets[row_index] + O::usize_as(copied)); | ||
| } | ||
|
|
||
| let new_values = make_array(mutable.freeze()); | ||
| Ok(Arc::new(GenericListArray::<O>::try_new( | ||
| Arc::clone(field), | ||
| OffsetBuffer::new(offsets.into()), | ||
| new_values, | ||
| list_array.nulls().cloned(), | ||
| )?)) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we also add a test for fixedsizelist?