-
Notifications
You must be signed in to change notification settings - Fork 2.3k
perf: remove per-row String allocation from Spark soundex and quote #23880
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use arrow::array::{ArrayRef, OffsetSizeTrait, StringArray}; | ||
| use arrow::array::{Array, ArrayRef, OffsetSizeTrait, StringBuilder}; | ||
| use arrow::datatypes::DataType; | ||
| use datafusion::logical_expr::{Coercion, ColumnarValue, Signature, TypeSignatureClass}; | ||
| use datafusion_common::cast::{as_generic_string_array, as_string_view_array}; | ||
|
|
@@ -25,6 +25,7 @@ use datafusion_common::{Result, exec_err}; | |
| use datafusion_expr::{ScalarFunctionArgs, ScalarUDFImpl, Volatility}; | ||
| use datafusion_functions::utils::make_scalar_function; | ||
|
|
||
| use std::fmt::Write; | ||
| use std::sync::Arc; | ||
|
|
||
| /// Spark-compatible `quote` expression | ||
|
|
@@ -88,34 +89,55 @@ fn spark_quote_inner(arg: &[ArrayRef]) -> Result<ArrayRef> { | |
|
|
||
| fn quote_array<T: OffsetSizeTrait>(array: &ArrayRef) -> Result<ArrayRef> { | ||
| let str_array = as_generic_string_array::<T>(array)?; | ||
| let result = str_array | ||
| .iter() | ||
| .map(|s| s.map(compute_quote)) | ||
| .collect::<StringArray>(); | ||
| Ok(Arc::new(result)) | ||
| Ok(quote_impl(str_array.iter(), str_array.value_data().len())) | ||
| } | ||
|
|
||
| fn quote_view(str_view: &ArrayRef) -> Result<ArrayRef> { | ||
| let str_array = as_string_view_array(str_view)?; | ||
| let result = str_array | ||
| .iter() | ||
| .map(|opt_str| opt_str.map(compute_quote)) | ||
| .collect::<StringArray>(); | ||
| Ok(Arc::new(result) as ArrayRef) | ||
| Ok(quote_impl( | ||
| str_array.iter(), | ||
| str_array.get_buffer_memory_size(), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right, and it is wrong in the other direction too: strings of 12 bytes or fewer live inline in the views, so the data buffers can be near-empty while the array holds plenty of data. Switched to |
||
| )) | ||
| } | ||
|
|
||
| const QUOTE_CHAR: char = '\''; | ||
| const ESCAPE_CHAR: char = '\\'; | ||
| /// A literal quote in the input is emitted as this two-character escape. | ||
| const ESCAPED_QUOTE: &str = "\\'"; | ||
|
|
||
| fn compute_quote(s: &str) -> String { | ||
| let mut quoted = String::with_capacity(s.len() + 2); | ||
| quoted.push(QUOTE_CHAR); | ||
| for c in s.chars() { | ||
| if c == QUOTE_CHAR { | ||
| quoted.push(ESCAPE_CHAR); | ||
| /// Quotes every value, writing directly into the output buffer. | ||
| /// | ||
| /// `data_capacity` is a hint for the total input byte length; the output adds two | ||
| /// surrounding quotes per row plus one byte per escaped quote. | ||
| fn quote_impl<'a>( | ||
| input: impl Iterator<Item = Option<&'a str>>, | ||
| data_capacity: usize, | ||
| ) -> ArrayRef { | ||
| let len = input.size_hint().0; | ||
| let mut builder = StringBuilder::with_capacity(len, data_capacity + 2 * len); | ||
| for value in input { | ||
| match value { | ||
| Some(value) => append_quoted(&mut builder, value), | ||
| None => builder.append_null(), | ||
| } | ||
| quoted.push(c); | ||
| } | ||
| quoted.push(QUOTE_CHAR); | ||
| quoted | ||
| Arc::new(builder.finish()) | ||
| } | ||
|
|
||
| /// Appends `s` wrapped in single quotes, with any embedded quote backslash-escaped. | ||
| /// | ||
| /// Writes straight into the builder's buffer — finalized by the trailing | ||
| /// `append_value("")` — so no intermediate `String` is allocated per row, and | ||
| /// copies the runs between quotes rather than one character at a time. | ||
| fn append_quoted(builder: &mut StringBuilder, s: &str) { | ||
| // `write_str` on a `GenericStringBuilder` is infallible. | ||
| let mut runs = s.split(QUOTE_CHAR); | ||
| builder.write_char(QUOTE_CHAR).unwrap(); | ||
| // `split` always yields at least one run. | ||
| builder.write_str(runs.next().unwrap_or_default()).unwrap(); | ||
| for run in runs { | ||
| builder.write_str(ESCAPED_QUOTE).unwrap(); | ||
| builder.write_str(run).unwrap(); | ||
| } | ||
| builder.write_char(QUOTE_CHAR).unwrap(); | ||
| builder.append_value(""); | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
str_array.value_data().len()will over-allocate for sliced arrays.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Confirmed —
GenericByteArray::sliceclones the wholevalue_databuffer and narrows only the offsets, so this over-allocates by however much of the buffer the slice excludes. Now taking the length from the sliced offsets (last - first) in 4a7577f.