Skip to content

Apache DataFusion SQL Query Engine

perf: Share backing buffers in string view functions (#25501)

Neil Conway267b2c9898aa
diff --git a/datafusion/functions/src/unicode/common.rs b/datafusion/functions/src/unicode/common.rs
index 75c88e0902..ac24877863 100644
--- a/datafusion/functions/src/unicode/common.rs
+++ b/datafusion/functions/src/unicode/common.rs
@@ -217,16 +217,16 @@ fn general_left_right_view<F: LeftRightSlicer>(
let views = ScalarBuffer::from(new_views);
let data_buffers = if has_out_of_line {
- string_view_array.data_buffers().to_vec()
+ Arc::clone(string_view_array.data_buffers())
} else {
- vec![]
+ Arc::from([])
};
// SAFETY:
// - Each view is produced by `make_view` with correct bytes and offset
// - Out-of-line views reuse the original buffer index and adjusted offset
unsafe {
- let array = StringViewArray::new_unchecked(views, data_buffers.into(), new_nulls);
+ let array = StringViewArray::new_unchecked(views, data_buffers, new_nulls);
Ok(Arc::new(array) as ArrayRef)
}
}
diff --git a/datafusion/functions/src/unicode/substrindex.rs b/datafusion/functions/src/unicode/substrindex.rs
index 614e5db32b..33da6e8fc2 100644
--- a/datafusion/functions/src/unicode/substrindex.rs
+++ b/datafusion/functions/src/unicode/substrindex.rs
@@ -316,9 +316,9 @@ fn substr_index_view(
}
let data_buffers = if has_out_of_line {
- string_array.data_buffers().to_vec()
+ Arc::clone(string_array.data_buffers())
} else {
- vec![]
+ Arc::from([])
};
// Safety: each appended view is either:
@@ -328,7 +328,7 @@ fn substr_index_view(
unsafe {
Ok(Arc::new(StringViewArray::new_unchecked(
ScalarBuffer::from(views_buf),
- data_buffers.into(),
+ data_buffers,
nulls,
)) as ArrayRef)
}
@@ -448,9 +448,9 @@ fn substr_index_scalar_view(
}
let data_buffers = if has_out_of_line {
- string_array.data_buffers().to_vec()
+ Arc::clone(string_array.data_buffers())
} else {
- vec![]
+ Arc::from([])
};
// Safety: each appended view is either:
@@ -461,7 +461,7 @@ fn substr_index_scalar_view(
unsafe {
Ok(Arc::new(StringViewArray::new_unchecked(
ScalarBuffer::from(views_buf),
- data_buffers.into(),
+ data_buffers,
string_array.nulls().cloned(),
)) as ArrayRef)
}