Rename boolean Interval constants to match NullableInterval
#18654
Conversation
This file contains hidden or 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
CERTAINLY_FALSE -> FALSE CERTAINLY_TRUE -> TRUE UNCERTAIN -> TRUE_OR_FALSE
github-actions
bot
added
logical-expr
53 tasks
martin-g
reviewed
Nov 13, 2025
| } | ||
|
|
||
| // Tests that there's no such thing as a 'null' boolean interval. | ||
| // An interval with two `Boolean(None)` boundaries is normalised to `Interval::UNCERTAIN`. |
Member
There was a problem hiding this comment.
Suggested change
| // An interval with two `Boolean(None)` boundaries is normalised to `Interval::TRUE_OR_FALSE`. |
Contributor
Author
|
Thanks @martin-g. I hadn't realised the rename refactoring did not update the comments as well. |
Member
|
I noticed one and then let ripgrep catch them all 😄 |
alamb
approved these changes
Nov 13, 2025
|
|
||
| if self.op.eq(&Operator::And) { | ||
| if interval.eq(&Interval::CERTAINLY_TRUE) { | ||
| if interval.eq(&Interval::TRUE) { |
Contributor
There was a problem hiding this comment.
I think these changes really make the code easier to read and understand -- thank you @pepijnve
| /// This interval is semantically equivalent to [Interval::FALSE]. | ||
| pub const FALSE: Self = NullableInterval::NotNull { | ||
| values: Interval::CERTAINLY_FALSE, | ||
| values: Interval::FALSE, |
Contributor
There was a problem hiding this comment.
this now has a very nice symmetry to it
# Conflicts: # datafusion/expr-common/src/interval_arithmetic.rs
Contributor
Author
|
Merge conflicts resolved. All other comments have been addressed. |
Contributor
|
I will merge this once CI passes |
Contributor
|
Thank you @pepijnve |
logan-keede
pushed a commit
to logan-keede/datafusion
that referenced
this pull request
Nov 23, 2025
…he#18654) ## Which issue does this PR close? - None, followup to apache#18625 ## Rationale for this change The discussion in apache#18625 made it clear that the naming of the truth value intervals would benefit from consistency. After some back and forth we concluded that consistency with the SQL specification seemed like the best idea. This PR renames the boolean `Interval` and `NullableInterval` constants to all be consistent. ## What changes are included in this PR? Mechanical refactoring where the following renames were performed: - `Interval::CERTAINLY_TRUE` -> `Interval::TRUE` - `Interval::CERTAINLY_FALSE` -> `Interval::FALSE` - `Interval::UNCERTAIN` -> `Interval::TRUE_OR_FALSE` - `NullableInterval::UNCERTAIN` -> `NullableInterval::ANY_TRUTH_VALUE` The old constant names have been retained with a deprecation note. ## Are these changes tested? No new code ## Are there any user-facing changes? Yes, the old constants are now marked deprecated
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
NullableInterval::andandNullableInterval::or. #18625Rationale for this change
The discussion in #18625 made it clear that the naming of the truth value intervals would benefit from consistency. After some back and forth we concluded that consistency with the SQL specification seemed like the best idea.
This PR renames the boolean
IntervalandNullableIntervalconstants to all be consistent.What changes are included in this PR?
Mechanical refactoring where the following renames were performed:
Interval::CERTAINLY_TRUE->Interval::TRUEInterval::CERTAINLY_FALSE->Interval::FALSEInterval::UNCERTAIN->Interval::TRUE_OR_FALSENullableInterval::UNCERTAIN->NullableInterval::ANY_TRUTH_VALUEThe old constant names have been retained with a deprecation note.
Are these changes tested?
No new code
Are there any user-facing changes?
Yes, the old constants are now marked deprecated