-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Faster character_length()
string function for ASCII-only case
#12356
Merged
+144
−6
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
extern crate criterion; | ||
|
||
use arrow::array::{StringArray, StringViewArray}; | ||
use criterion::{black_box, criterion_group, criterion_main, Criterion}; | ||
use datafusion_expr::ColumnarValue; | ||
use rand::distributions::Alphanumeric; | ||
use rand::{rngs::StdRng, Rng, SeedableRng}; | ||
use std::sync::Arc; | ||
|
||
/// gen_arr(4096, 128, 0.1, 0.1, true) will generate a StringViewArray with | ||
/// 4096 rows, each row containing a string with 128 random characters. | ||
/// around 10% of the rows are null, around 10% of the rows are non-ASCII. | ||
fn gen_string_array( | ||
n_rows: usize, | ||
str_len_chars: usize, | ||
null_density: f32, | ||
utf8_density: f32, | ||
is_string_view: bool, // false -> StringArray, true -> StringViewArray | ||
) -> Vec<ColumnarValue> { | ||
let mut rng = StdRng::seed_from_u64(42); | ||
let rng_ref = &mut rng; | ||
|
||
let corpus = "DataFusionДатаФусион数据融合📊🔥"; // includes utf8 encoding with 1~4 bytes | ||
let corpus_char_count = corpus.chars().count(); | ||
|
||
let mut output_string_vec: Vec<Option<String>> = Vec::with_capacity(n_rows); | ||
for _ in 0..n_rows { | ||
let rand_num = rng_ref.gen::<f32>(); // [0.0, 1.0) | ||
if rand_num < null_density { | ||
output_string_vec.push(None); | ||
} else if rand_num < null_density + utf8_density { | ||
// Generate random UTF8 string | ||
let mut generated_string = String::with_capacity(str_len_chars); | ||
for _ in 0..str_len_chars { | ||
let idx = rng_ref.gen_range(0..corpus_char_count); | ||
let char = corpus.chars().nth(idx).unwrap(); | ||
generated_string.push(char); | ||
} | ||
output_string_vec.push(Some(generated_string)); | ||
} else { | ||
// Generate random ASCII-only string | ||
let value = rng_ref | ||
.sample_iter(&Alphanumeric) | ||
.take(str_len_chars) | ||
.collect(); | ||
let value = String::from_utf8(value).unwrap(); | ||
output_string_vec.push(Some(value)); | ||
} | ||
} | ||
|
||
if is_string_view { | ||
let string_view_array: StringViewArray = output_string_vec.into_iter().collect(); | ||
vec![ColumnarValue::Array(Arc::new(string_view_array))] | ||
} else { | ||
let string_array: StringArray = output_string_vec.clone().into_iter().collect(); | ||
vec![ColumnarValue::Array(Arc::new(string_array))] | ||
} | ||
} | ||
|
||
fn criterion_benchmark(c: &mut Criterion) { | ||
// All benches are single batch run with 8192 rows | ||
let character_length = datafusion_functions::unicode::character_length(); | ||
|
||
let n_rows = 8192; | ||
for str_len in [8, 32, 128, 4096] { | ||
// StringArray ASCII only | ||
let args_string_ascii = gen_string_array(n_rows, str_len, 0.1, 0.0, false); | ||
c.bench_function( | ||
&format!("character_length_StringArray_ascii_str_len_{}", str_len), | ||
|b| b.iter(|| black_box(character_length.invoke(&args_string_ascii))), | ||
); | ||
|
||
// StringArray UTF8 | ||
let args_string_utf8 = gen_string_array(n_rows, str_len, 0.1, 0.5, false); | ||
c.bench_function( | ||
&format!("character_length_StringArray_utf8_str_len_{}", str_len), | ||
|b| b.iter(|| black_box(character_length.invoke(&args_string_utf8))), | ||
); | ||
|
||
// StringViewArray ASCII only | ||
let args_string_view_ascii = gen_string_array(n_rows, str_len, 0.1, 0.0, true); | ||
c.bench_function( | ||
&format!("character_length_StringViewArray_ascii_str_len_{}", str_len), | ||
|b| b.iter(|| black_box(character_length.invoke(&args_string_view_ascii))), | ||
); | ||
|
||
// StringViewArray UTF8 | ||
let args_string_view_utf8 = gen_string_array(n_rows, str_len, 0.1, 0.5, true); | ||
c.bench_function( | ||
&format!("character_length_StringViewArray_utf8_str_len_{}", str_len), | ||
|b| b.iter(|| black_box(character_length.invoke(&args_string_view_utf8))), | ||
); | ||
} | ||
} | ||
|
||
criterion_group!(benches, criterion_benchmark); | ||
criterion_main!(benches); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,10 +15,10 @@ | |
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
use crate::string::common::StringArrayType; | ||
use crate::utils::{make_scalar_function, utf8_to_int_type}; | ||
use arrow::array::{ | ||
Array, ArrayAccessor, ArrayIter, ArrayRef, ArrowPrimitiveType, AsArray, | ||
OffsetSizeTrait, PrimitiveArray, | ||
Array, ArrayRef, ArrowPrimitiveType, AsArray, OffsetSizeTrait, PrimitiveArray, | ||
}; | ||
use arrow::datatypes::{ArrowNativeType, DataType, Int32Type, Int64Type}; | ||
use datafusion_common::Result; | ||
|
@@ -99,18 +99,26 @@ fn character_length(args: &[ArrayRef]) -> Result<ArrayRef> { | |
} | ||
} | ||
|
||
fn character_length_general<'a, T: ArrowPrimitiveType, V: ArrayAccessor<Item = &'a str>>( | ||
fn character_length_general<'a, T: ArrowPrimitiveType, V: StringArrayType<'a>>( | ||
array: V, | ||
) -> Result<ArrayRef> | ||
where | ||
T::Native: OffsetSizeTrait, | ||
{ | ||
let iter = ArrayIter::new(array); | ||
// String characters are variable length encoded in UTF-8, counting the | ||
// number of chars requires expensive decoding, however checking if the | ||
// string is ASCII only is relatively cheap. | ||
// If strings are ASCII only, count bytes instead. | ||
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. 👍 |
||
let is_array_ascii_only = array.is_ascii(); | ||
let iter = array.iter(); | ||
let result = iter | ||
.map(|string| { | ||
string.map(|string: &str| { | ||
T::Native::from_usize(string.chars().count()) | ||
.expect("should not fail as string.chars will always return integer") | ||
if is_array_ascii_only { | ||
T::Native::usize_as(string.len()) | ||
} else { | ||
T::Native::usize_as(string.chars().count()) | ||
} | ||
}) | ||
}) | ||
.collect::<PrimitiveArray<T>>(); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
💯
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.
ДатаФусион )))