You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "mustafasrepo (via GitHub)" <gi...@apache.org> on 2023/03/29 08:08:43 UTC
[GitHub] [arrow-datafusion] mustafasrepo opened a new pull request, #5772: Change required input ordering format
mustafasrepo opened a new pull request, #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772
# 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.
-->
N.A
# 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.
-->
For some executors it is enough that its input is ordered. However, it is not important direction of ordering(such as `PARTITION BY` columns in the ` WindowAggExec`.). Current `required_input_ordering` API `Vec<Option<&[PhysicalSortExpr]>>` doesn't supports this subtlety. Where `PhysicalSortExpr` is a struct encapsulates `expr: Arc<dyn PhysicalExpr>` and `options: SortOptions`.
# 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.
-->
In this PR we change `required_input_ordering` from `fn required_input_ordering(&self) -> Vec<Option<&[PhysicalSortExpr]>>` to `fn required_input_ordering(&self) -> Vec<Option<Vec<PhysicalSortRequirement>>>`, where PhysicalSortRequirement is a struct encapsulates `expr: Arc<dyn PhysicalExpr>` and `options: Option<SortOptions>`. I `options` field is `None`. It means that executor expects its input to be ordered but direction doesn't not matter.
Also some util functions to convert in between these structs are added.
# Are these changes tested?
<!--
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)?
-->
Existing tests should work.
# Are there any user-facing changes?
<!--
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.
-->
`api change`
--
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] mingmwang commented on a diff in pull request #5772: Change required input ordering API
Posted by "mingmwang (via GitHub)" <gi...@apache.org>.
mingmwang commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1151718464
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
+ });
+ }
+ for PhysicalSortExpr { expr, options } in orderby_sort_exprs {
+ let contains = sort_reqs.iter().any(|e| expr.eq(&e.expr));
+ if !contains {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: expr.clone(),
+ options: Some(*options),
+ });
+ }
+ }
+ // Convert empty result to None. Otherwise wrap result inside Some()
+ (!sort_reqs.is_empty()).then_some(sort_reqs)
+}
+
Review Comment:
If there is overlap between partition by keys and sort keys, I think we should respect the sort key's requirements.
--
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] mingmwang commented on a diff in pull request #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "mingmwang (via GitHub)" <gi...@apache.org>.
mingmwang commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152866682
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
Review Comment:
The other example is SortBasedAggregator, currently we do not support SortBasedAggregator in DataFusion
--
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] mingmwang commented on pull request #5772: Change required input ordering API
Posted by "mingmwang (via GitHub)" <gi...@apache.org>.
mingmwang commented on PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#issuecomment-1488149143
LGTM
--
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] ozankabak commented on pull request #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "ozankabak (via GitHub)" <gi...@apache.org>.
ozankabak commented on PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#issuecomment-1489201168
Thanks @alamb -- I will create a separate follow-on that leverages type aliases to simplify things after this and its sister PR merges.
--
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] mustafasrepo commented on a diff in pull request #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "mustafasrepo (via GitHub)" <gi...@apache.org>.
mustafasrepo commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152827986
##########
datafusion/physical-expr/src/utils.rs:
##########
@@ -224,31 +245,102 @@ pub fn ordering_satisfy_concrete<F: FnOnce() -> EquivalenceProperties>(
} else if required
.iter()
.zip(provided.iter())
- .all(|(order1, order2)| order1.eq(order2))
+ .all(|(req, given)| req.eq(given))
{
true
} else if let eq_classes @ [_, ..] = equal_properties().classes() {
- let normalized_required_exprs = required
+ required
.iter()
.map(|e| {
normalize_sort_expr_with_equivalence_properties(e.clone(), eq_classes)
})
- .collect::<Vec<_>>();
- let normalized_provided_exprs = provided
+ .zip(provided.iter().map(|e| {
+ normalize_sort_expr_with_equivalence_properties(e.clone(), eq_classes)
+ }))
+ .all(|(req, given)| req.eq(&given))
+ } else {
+ false
+ }
+}
+
+/// Checks whether the given [`PhysicalSortRequirement`]s are satisfied by the
+/// provided [`PhysicalSortExpr`]s.
+pub fn ordering_satisfy_requirement<F: FnOnce() -> EquivalenceProperties>(
+ provided: Option<&[PhysicalSortExpr]>,
+ required: Option<&[PhysicalSortRequirement]>,
+ equal_properties: F,
+) -> bool {
+ match (provided, required) {
+ (_, None) => true,
+ (None, Some(_)) => false,
+ (Some(provided), Some(required)) => {
+ ordering_satisfy_requirement_concrete(provided, required, equal_properties)
+ }
+ }
+}
+
+/// Checks whether the given [`PhysicalSortRequirement`]s are satisfied by the
+/// provided [`PhysicalSortExpr`]s.
+pub fn ordering_satisfy_requirement_concrete<F: FnOnce() -> EquivalenceProperties>(
Review Comment:
Although it is not absolutely necessary for both `ordering_satisfy_requirement` and `ordering_satisfy_requirement_concrete` to be public. Their API is different, we may want to use both of them.
--
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] mustafasrepo commented on a diff in pull request #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "mustafasrepo (via GitHub)" <gi...@apache.org>.
mustafasrepo commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152827986
##########
datafusion/physical-expr/src/utils.rs:
##########
@@ -224,31 +245,102 @@ pub fn ordering_satisfy_concrete<F: FnOnce() -> EquivalenceProperties>(
} else if required
.iter()
.zip(provided.iter())
- .all(|(order1, order2)| order1.eq(order2))
+ .all(|(req, given)| req.eq(given))
{
true
} else if let eq_classes @ [_, ..] = equal_properties().classes() {
- let normalized_required_exprs = required
+ required
.iter()
.map(|e| {
normalize_sort_expr_with_equivalence_properties(e.clone(), eq_classes)
})
- .collect::<Vec<_>>();
- let normalized_provided_exprs = provided
+ .zip(provided.iter().map(|e| {
+ normalize_sort_expr_with_equivalence_properties(e.clone(), eq_classes)
+ }))
+ .all(|(req, given)| req.eq(&given))
+ } else {
+ false
+ }
+}
+
+/// Checks whether the given [`PhysicalSortRequirement`]s are satisfied by the
+/// provided [`PhysicalSortExpr`]s.
+pub fn ordering_satisfy_requirement<F: FnOnce() -> EquivalenceProperties>(
+ provided: Option<&[PhysicalSortExpr]>,
+ required: Option<&[PhysicalSortRequirement]>,
+ equal_properties: F,
+) -> bool {
+ match (provided, required) {
+ (_, None) => true,
+ (None, Some(_)) => false,
+ (Some(provided), Some(required)) => {
+ ordering_satisfy_requirement_concrete(provided, required, equal_properties)
+ }
+ }
+}
+
+/// Checks whether the given [`PhysicalSortRequirement`]s are satisfied by the
+/// provided [`PhysicalSortExpr`]s.
+pub fn ordering_satisfy_requirement_concrete<F: FnOnce() -> EquivalenceProperties>(
Review Comment:
Although it is not absolutely necessary for both `ordering_satisfy_requirement` and `ordering_satisfy_requirement_concrete` to be public. Their API is different, we may want to use both of them. Actually, `sort_enforcement` uses `ordering_satisfy_requirement_concrete`.
--
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] mingmwang commented on a diff in pull request #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "mingmwang (via GitHub)" <gi...@apache.org>.
mingmwang commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152687617
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
Review Comment:
Another example that the sorting direction is not that important is the SortMergeJoin, but the additional requirements
is for all its input, the ordering should be aligned, should be `ASC` or `DESC` altogether. I think the current `PhysicalSortRequirement` API can not represent this alignment constraints explicitly.
--
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] mustafasrepo commented on a diff in pull request #5772: Change required input ordering API
Posted by "mustafasrepo (via GitHub)" <gi...@apache.org>.
mustafasrepo commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1151727666
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
+ });
+ }
+ for PhysicalSortExpr { expr, options } in orderby_sort_exprs {
+ let contains = sort_reqs.iter().any(|e| expr.eq(&e.expr));
+ if !contains {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: expr.clone(),
+ options: Some(*options),
+ });
+ }
+ }
+ // Convert empty result to None. Otherwise wrap result inside Some()
+ (!sort_reqs.is_empty()).then_some(sort_reqs)
+}
+
Review Comment:
In the case of `PARTITION BY a, ORDER BY a`. We do not add requirement for column `a`. The reason is that all partition would consist of the same value of `a`. Hence `ORDER BY` doesn't really define a direction(all `a` values would be same.). Above operation can produce correct result when its input is ordered according `a ASC` or `a DESC`.
--
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] mingmwang commented on a diff in pull request #5772: Change required input ordering API
Posted by "mingmwang (via GitHub)" <gi...@apache.org>.
mingmwang commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1151727664
##########
datafusion/physical-expr/src/sort_expr.rs:
##########
@@ -69,4 +62,73 @@ impl PhysicalSortExpr {
options: Some(self.options),
})
}
+
+ /// Check whether sort expression satisfies `PhysicalSortRequirement`.
+ // If sort options is Some in `PhysicalSortRequirement`, `expr` and `options` field are compared for equality.
+ // If sort options is None in `PhysicalSortRequirement`, only `expr` is compared for equality.
+ pub fn satisfy(&self, requirement: &PhysicalSortRequirement) -> bool {
+ self.expr.eq(&requirement.expr)
+ && requirement
+ .options
+ .map_or(true, |opts| self.options == opts)
+ }
+}
+
+/// Represents sort requirement associated with a plan
+#[derive(Clone, Debug)]
+pub struct PhysicalSortRequirement {
+ /// Physical expression representing the column to sort
+ pub expr: Arc<dyn PhysicalExpr>,
+ /// Option to specify how the given column should be sorted.
+ /// If unspecified, there is no constraint on sort options.
+ pub options: Option<SortOptions>,
+}
+
+impl From<PhysicalSortExpr> for PhysicalSortRequirement {
+ fn from(value: PhysicalSortExpr) -> Self {
+ Self {
+ expr: value.expr,
+ options: Some(value.options),
+ }
+ }
+}
+
+impl PartialEq for PhysicalSortRequirement {
+ fn eq(&self, other: &PhysicalSortRequirement) -> bool {
+ self.options == other.options && self.expr.eq(&other.expr)
+ }
+}
+
+impl std::fmt::Display for PhysicalSortRequirement {
+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+ let opts_string = self.options.as_ref().map_or("NA", to_str);
+ write!(f, "{} {}", self.expr, opts_string)
+ }
+}
+
+impl PhysicalSortRequirement {
+ /// Returns whether this requirement is equal or more specific than `other`.
+ pub fn compatible(&self, other: &PhysicalSortRequirement) -> bool {
+ self.expr.eq(&other.expr)
+ && other.options.map_or(true, |other_opts| {
+ self.options.map_or(false, |opts| opts == other_opts)
+ })
+ }
+}
+
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-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-datafusion] ozankabak commented on a diff in pull request #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "ozankabak (via GitHub)" <gi...@apache.org>.
ozankabak commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152672124
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
Review Comment:
Right. I vaguely remember us discussing internally that there are also some other use cases where some sort of ordering is required but the options don't matter, but I can't recall now
--
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] ozankabak commented on a diff in pull request #5772: Change required input ordering API
Posted by "ozankabak (via GitHub)" <gi...@apache.org>.
ozankabak commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152375908
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
+ });
+ }
+ for PhysicalSortExpr { expr, options } in orderby_sort_exprs {
+ let contains = sort_reqs.iter().any(|e| expr.eq(&e.expr));
+ if !contains {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: expr.clone(),
+ options: Some(*options),
+ });
+ }
+ }
+ // Convert empty result to None. Otherwise wrap result inside Some()
+ (!sort_reqs.is_empty()).then_some(sort_reqs)
+}
+
Review Comment:
Since `ORDER BY` is local to each partition, I think we are fine here. There is some related discussion here: https://stackoverflow.com/questions/50364818/using-the-same-column-in-partition-by-and-order-by-with-dense-rank
I am still taking a note to remind us that we may want to revisit this if we find out information indicating otherwise.
--
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 #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1152395346
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
Review Comment:
Is it correct that being able to express `options:None` for partitioning operations is the key rationale (thing we can't do before) for this PR?
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
+ });
+ }
+ for PhysicalSortExpr { expr, options } in orderby_sort_exprs {
+ let contains = sort_reqs.iter().any(|e| expr.eq(&e.expr));
+ if !contains {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: expr.clone(),
+ options: Some(*options),
+ });
+ }
+ }
+ // Convert empty result to None. Otherwise wrap result inside Some()
+ (!sort_reqs.is_empty()).then_some(sort_reqs)
+}
+
Review Comment:
Computing `rownum()` over `PARTITION BY a, ORDER BY a DESC` I think will result in arbitrary assignments of row numbers (as @ozankabak and @mustafasrepo say above, the value of `a` within each partition is the same)
##########
datafusion/physical-expr/src/utils.rs:
##########
@@ -224,31 +245,102 @@ pub fn ordering_satisfy_concrete<F: FnOnce() -> EquivalenceProperties>(
} else if required
.iter()
.zip(provided.iter())
- .all(|(order1, order2)| order1.eq(order2))
+ .all(|(req, given)| req.eq(given))
{
true
} else if let eq_classes @ [_, ..] = equal_properties().classes() {
- let normalized_required_exprs = required
+ required
.iter()
.map(|e| {
normalize_sort_expr_with_equivalence_properties(e.clone(), eq_classes)
})
- .collect::<Vec<_>>();
- let normalized_provided_exprs = provided
+ .zip(provided.iter().map(|e| {
+ normalize_sort_expr_with_equivalence_properties(e.clone(), eq_classes)
+ }))
+ .all(|(req, given)| req.eq(&given))
+ } else {
+ false
+ }
+}
+
+/// Checks whether the given [`PhysicalSortRequirement`]s are satisfied by the
+/// provided [`PhysicalSortExpr`]s.
+pub fn ordering_satisfy_requirement<F: FnOnce() -> EquivalenceProperties>(
+ provided: Option<&[PhysicalSortExpr]>,
+ required: Option<&[PhysicalSortRequirement]>,
+ equal_properties: F,
+) -> bool {
+ match (provided, required) {
+ (_, None) => true,
+ (None, Some(_)) => false,
+ (Some(provided), Some(required)) => {
+ ordering_satisfy_requirement_concrete(provided, required, equal_properties)
+ }
+ }
+}
+
+/// Checks whether the given [`PhysicalSortRequirement`]s are satisfied by the
+/// provided [`PhysicalSortExpr`]s.
+pub fn ordering_satisfy_requirement_concrete<F: FnOnce() -> EquivalenceProperties>(
Review Comment:
Is this meant to be `pub`? It seems like callers should always use `ordering_satisfy_requirement`, right?
--
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 #5772: Change required input ordering physical plan API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb merged PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772
--
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 #5772: Change required input ordering physical plan API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#issuecomment-1496266013
> Thanks @alamb -- I will create a separate follow-on that leverages type aliases to simplify things after this and its sister PR merges.
I have made a PR https://github.com/apache/arrow-datafusion/pull/5863 that doesn't change the type signatures but I think will make using this new structure easier.
--
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] mingmwang commented on a diff in pull request #5772: Change required input ordering API
Posted by "mingmwang (via GitHub)" <gi...@apache.org>.
mingmwang commented on code in PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#discussion_r1151756455
##########
datafusion/core/src/physical_plan/windows/mod.rs:
##########
@@ -187,6 +188,30 @@ fn create_built_in_window_expr(
})
}
+pub(crate) fn calc_requirements(
+ partition_by_exprs: &[Arc<dyn PhysicalExpr>],
+ orderby_sort_exprs: &[PhysicalSortExpr],
+) -> Option<Vec<PhysicalSortRequirement>> {
+ let mut sort_reqs = vec![];
+ for partition_by in partition_by_exprs {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: partition_by.clone(),
+ options: None,
+ });
+ }
+ for PhysicalSortExpr { expr, options } in orderby_sort_exprs {
+ let contains = sort_reqs.iter().any(|e| expr.eq(&e.expr));
+ if !contains {
+ sort_reqs.push(PhysicalSortRequirement {
+ expr: expr.clone(),
+ options: Some(*options),
+ });
+ }
+ }
+ // Convert empty result to None. Otherwise wrap result inside Some()
+ (!sort_reqs.is_empty()).then_some(sort_reqs)
+}
+
Review Comment:
But if the original SQL is `PARTITION BY a, ORDER BY a DESC`, should we respect the direction? I'm not sure for this.
It think for cases like` ROWNUM() over`, the direction matters.
--
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 #5772: Change required input ordering API to allow any NULLS FIRST / LAST and ASC / DESC
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #5772:
URL: https://github.com/apache/arrow-datafusion/pull/5772#issuecomment-1489224113
I'll plan to merge this tomorrow unless anyone else would like time to 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-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org