Skip to content

replace once iter chain with array::IntoIter #704

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
alamb merged 2 commits into from
Jul 13, 2021
Merged

replace once iter chain with array::IntoIter #704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df74a15
replace once iter chain with array::IntoIter
houqp Jul 10, 2021
8e8b2e7
use new array IntoIter implementation from rust 1.53
houqp Jul 13, 2021
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
8 changes: 3 additions & 5 deletions datafusion/src/logical_plan/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,10 @@ impl LogicalPlan {
{
self.using_columns.push(
on.iter()
.map(|entry| {
std::iter::once(entry.0.clone())
.chain(std::iter::once(entry.1.clone()))
})
.map(|entry| std::array::IntoIter::new([&entry.0, &entry.1]))
.flatten()
.collect::<HashSet<_>>(),
.cloned()
.collect::<HashSet<Column>>(),
);
}
Ok(true)
Expand Down
13 changes: 9 additions & 4 deletions datafusion/src/optimizer/filter_push_down.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,23 @@ fn get_join_predicates<'a>(
.fields()
.iter()
.map(|f| {
std::iter::once(f.qualified_column())
std::array::IntoIter::new([
f.qualified_column(),
// we need to push down filter using unqualified column as well
.chain(std::iter::once(f.unqualified_column()))
f.unqualified_column(),
])
})
.flatten()
.collect::<HashSet<_>>();
let right_columns = &right
.fields()
.iter()
.map(|f| {
std::iter::once(f.qualified_column())
.chain(std::iter::once(f.unqualified_column()))
std::array::IntoIter::new([
f.qualified_column(),
// we need to push down filter using unqualified column as well
f.unqualified_column(),
])
})
.flatten()
.collect::<HashSet<_>>();
Expand Down