You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "comphead (via GitHub)" <gi...@apache.org> on 2023/05/29 21:22:46 UTC
[GitHub] [arrow-datafusion] comphead opened a new pull request, #6479: reduce search complexity for BuiltinScalarFunction
comphead opened a new pull request, #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479
# Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
Related #6448.
# Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
Reduce search complexity when mapping BuiltinScalarFunction and its alias. Currently it is linear search and the place becoming a hotspot. The change is to make the search O(1) using static maps
# What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
# Are these changes tested?
Yes
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->
# Are there any user-facing changes?
No
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please add the `api change` label.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] alamb commented on a diff in pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on code in PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479#discussion_r1210281705
##########
datafusion/expr/src/built_in_function.rs:
##########
@@ -429,31 +341,130 @@ impl BuiltinScalarFunction {
}
}
-impl fmt::Display for BuiltinScalarFunction {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- for (func_name, func) in NAME_TO_FUNCTION.iter() {
- if func == self {
- return write!(f, "{}", func_name);
- }
+fn aliases(func: &BuiltinScalarFunction) -> &'static [&'static str] {
+ match func {
+ BuiltinScalarFunction::Abs => &["abs"],
+ BuiltinScalarFunction::Acos => &["acos"],
+ BuiltinScalarFunction::Acosh => &["acosh"],
+ BuiltinScalarFunction::Asin => &["asin"],
+ BuiltinScalarFunction::Asinh => &["asinh"],
+ BuiltinScalarFunction::Atan => &["atan"],
+ BuiltinScalarFunction::Atanh => &["atanh"],
+ BuiltinScalarFunction::Atan2 => &["atan2"],
+ BuiltinScalarFunction::Cbrt => &["cbrt"],
+ BuiltinScalarFunction::Ceil => &["ceil"],
+ BuiltinScalarFunction::Cos => &["cos"],
+ BuiltinScalarFunction::Cosh => &["cosh"],
+ BuiltinScalarFunction::Degrees => &["degrees"],
+ BuiltinScalarFunction::Exp => &["exp"],
+ BuiltinScalarFunction::Factorial => &["factorial"],
+ BuiltinScalarFunction::Floor => &["floor"],
+ BuiltinScalarFunction::Gcd => &["gcd"],
+ BuiltinScalarFunction::Lcm => &["lcm"],
+ BuiltinScalarFunction::Ln => &["ln"],
+ BuiltinScalarFunction::Log => &["log"],
+ BuiltinScalarFunction::Log10 => &["log10"],
+ BuiltinScalarFunction::Log2 => &["log2"],
+ BuiltinScalarFunction::Pi => &["pi"],
+ BuiltinScalarFunction::Power => &["power", "pow"],
+ BuiltinScalarFunction::Radians => &["radians"],
+ BuiltinScalarFunction::Random => &["random"],
+ BuiltinScalarFunction::Round => &["round"],
+ BuiltinScalarFunction::Signum => &["signum"],
+ BuiltinScalarFunction::Sin => &["sin"],
+ BuiltinScalarFunction::Sinh => &["sinh"],
+ BuiltinScalarFunction::Sqrt => &["sqrt"],
+ BuiltinScalarFunction::Tan => &["tan"],
+ BuiltinScalarFunction::Tanh => &["tanh"],
+ BuiltinScalarFunction::Trunc => &["trunc"],
+
+ // conditional functions
+ BuiltinScalarFunction::Coalesce => &["coalesce"],
+ BuiltinScalarFunction::NullIf => &["nullif"],
+
+ // string functions
+ BuiltinScalarFunction::Ascii => &["ascii"],
+ BuiltinScalarFunction::BitLength => &["bit_length"],
+ BuiltinScalarFunction::Btrim => &["btrim"],
+ BuiltinScalarFunction::CharacterLength => {
+ &["character_length", "char_length", "length"]
}
+ BuiltinScalarFunction::Concat => &["concat"],
+ BuiltinScalarFunction::ConcatWithSeparator => &["concat_ws"],
+ BuiltinScalarFunction::Chr => &["chr"],
+ BuiltinScalarFunction::InitCap => &["initcap"],
+ BuiltinScalarFunction::Left => &["left"],
+ BuiltinScalarFunction::Lower => &["lower"],
+ BuiltinScalarFunction::Lpad => &["lpad"],
+ BuiltinScalarFunction::Ltrim => &["ltrim"],
+ BuiltinScalarFunction::OctetLength => &["octet_length"],
+ BuiltinScalarFunction::Repeat => &["repeat"],
+ BuiltinScalarFunction::Replace => &["replace"],
+ BuiltinScalarFunction::Reverse => &["reverse"],
+ BuiltinScalarFunction::Right => &["right"],
+ BuiltinScalarFunction::Rpad => &["rpad"],
+ BuiltinScalarFunction::Rtrim => &["rtrim"],
+ BuiltinScalarFunction::SplitPart => &["split_part"],
+ BuiltinScalarFunction::StartsWith => &["starts_with"],
+ BuiltinScalarFunction::Strpos => &["strpos"],
+ BuiltinScalarFunction::Substr => &["substr"],
+ BuiltinScalarFunction::ToHex => &["to_hex"],
+ BuiltinScalarFunction::Translate => &["translate"],
+ BuiltinScalarFunction::Trim => &["trim"],
+ BuiltinScalarFunction::Upper => &["upper"],
+ BuiltinScalarFunction::Uuid => &["uuid"],
+
+ // regex functions
+ BuiltinScalarFunction::RegexpMatch => &["regexp_match"],
+ BuiltinScalarFunction::RegexpReplace => &["regexp_replace"],
+
+ // time/date functions
+ BuiltinScalarFunction::Now => &["now"],
+ BuiltinScalarFunction::CurrentDate => &["current_date"],
+ BuiltinScalarFunction::CurrentTime => &["current_time"],
+ BuiltinScalarFunction::DateBin => &["date_bin"],
+ BuiltinScalarFunction::DateTrunc => &["date_trunc", "datetrunc"],
Review Comment:
I like how this formulation makes it easier to understand what functions have aliases and which do not 👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] comphead commented on a diff in pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "comphead (via GitHub)" <gi...@apache.org>.
comphead commented on code in PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479#discussion_r1209597649
##########
datafusion/expr/src/built_in_function.rs:
##########
@@ -429,31 +340,130 @@ impl BuiltinScalarFunction {
}
}
Review Comment:
what is that?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] comphead commented on pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "comphead (via GitHub)" <gi...@apache.org>.
comphead commented on PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479#issuecomment-1567529739
@alamb @2010YOUY01
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] 2010YOUY01 commented on a diff in pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "2010YOUY01 (via GitHub)" <gi...@apache.org>.
2010YOUY01 commented on code in PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479#discussion_r1209583657
##########
datafusion/expr/src/built_in_function.rs:
##########
@@ -429,31 +340,130 @@ impl BuiltinScalarFunction {
}
}
Review Comment:
`/// First alias in the array is used to display function names`
##########
datafusion/expr/src/built_in_function.rs:
##########
@@ -204,117 +208,24 @@ pub enum BuiltinScalarFunction {
}
lazy_static! {
- /// Mapping between SQL function names to `BuiltinScalarFunction` types.
- /// Note that multiple SQL function names can represent the same `BuiltinScalarFunction`. These are treated as aliases.
- /// In case of such aliases, the first SQL function name in the vector is used when displaying the function.
- static ref NAME_TO_FUNCTION: Vec<(&'static str, BuiltinScalarFunction)> = vec![
- // math functions
- ("abs", BuiltinScalarFunction::Abs),
- ("acos", BuiltinScalarFunction::Acos),
- ("acosh", BuiltinScalarFunction::Acosh),
- ("asin", BuiltinScalarFunction::Asin),
- ("asinh", BuiltinScalarFunction::Asinh),
- ("atan", BuiltinScalarFunction::Atan),
- ("atanh", BuiltinScalarFunction::Atanh),
- ("atan2", BuiltinScalarFunction::Atan2),
- ("cbrt", BuiltinScalarFunction::Cbrt),
- ("ceil", BuiltinScalarFunction::Ceil),
- ("cos", BuiltinScalarFunction::Cos),
- ("cosh", BuiltinScalarFunction::Cosh),
- ("degrees", BuiltinScalarFunction::Degrees),
- ("exp", BuiltinScalarFunction::Exp),
- ("factorial", BuiltinScalarFunction::Factorial),
- ("floor", BuiltinScalarFunction::Floor),
- ("gcd", BuiltinScalarFunction::Gcd),
- ("lcm", BuiltinScalarFunction::Lcm),
- ("ln", BuiltinScalarFunction::Ln),
- ("log", BuiltinScalarFunction::Log),
- ("log10", BuiltinScalarFunction::Log10),
- ("log2", BuiltinScalarFunction::Log2),
- ("pi", BuiltinScalarFunction::Pi),
- ("power", BuiltinScalarFunction::Power),
- ("pow", BuiltinScalarFunction::Power),
- ("radians", BuiltinScalarFunction::Radians),
- ("random", BuiltinScalarFunction::Random),
- ("round", BuiltinScalarFunction::Round),
- ("signum", BuiltinScalarFunction::Signum),
- ("sin", BuiltinScalarFunction::Sin),
- ("sinh", BuiltinScalarFunction::Sinh),
- ("sqrt", BuiltinScalarFunction::Sqrt),
- ("tan", BuiltinScalarFunction::Tan),
- ("tanh", BuiltinScalarFunction::Tanh),
- ("trunc", BuiltinScalarFunction::Trunc),
-
- // conditional functions
- ("coalesce", BuiltinScalarFunction::Coalesce),
- ("nullif", BuiltinScalarFunction::NullIf),
+ /// Maps the sql function name to `BuiltinScalarFunction`
+ static ref NAME_TO_FUNCTION: HashMap<&'static str, BuiltinScalarFunction> = {
+ let mut map: HashMap<&'static str, BuiltinScalarFunction> = HashMap::new();
+ BuiltinScalarFunction::iter().for_each(|func| {
+ let a = aliases(&func);
+ a.iter().for_each(|a| {map.insert(a, func);});
+ });
+ map
+ };
- // string functions
- ("ascii", BuiltinScalarFunction::Ascii),
- ("bit_length", BuiltinScalarFunction::BitLength),
- ("btrim", BuiltinScalarFunction::Btrim),
- ("character_length", BuiltinScalarFunction::CharacterLength),
- ("char_length", BuiltinScalarFunction::CharacterLength),
- ("concat", BuiltinScalarFunction::Concat),
- ("concat_ws", BuiltinScalarFunction::ConcatWithSeparator),
- ("chr", BuiltinScalarFunction::Chr),
- ("initcap", BuiltinScalarFunction::InitCap),
- ("left", BuiltinScalarFunction::Left),
- ("length", BuiltinScalarFunction::CharacterLength),
- ("lower", BuiltinScalarFunction::Lower),
- ("lpad", BuiltinScalarFunction::Lpad),
- ("ltrim", BuiltinScalarFunction::Ltrim),
- ("octet_length", BuiltinScalarFunction::OctetLength),
- ("repeat", BuiltinScalarFunction::Repeat),
- ("replace", BuiltinScalarFunction::Replace),
- ("reverse", BuiltinScalarFunction::Reverse),
- ("right", BuiltinScalarFunction::Right),
- ("rpad", BuiltinScalarFunction::Rpad),
- ("rtrim", BuiltinScalarFunction::Rtrim),
- ("split_part", BuiltinScalarFunction::SplitPart),
- ("starts_with", BuiltinScalarFunction::StartsWith),
- ("strpos", BuiltinScalarFunction::Strpos),
- ("substr", BuiltinScalarFunction::Substr),
- ("to_hex", BuiltinScalarFunction::ToHex),
- ("translate", BuiltinScalarFunction::Translate),
- ("trim", BuiltinScalarFunction::Trim),
- ("upper", BuiltinScalarFunction::Upper),
- ("uuid", BuiltinScalarFunction::Uuid),
-
- // regex functions
- ("regexp_match", BuiltinScalarFunction::RegexpMatch),
- ("regexp_replace", BuiltinScalarFunction::RegexpReplace),
-
- // time/date functions
- ("now", BuiltinScalarFunction::Now),
- ("current_date", BuiltinScalarFunction::CurrentDate),
- ("current_time", BuiltinScalarFunction::CurrentTime),
- ("date_bin", BuiltinScalarFunction::DateBin),
- ("date_trunc", BuiltinScalarFunction::DateTrunc),
- ("datetrunc", BuiltinScalarFunction::DateTrunc),
- ("date_part", BuiltinScalarFunction::DatePart),
- ("datepart", BuiltinScalarFunction::DatePart),
- ("to_timestamp", BuiltinScalarFunction::ToTimestamp),
- ("to_timestamp_millis", BuiltinScalarFunction::ToTimestampMillis),
- ("to_timestamp_micros", BuiltinScalarFunction::ToTimestampMicros),
- ("to_timestamp_seconds", BuiltinScalarFunction::ToTimestampSeconds),
- ("from_unixtime", BuiltinScalarFunction::FromUnixtime),
-
- // hashing functions
- ("digest", BuiltinScalarFunction::Digest),
- ("md5", BuiltinScalarFunction::MD5),
- ("sha224", BuiltinScalarFunction::SHA224),
- ("sha256", BuiltinScalarFunction::SHA256),
- ("sha384", BuiltinScalarFunction::SHA384),
- ("sha512", BuiltinScalarFunction::SHA512),
-
- // other functions
- ("struct", BuiltinScalarFunction::Struct),
- ("arrow_typeof", BuiltinScalarFunction::ArrowTypeof),
-
- // array functions
- ("make_array", BuiltinScalarFunction::MakeArray),
- ];
+ /// Maps `BuiltinScalarFunction` --> canonical sql function
+ static ref FUNCTION_TO_NAME: HashMap<BuiltinScalarFunction, &'static str> = {
+ let mut map: HashMap<BuiltinScalarFunction, &'static str> = HashMap::new();
+ BuiltinScalarFunction::iter().for_each(|func| {
+ map.insert(func, aliases(&func).iter().next().unwrap_or(&"NO_ALIAS"));
Review Comment:
`.iter().next()` == `.first()`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] alamb merged pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb merged PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] 2010YOUY01 commented on a diff in pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "2010YOUY01 (via GitHub)" <gi...@apache.org>.
2010YOUY01 commented on code in PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479#discussion_r1209612618
##########
datafusion/expr/src/built_in_function.rs:
##########
@@ -429,31 +341,130 @@ impl BuiltinScalarFunction {
}
}
-impl fmt::Display for BuiltinScalarFunction {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- for (func_name, func) in NAME_TO_FUNCTION.iter() {
- if func == self {
- return write!(f, "{}", func_name);
- }
+fn aliases(func: &BuiltinScalarFunction) -> &'static [&'static str] {
Review Comment:
Sorry I commented on the wrong line previously @comphead , should be here.
Adding a comment for aliases():
`/// First alias in the array is used to display function names`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] alamb commented on pull request #6479: reduce search complexity for BuiltinScalarFunction
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #6479:
URL: https://github.com/apache/arrow-datafusion/pull/6479#issuecomment-1570666326
I think this PR looks good to go and all outstanding comments have been addressed, so merging it in 🚀
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org