This is an automated email from the ASF dual-hosted git repository.
blaginin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-sandbox.git
The following commit(s) were added to refs/heads/main by this push:
new 6bee9174d Fix merge conflicts
6bee9174d is described below
commit 6bee9174d8cd4aeb7882d47452e6c8cffeb911bb
Author: blaginin <[email protected]>
AuthorDate: Sat Nov 8 14:17:43 2025 +0000
Fix merge conflicts
---
datafusion/doc/src/lib.rs | 8 --------
datafusion/functions-nested/src/string.rs | 14 --------------
2 files changed, 22 deletions(-)
diff --git a/datafusion/doc/src/lib.rs b/datafusion/doc/src/lib.rs
index 4aea7aa14..977130ffc 100644
--- a/datafusion/doc/src/lib.rs
+++ b/datafusion/doc/src/lib.rs
@@ -29,14 +29,6 @@ pub use udaf::aggregate_doc_sections;
pub use udf::scalar_doc_sections;
pub use udwf::window_doc_sections;
-mod udaf;
-mod udf;
-mod udwf;
-
-pub use udaf::aggregate_doc_sections;
-pub use udf::scalar_doc_sections;
-pub use udwf::window_doc_sections;
-
#[allow(rustdoc::broken_intra_doc_links)]
/// Documentation for use by [`ScalarUDFImpl`](ScalarUDFImpl),
/// [`AggregateUDFImpl`](AggregateUDFImpl) and
[`WindowUDFImpl`](WindowUDFImpl) functions.
diff --git a/datafusion/functions-nested/src/string.rs
b/datafusion/functions-nested/src/string.rs
index b1e401615..61caa3ac7 100644
--- a/datafusion/functions-nested/src/string.rs
+++ b/datafusion/functions-nested/src/string.rs
@@ -405,20 +405,6 @@ pub(super) fn array_to_string_inner(args: &[ArrayRef]) ->
Result<ArrayRef> {
Ok(arg)
}
- FixedSizeList(..) => {
- let list_array = as_fixed_size_list_array(&arr)?;
- for i in 0..list_array.len() {
- compute_array_to_string(
- arg,
- list_array.value(i),
- delimiter.clone(),
- null_string.clone(),
- with_null_string,
- )?;
- }
-
- Ok(arg)
- }
LargeList(..) => {
let list_array = as_large_list_array(&arr)?;
for i in 0..list_array.len() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
