This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 129c58fa43 fix: Remove `!=0` check from
`supports_collect_by_thresholds` (#20730)
129c58fa43 is described below
commit 129c58fa438795a66deb1cb1d2246e1bde18fa25
Author: Jonathan Chen <[email protected]>
AuthorDate: Wed Mar 11 16:23:31 2026 -0500
fix: Remove `!=0` check from `supports_collect_by_thresholds` (#20730)
## 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.
-->
- Closes #.
## Rationale for this change
Small change to remove the TODO + != 0 check. Since the commit was made
two years ago, statistics have been changed to use Precision. Exact(0)
and inexact(0) are now valid stats while absent will evaluate to false
<!--
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.
-->
## 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.
-->
## 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)?
-->
## 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.
-->
---------
Co-authored-by: Daniël Heres <[email protected]>
---
datafusion/physical-optimizer/src/join_selection.rs | 10 ++++++----
datafusion/sqllogictest/test_files/cte.slt | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/datafusion/physical-optimizer/src/join_selection.rs
b/datafusion/physical-optimizer/src/join_selection.rs
index 29bbc8e108..88115b12f7 100644
--- a/datafusion/physical-optimizer/src/join_selection.rs
+++ b/datafusion/physical-optimizer/src/join_selection.rs
@@ -87,16 +87,18 @@ fn supports_collect_by_thresholds(
threshold_byte_size: usize,
threshold_num_rows: usize,
) -> bool {
- // Currently we do not trust the 0 value from stats, due to stats
collection might have bug
- // TODO check the logic in datasource::get_statistics_with_limit()
let Ok(stats) = plan.partition_statistics(None) else {
return false;
};
+ // Stats use `Precision<T>` to represent stats, where `Absent` means
unknown.
+ // `Exact(0)` and `Inexact(0)` are both valid stats, and we should not
treat
+ // them as unknown, `Absent` will return None (this is in regards to why
+ // `!=0` is not checked)
if let Some(byte_size) = stats.total_byte_size.get_value() {
- *byte_size != 0 && *byte_size < threshold_byte_size
+ *byte_size < threshold_byte_size
} else if let Some(num_rows) = stats.num_rows.get_value() {
- *num_rows != 0 && *num_rows < threshold_num_rows
+ *num_rows < threshold_num_rows
} else {
false
}
diff --git a/datafusion/sqllogictest/test_files/cte.slt
b/datafusion/sqllogictest/test_files/cte.slt
index 4fd77be045..65f694eb37 100644
--- a/datafusion/sqllogictest/test_files/cte.slt
+++ b/datafusion/sqllogictest/test_files/cte.slt
@@ -1015,7 +1015,7 @@ logical_plan
04)----SubqueryAlias: cte
05)------TableScan: person projection=[id]
physical_plan
-01)HashJoinExec: mode=Partitioned, join_type=LeftSemi, on=[(id@0, id@0)]
+01)HashJoinExec: mode=CollectLeft, join_type=LeftSemi, on=[(id@0, id@0)]
02)--DataSourceExec: partitions=1, partition_sizes=[0]
03)--DataSourceExec: partitions=1, partition_sizes=[0]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
