berkaysynnada commented on code in PR #11571:
URL: https://github.com/apache/datafusion/pull/11571#discussion_r1686068918
##########
datafusion/functions/src/math/log.rs:
##########
@@ -334,4 +341,94 @@ mod tests {
assert_eq!(args[0], lit(2));
assert_eq!(args[1], lit(3));
}
+
+ #[test]
+ fn test_log_output_ordering() {
+ // [Unordered, Ascending, Descending, Literal]
+ let orders = vec![
+ ExprProperties::new_unknown(),
+ ExprProperties::new_unknown().with_order(SortProperties::Ordered(
+ SortOptions {
+ descending: false,
+ nulls_first: true,
+ },
+ )),
+ ExprProperties::new_unknown().with_order(SortProperties::Ordered(
+ SortOptions {
+ descending: true,
+ nulls_first: true,
+ },
+ )),
+
ExprProperties::new_unknown().with_order(SortProperties::Singleton),
+ ];
+
+ let log = LogFunc::new();
+
+ // Test log(num)
+ for order in orders.iter().cloned() {
+ let result = log.output_ordering(&[order.clone()]).unwrap();
+ assert_eq!(result, order.sort_properties);
+ }
+
+ // Test log(base, num)
+ let mut results = Vec::with_capacity(orders.len() * orders.len());
+ for base_order in orders.iter() {
+ for num_order in orders.iter().cloned() {
+ let result = log
+ .output_ordering(&[base_order.clone(), num_order])
+ .unwrap();
+ results.push(result);
+ }
+ }
+ let expected = vec![
+ // base: Unordered
+ SortProperties::Unordered,
+ SortProperties::Unordered,
+ SortProperties::Unordered,
+ SortProperties::Unordered,
+ // base: Ascending, num: Unordered
+ SortProperties::Unordered,
+ // base: Ascending, num: Ascending
+ SortProperties::Unordered,
+ // base: Ascending, num: Descending
+ SortProperties::Ordered(SortOptions {
+ descending: true,
+ nulls_first: true,
+ }),
+ // base: Ascending, num: Literal
+ SortProperties::Ordered(SortOptions {
+ descending: true,
+ nulls_first: true,
+ }),
+ // base: Descending, num: Unordered
+ SortProperties::Unordered,
+ // base: Descending, num: Ascending
+ SortProperties::Ordered(SortOptions {
+ descending: false,
+ nulls_first: true,
+ }),
+ // base: Descending, num: Descending
+ SortProperties::Unordered,
+ // base: Descending, num: Literal
+ SortProperties::Ordered(SortOptions {
+ descending: false,
+ nulls_first: true,
+ }),
+ // base: Literal, num: Unordered
+ SortProperties::Unordered,
+ // base: Literal, num: Ascending
+ SortProperties::Ordered(SortOptions {
+ descending: false,
+ nulls_first: true,
+ }),
+ // base: Literal, num: Descending
+ SortProperties::Ordered(SortOptions {
+ descending: true,
+ nulls_first: true,
+ }),
+ // base: Literal, num: Literal
+ SortProperties::Singleton,
+ ];
+ assert_eq!(results, expected);
+ }
Review Comment:
Thanks for adding these tests. `output_ordering()` API of scalar functions
are experimental and needs unit tests
(https://github.com/apache/datafusion/issues/10595). This is a good example for
the rest of them.
##########
datafusion/functions/src/math/log.rs:
##########
@@ -82,7 +82,13 @@ impl ScalarUDFImpl for LogFunc {
}
fn output_ordering(&self, input: &[ExprProperties]) ->
Result<SortProperties> {
- match (input[0].sort_properties, input[1].sort_properties) {
+ let (base_sort_properties, num_sort_properties) = if input.len() == 1 {
+ // log(x) defaults to log(10, x)
+ (SortProperties::Singleton, input[0].sort_properties)
+ } else {
+ (input[0].sort_properties, input[1].sort_properties)
+ };
+ match (num_sort_properties, base_sort_properties) {
Review Comment:
You are correct. We also need to check the placement of nulls in
`output_ordering()` (and possibly in other implementations of it for
multi-input functions). As @jonahgao noticed, `impl SortProperties {}` needs
similar handling as well, but that can be addressed in a separate PR. I can
create a ticket for it.
##########
datafusion/functions/src/math/log.rs:
##########
@@ -82,7 +82,13 @@ impl ScalarUDFImpl for LogFunc {
}
fn output_ordering(&self, input: &[ExprProperties]) ->
Result<SortProperties> {
- match (input[0].sort_properties, input[1].sort_properties) {
+ let (base_sort_properties, num_sort_properties) = if input.len() == 1 {
+ // log(x) defaults to log(10, x)
+ (SortProperties::Singleton, input[0].sort_properties)
Review Comment:
👍🏻
--
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-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
