forked from apache/datafusion
-
Notifications
You must be signed in to change notification settings - Fork 0
20114: feat: unify left and right functions and benches #228
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
Open
martin-augment
wants to merge
4
commits into
main
Choose a base branch
from
pr-20114-2026-02-03-07-48-32
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 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 hidden or 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 was deleted.
Oops, something went wrong.
This file contains hidden or 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,166 @@ | ||
| // 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 std::hint::black_box; | ||
| use std::sync::Arc; | ||
|
|
||
| use arrow::array::{ArrayRef, Int64Array}; | ||
| use arrow::datatypes::{DataType, Field}; | ||
| use arrow::util::bench_util::{ | ||
| create_string_array_with_len, create_string_view_array_with_len, | ||
| }; | ||
| use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main}; | ||
| use datafusion_common::config::ConfigOptions; | ||
| use datafusion_expr::{ColumnarValue, ScalarFunctionArgs}; | ||
| use datafusion_functions::unicode::{left, right}; | ||
|
|
||
| fn create_args( | ||
| size: usize, | ||
| str_len: usize, | ||
| use_negative: bool, | ||
| is_string_view: bool, | ||
| ) -> Vec<ColumnarValue> { | ||
| let string_arg = if is_string_view { | ||
| ColumnarValue::Array(Arc::new(create_string_view_array_with_len( | ||
| size, 0.1, str_len, true, | ||
| ))) | ||
| } else { | ||
| ColumnarValue::Array(Arc::new(create_string_array_with_len::<i32>( | ||
| size, 0.1, str_len, | ||
| ))) | ||
| }; | ||
|
|
||
| // For negative n, we want to trigger the double-iteration code path | ||
| let n_values: Vec<i64> = if use_negative { | ||
| (0..size).map(|i| -((i % 10 + 1) as i64)).collect() | ||
| } else { | ||
| (0..size).map(|i| (i % 10 + 1) as i64).collect() | ||
| }; | ||
| let n_array = Arc::new(Int64Array::from(n_values)); | ||
|
|
||
| vec![ | ||
| string_arg, | ||
| ColumnarValue::Array(Arc::clone(&n_array) as ArrayRef), | ||
| ] | ||
| } | ||
|
|
||
| fn criterion_benchmark(c: &mut Criterion) { | ||
| let left_function = left(); | ||
| let right_function = right(); | ||
|
|
||
| for function in [left_function, right_function] { | ||
| for is_string_view in [false, true] { | ||
| for size in [1024, 4096] { | ||
| let function_name = function.name(); | ||
| let mut group = c.benchmark_group(format!("{function_name} size={size}")); | ||
|
|
||
| // Benchmark with positive n (no optimization needed) | ||
| let mut bench_name = if is_string_view { | ||
| "string_view_array positive n" | ||
| } else { | ||
| "string_array positive n" | ||
| }; | ||
| let return_type = if is_string_view { | ||
| DataType::Utf8View | ||
| } else { | ||
| DataType::Utf8 | ||
| }; | ||
|
|
||
| let args = create_args(size, 32, false, is_string_view); | ||
| group.bench_function(BenchmarkId::new(bench_name, size), |b| { | ||
| let arg_fields = args | ||
| .iter() | ||
| .enumerate() | ||
| .map(|(idx, arg)| { | ||
| Field::new(format!("arg_{idx}"), arg.data_type(), true).into() | ||
| }) | ||
| .collect::<Vec<_>>(); | ||
| let config_options = Arc::new(ConfigOptions::default()); | ||
|
|
||
| b.iter(|| { | ||
| black_box( | ||
| function | ||
| .invoke_with_args(ScalarFunctionArgs { | ||
| args: args.clone(), | ||
| arg_fields: arg_fields.clone(), | ||
| number_rows: size, | ||
| return_field: Field::new( | ||
| "f", | ||
| return_type.clone(), | ||
| true, | ||
| ) | ||
| .into(), | ||
| config_options: Arc::clone(&config_options), | ||
| }) | ||
| .expect("should work"), | ||
| ) | ||
| }) | ||
| }); | ||
|
|
||
| // Benchmark with negative n (triggers optimization) | ||
| bench_name = if is_string_view { | ||
| "string_view_array negative n" | ||
| } else { | ||
| "string_array negative n" | ||
| }; | ||
| let return_type = if is_string_view { | ||
| DataType::Utf8View | ||
| } else { | ||
| DataType::Utf8 | ||
| }; | ||
|
|
||
| let args = create_args(size, 32, true, is_string_view); | ||
| group.bench_function(BenchmarkId::new(bench_name, size), |b| { | ||
| let arg_fields = args | ||
| .iter() | ||
| .enumerate() | ||
| .map(|(idx, arg)| { | ||
| Field::new(format!("arg_{idx}"), arg.data_type(), true).into() | ||
| }) | ||
| .collect::<Vec<_>>(); | ||
| let config_options = Arc::new(ConfigOptions::default()); | ||
|
|
||
| b.iter(|| { | ||
| black_box( | ||
| function | ||
| .invoke_with_args(ScalarFunctionArgs { | ||
| args: args.clone(), | ||
| arg_fields: arg_fields.clone(), | ||
| number_rows: size, | ||
| return_field: Field::new( | ||
| "f", | ||
| return_type.clone(), | ||
| true, | ||
| ) | ||
| .into(), | ||
| config_options: Arc::clone(&config_options), | ||
| }) | ||
| .expect("should work"), | ||
| ) | ||
| }) | ||
| }); | ||
|
|
||
| group.finish(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| criterion_group!(benches, criterion_benchmark); | ||
| criterion_main!(benches); | ||
Oops, something went wrong.
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.
The code for benchmarking with positive and negative
nis very similar and can be refactored to reduce duplication. You can introduce a loop over[false, true]foruse_negativeand move the common benchmarking logic inside.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.
value:good-to-have; category:bug; feedback: The Gemini AI reviewer is correct! There is a code duplication in the benchmark test that could be avoided by adding a new for loop for the negative/positive flag.Prevent maintaining the same code twice.