Skip to content

Commit 25078a4

Browse files
committed
fix code
1 parent 639a979 commit 25078a4

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

datafusion/spark/src/function/array/spark_array.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ impl ScalarUDFImpl for SparkArray {
8585
expr_type = DataType::Int32;
8686
}
8787

88-
Ok(DataType::List(Arc::new(Field::new_list_field(
89-
expr_type, true,
88+
Ok(DataType::List(Arc::new(Field::new(
89+
ARRAY_FIELD_DEFAULT_NAME,
90+
expr_type,
91+
true,
9092
))))
9193
}
9294

@@ -99,7 +101,7 @@ impl ScalarUDFImpl for SparkArray {
99101
.collect::<Vec<_>>();
100102
let return_type = self.return_type(&data_types)?;
101103
Ok(Arc::new(Field::new(
102-
ARRAY_FIELD_DEFAULT_NAME,
104+
"this_field_name_is_irrelevant",
103105
return_type,
104106
false,
105107
)))
@@ -160,6 +162,7 @@ pub fn make_array_inner(arrays: &[ArrayRef]) -> Result<ArrayRef> {
160162
Ok(Arc::new(
161163
SingleRowListArrayBuilder::new(array)
162164
.with_nullable(true)
165+
.with_field_name(Some(ARRAY_FIELD_DEFAULT_NAME.to_string()))
163166
.build_list_array(),
164167
))
165168
}

datafusion/spark/src/function/url/parse_url.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ use std::any::Any;
1919
use std::sync::Arc;
2020

2121
use arrow::array::{
22-
Array, ArrayRef, GenericStringBuilder, LargeStringArray, StringArray, StringArrayType,
22+
Array, ArrayRef, GenericStringBuilder, LargeStringArray, StringArray,
23+
StringArrayType, StringViewArray,
2324
};
2425
use arrow::datatypes::DataType;
2526
use datafusion_common::cast::{
@@ -222,7 +223,7 @@ fn spark_parse_url(args: &[ArrayRef]) -> Result<ArrayRef> {
222223
)
223224
}
224225
(DataType::Utf8View, DataType::Utf8View, DataType::Utf8View) => {
225-
process_parse_url::<_, _, _, StringArray>(
226+
process_parse_url::<_, _, _, StringViewArray>(
226227
as_string_view_array(url)?,
227228
as_string_view_array(part)?,
228229
as_string_view_array(key)?,
@@ -255,7 +256,7 @@ fn spark_parse_url(args: &[ArrayRef]) -> Result<ArrayRef> {
255256
)
256257
}
257258
(DataType::Utf8View, DataType::Utf8View) => {
258-
process_parse_url::<_, _, _, StringArray>(
259+
process_parse_url::<_, _, _, StringViewArray>(
259260
as_string_view_array(url)?,
260261
as_string_view_array(part)?,
261262
&key,

0 commit comments

Comments
 (0)