cht42 commented on code in PR #15160:
URL: https://github.com/apache/datafusion/pull/15160#discussion_r2039629359
##########
datafusion/functions-nested/src/flatten.rs:
##########
@@ -146,14 +145,61 @@ pub fn flatten_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
match array.data_type() {
List(_) => {
- let list_arr = as_list_array(&array)?;
- let flattened_array = flatten_internal::<i32>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
as_list_array(&array)?.clone().into_parts();
Review Comment:
```suggestion
let (field, offsets, values, nulls) =
as_list_array(&array)?.clone().into_parts();
```
##########
datafusion/functions-nested/src/flatten.rs:
##########
@@ -146,14 +145,61 @@ pub fn flatten_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
match array.data_type() {
List(_) => {
- let list_arr = as_list_array(&array)?;
- let flattened_array = flatten_internal::<i32>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
as_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets =
get_offsets_for_flatten::<i32>(inner_offsets, offsets);
+ let flattened_array = GenericListArray::<i32>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
Review Comment:
```suggestion
nulls,
```
##########
datafusion/functions-nested/src/flatten.rs:
##########
@@ -146,14 +145,61 @@ pub fn flatten_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
match array.data_type() {
List(_) => {
- let list_arr = as_list_array(&array)?;
- let flattened_array = flatten_internal::<i32>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
as_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets =
get_offsets_for_flatten::<i32>(inner_offsets, offsets);
+ let flattened_array = GenericListArray::<i32>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
+ );
+
+ Ok(Arc::new(flattened_array) as ArrayRef)
+ }
+ LargeList(_) => {
+ exec_err!("flatten does not support type '{:?}'",
array.data_type())?
+ }
+ _ => Ok(Arc::clone(array) as ArrayRef),
+ }
}
LargeList(_) => {
- let list_arr = as_large_list_array(&array)?;
- let flattened_array = flatten_internal::<i64>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
+ as_large_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets = get_large_offsets_for_flatten(inner_offsets,
offsets);
+ let flattened_array = GenericListArray::<i64>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
Review Comment:
```suggestion
nulls,
```
##########
datafusion/functions-nested/src/flatten.rs:
##########
@@ -146,14 +145,61 @@ pub fn flatten_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
match array.data_type() {
List(_) => {
- let list_arr = as_list_array(&array)?;
- let flattened_array = flatten_internal::<i32>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
as_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets =
get_offsets_for_flatten::<i32>(inner_offsets, offsets);
+ let flattened_array = GenericListArray::<i32>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
+ );
+
+ Ok(Arc::new(flattened_array) as ArrayRef)
+ }
+ LargeList(_) => {
+ exec_err!("flatten does not support type '{:?}'",
array.data_type())?
+ }
+ _ => Ok(Arc::clone(array) as ArrayRef),
+ }
}
LargeList(_) => {
- let list_arr = as_large_list_array(&array)?;
- let flattened_array = flatten_internal::<i64>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
Review Comment:
```suggestion
let (field, offsets, values, nulls) =
```
##########
datafusion/functions-nested/src/flatten.rs:
##########
@@ -146,14 +145,61 @@ pub fn flatten_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
match array.data_type() {
List(_) => {
- let list_arr = as_list_array(&array)?;
- let flattened_array = flatten_internal::<i32>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
as_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets =
get_offsets_for_flatten::<i32>(inner_offsets, offsets);
+ let flattened_array = GenericListArray::<i32>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
+ );
+
+ Ok(Arc::new(flattened_array) as ArrayRef)
+ }
+ LargeList(_) => {
+ exec_err!("flatten does not support type '{:?}'",
array.data_type())?
+ }
+ _ => Ok(Arc::clone(array) as ArrayRef),
+ }
}
LargeList(_) => {
- let list_arr = as_large_list_array(&array)?;
- let flattened_array = flatten_internal::<i64>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
+ as_large_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets = get_large_offsets_for_flatten(inner_offsets,
offsets);
+ let flattened_array = GenericListArray::<i64>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
+ );
+
+ Ok(Arc::new(flattened_array) as ArrayRef)
+ }
+ LargeList(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
Review Comment:
```suggestion
let (inner_field, inner_offsets, inner_values, nulls) =
```
##########
datafusion/functions-nested/src/flatten.rs:
##########
@@ -146,14 +145,61 @@ pub fn flatten_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
match array.data_type() {
List(_) => {
- let list_arr = as_list_array(&array)?;
- let flattened_array = flatten_internal::<i32>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
as_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets =
get_offsets_for_flatten::<i32>(inner_offsets, offsets);
+ let flattened_array = GenericListArray::<i32>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
+ );
+
+ Ok(Arc::new(flattened_array) as ArrayRef)
+ }
+ LargeList(_) => {
+ exec_err!("flatten does not support type '{:?}'",
array.data_type())?
+ }
+ _ => Ok(Arc::clone(array) as ArrayRef),
+ }
}
LargeList(_) => {
- let list_arr = as_large_list_array(&array)?;
- let flattened_array = flatten_internal::<i64>(list_arr.clone(),
None)?;
- Ok(Arc::new(flattened_array) as ArrayRef)
+ let (field, offsets, values, _) =
+ as_large_list_array(&array)?.clone().into_parts();
+
+ match field.data_type() {
+ List(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_list_array(&values)?.clone().into_parts();
+ let offsets = get_large_offsets_for_flatten(inner_offsets,
offsets);
+ let flattened_array = GenericListArray::<i64>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
+ );
+
+ Ok(Arc::new(flattened_array) as ArrayRef)
+ }
+ LargeList(_) => {
+ let (inner_field, inner_offsets, inner_values, _) =
+ as_large_list_array(&values)?.clone().into_parts();
+ let offsets =
get_offsets_for_flatten::<i64>(inner_offsets, offsets);
+ let flattened_array = GenericListArray::<i64>::new(
+ inner_field,
+ offsets,
+ inner_values,
+ None,
Review Comment:
```suggestion
nulls,
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
