Skip to content

Preserve the filter order when eliminating duplicated filter #56

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
sgrebnov merged 2 commits into from
Nov 5, 2024
Merged

Preserve the filter order when eliminating duplicated filter #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2b678a
Preserve the filter order when eliminating duplicated filter
Sevenannn Nov 5, 2024
c503f0b
fix
Sevenannn Nov 5, 2024
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
13 changes: 8 additions & 5 deletions datafusion/sql/src/unparser/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

use std::{cmp::Ordering, collections::HashSet, sync::Arc, vec};
use std::{cmp::Ordering, sync::Arc, vec};

use datafusion_common::{
internal_err,
Expand Down Expand Up @@ -102,7 +102,7 @@ pub(crate) fn find_unnest_node_within_select(
/// TableScan: j1
/// And filters: [ta.j1_id < 5, ta.j1_id > 10]
pub (crate) fn try_transform_to_simple_table_scan_with_filters(plan: &LogicalPlan) -> Option<(LogicalPlan, Vec<Expr>)> {
let mut filters: HashSet<Expr> = HashSet::new();
let mut filters: Vec<Expr> = Vec::new();
let mut plan_stack = vec![plan];
let mut table_alias = None;

Expand All @@ -113,7 +113,9 @@ pub (crate) fn try_transform_to_simple_table_scan_with_filters(plan: &LogicalPla
plan_stack.push(alias.input.as_ref());
}
LogicalPlan::Filter(filter) => {
filters.insert(filter.predicate.clone());
if !filters.contains(&filter.predicate) {
filters.push(filter.predicate.clone());
}
plan_stack.push(filter.input.as_ref());
}
LogicalPlan::TableScan(table_scan) => {
Expand All @@ -139,7 +141,9 @@ pub (crate) fn try_transform_to_simple_table_scan_with_filters(plan: &LogicalPla
}).collect::<Result<Vec<_>, DataFusionError>>().ok()?;

for table_scan_filter in table_scan_filters {
filters.insert(table_scan_filter);
if !filters.contains(&table_scan_filter) {
filters.push(table_scan_filter);
}
}

let mut builder = LogicalPlanBuilder::scan(
Expand All @@ -153,7 +157,6 @@ pub (crate) fn try_transform_to_simple_table_scan_with_filters(plan: &LogicalPla
}

let plan = builder.build().ok()?;
let filters: Vec<Expr> = filters.into_iter().collect();

return Some((plan, filters));

Expand Down