You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by bl...@apache.org on 2025/11/12 18:26:09 UTC
(datafusion) 07/16: Fix merge conflicts
This is an automated email from the ASF dual-hosted git repository.
blaginin pushed a commit to branch bash-push
in repository https://gitbox.apache.org/repos/asf/datafusion.git
commit 6bee9174d8cd4aeb7882d47452e6c8cffeb911bb
Author: blaginin <dm...@blaginin.me>
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 4aea7aa14d..977130ffc0 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 b1e4016150..61caa3ac70 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: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org