fix: Fix eq properties regression from #10434 #11363
Merged
Conversation
This file contains 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
9 tasks
mustafasrepo
approved these changes
Jul 10, 2024
alamb
reviewed
Jul 10, 2024
| // Add equal expressions to the state | ||
| self.eq_group.add_equal_conditions(left, right); | ||
|
|
||
| // Discover any new orderings | ||
| self.discover_new_orderings(left)?; |
| col(name, &schema).map(|col| PhysicalSortExpr { | ||
| expr: col, | ||
| options: SortOptions::default(), | ||
| // Construct the equivalence properties in different orders |
There was a problem hiding this comment.
I also verified test coverage by running these tests without the code changes and verified they do in fact fail ✅
thread 'equivalence::properties::tests::test_eliminate_redundant_monotonic_sorts' panicked at datafusion/physical-expr/src/equivalence/properties.rs:2493:17:
assertion `left == right` failed: failed test '(a, b, c) -> (c)'
left: false
right: true
stack backtrace:
0: rust_begin_unwind
at /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/std/src/panicking.rs:652:5
1: core::panicking::panic_fmt
at /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/panicking.rs:72:14
2: core::panicking::assert_failed_inner
3: core::panicking::assert_failed
at /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/panicking.rs:364:5
4: datafusion_physical_expr::equivalence::properties::tests::test_eliminate_redundant_monotonic_sorts
at ./src/equivalence/properties.rs:2493:17
5: datafusion_physical_expr::equivalence::properties::tests::test_eliminate_redundant_monotonic_sorts::{{closure}}
at ./src/equivalence/properties.rs:2382:54
6: core::ops::function::FnOnce::call_once
at /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/ops/function.rs:250:5
7: core::ops::function::FnOnce::call_once
at /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/ops/function.rs:250:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
error: test failed, to rerun pass `--lib`
error: 1 target failed:
`--lib`
Lordworms
pushed a commit
to Lordworms/arrow-datafusion
that referenced
this pull request
Jul 12, 2024
* discover new orderings when constants are added * more comments * reduce nesting + describe argument * lint?
appletreeisyellow
pushed a commit
to influxdata/arrow-datafusion
that referenced
this pull request
Jul 12, 2024
* discover new orderings when constants are added * more comments * reduce nesting + describe argument * lint?
findepi
pushed a commit
to findepi/datafusion
that referenced
this pull request
Jul 16, 2024
* discover new orderings when constants are added * more comments * reduce nesting + describe argument * lint?
xinlifoobar
pushed a commit
to xinlifoobar/datafusion
that referenced
this pull request
Jul 18, 2024
* discover new orderings when constants are added * more comments * reduce nesting + describe argument * lint?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Which issue does this PR close?
Closes #11362.
Rationale for this change
This PR fixes a regression in #10434. The previous PR implements "discovery" of new orderings when equal conditions are added. However, this discovery process is not carried out when constants are added.
As a result, adding equality conditions tends to leave the properties in a normalized state, but adding constants does not leave the properties in a normalized state. Thus the order in which one constructs the properties matters.
Since the existing test for this feature applied equal conditions after adding constants, this path dependence was not caught.
What changes are included in this PR?
We extract out the "discovery" logic into a helper method, and we ensure it is called not only when adding equal conditions, but also when adding constants.
Are these changes tested?
Yes; we modify the test to construct the equivalence properties in different orders.
Are there any user-facing changes?
No, aside from improved physical plans in some cases