Skip to content

Prevent rewriting strict inequality to closed interval for non-discrete types #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wyatt-herkamp merged 1 commit into from
Dec 12, 2025
Merged

Prevent rewriting strict inequality to closed interval for non-discrete types #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions src/rewrite/normal_form.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ impl Predicate {
// so handling of open intervals is done by adding/subtracting the smallest increment.
// However, there is not really a public API to do this,
// other than the satisfy_greater method.
Operator::Lt => Ok(
match satisfy_greater(
Operator::Lt => {
let range_val = match satisfy_greater(
&Interval::try_new(value.clone(), value.clone())?,
&Interval::make_unbounded(&value.data_type())?,
true,
Expand All @@ -538,11 +538,19 @@ impl Predicate {
*range = None;
return Ok(());
}
},
),
// Same thing as above.
Operator::Gt => Ok(
match satisfy_greater(
};
// If the type is not discrete (e.g. Utf8), satisfy_greater may return an unchanged value.
// This means the interval could not be tightened and it is unsafe to produce a closed interval
if range_val.upper() == &value {
Err(DataFusionError::Plan(
"cannot represent strict inequality as closed interval for non-discrete types".to_string(),
))
} else {
Ok(range_val)
}
}
Operator::Gt => {
let range_val = match satisfy_greater(
&Interval::make_unbounded(&value.data_type())?,
&Interval::try_new(value.clone(), value.clone())?,
true,
Expand All @@ -552,8 +560,15 @@ impl Predicate {
*range = None;
return Ok(());
}
},
),
};
if range_val.lower() == &value {
Err(DataFusionError::Plan(
"cannot represent strict inequality as closed interval for non-discrete types".to_string(),
))
} else {
Ok(range_val)
}
}
_ => Err(DataFusionError::Plan(
"unsupported binary expression".to_string(),
)),
Expand Down Expand Up @@ -1154,6 +1169,11 @@ mod test {
// we are allowed to substitute column1 for column3 and vice versa.
"SELECT column2, column3 FROM t1 WHERE column1 = column3 AND column3 >= '2023'",
},
TestCase {
name: "range filter with inequality on non-discrete type",
base: "SELECT * FROM t1",
query: "SELECT column1 FROM t1 WHERE column1 < '2022'",
},
TestCase {
name: "duplicate expressions (X-209)",
base: "SELECT * FROM t1",
Expand Down