Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Optimize the parameter types of ParamValues's methods #8613

Merged
merged 4 commits into from
Dec 22, 2023
Merged

Optimize the parameter types of ParamValues's methods #8613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08ab18f
Take `&str` instead of `&String` in `ParamValue::get_placeholders_wit…
kawadakk Dec 21, 2023
5acf9a0
Take `Option<&DataType>` instead of `&Option<DataType>` in `ParamValu…
kawadakk Dec 21, 2023
964d57c
Take `&[_]` instead of `&Vec<_>` in `ParamValues::verify`
kawadakk Dec 21, 2023
88a9f4c
Merge remote-tracking branch 'apache/main' into patch/param-values-bo…
alamb Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions datafusion/common/src/param_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub enum ParamValues {

impl ParamValues {
/// Verify parameter list length and type
pub fn verify(&self, expect: &Vec<DataType>) -> Result<()> {
pub fn verify(&self, expect: &[DataType]) -> Result<()> {
match self {
ParamValues::List(list) => {
// Verify if the number of params matches the number of values
Expand Down Expand Up @@ -67,8 +67,8 @@ impl ParamValues {

pub fn get_placeholders_with_values(
&self,
id: &String,
data_type: &Option<DataType>,
id: &str,
data_type: Option<&DataType>,
) -> Result<ScalarValue> {
match self {
ParamValues::List(list) => {
Expand All @@ -88,7 +88,7 @@ impl ParamValues {
))
})?;
// check if the data type of the value matches the data type of the placeholder
if Some(value.data_type()) != *data_type {
if Some(&value.data_type()) != data_type {
return _internal_err!(
"Placeholder value type mismatch: expected {:?}, got {:?}",
data_type,
Expand All @@ -107,7 +107,7 @@ impl ParamValues {
))
})?;
// check if the data type of the value matches the data type of the placeholder
if Some(value.data_type()) != *data_type {
if Some(&value.data_type()) != data_type {
return _internal_err!(
"Placeholder value type mismatch: expected {:?}, got {:?}",
data_type,
Expand Down
4 changes: 2 additions & 2 deletions datafusion/expr/src/logical_plan/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,8 +1250,8 @@ impl LogicalPlan {
expr.transform(&|expr| {
match &expr {
Expr::Placeholder(Placeholder { id, data_type }) => {
let value =
param_values.get_placeholders_with_values(id, data_type)?;
let value = param_values
.get_placeholders_with_values(id, data_type.as_ref())?;
// Replace the placeholder with the value
Ok(Transformed::Yes(Expr::Literal(value)))
}
Expand Down