forked from apache/datafusion
-
Notifications
You must be signed in to change notification settings - Fork 0
WIP: example lexical range handling #63
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.
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
Draft
wiedld
wants to merge
4
commits into
main
Choose a base branch
from
wiedld/lexical-range-code
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4,974
−1
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4b06546
feat: example lexical range handling
wiedld ae080c7
Merge branch 'main' into wiedld/lexical-range-code
wiedld 6a8a0c5
Merge branch 'main' into wiedld/lexical-range-code
wiedld 4871fdd
refactor: port to upstream the massive refactoring from the past few …
wiedld File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
109 changes: 109 additions & 0 deletions
109
datafusion/physical-optimizer/src/progressive_evaluation.rs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
//! TODO: physical optimizer run to conditionally swap the SPM with the ProgressiveEvalExec | ||
|
||
mod extract_ranges; | ||
#[allow(dead_code)] | ||
mod lexical_ranges; | ||
mod statistics; | ||
mod util; | ||
|
||
use itertools::Itertools; | ||
use std::sync::Arc; | ||
|
||
use datafusion_common::{ | ||
tree_node::{Transformed, TreeNode}, | ||
Result, | ||
}; | ||
use datafusion_physical_plan::{ | ||
sorts::sort_preserving_merge::SortPreservingMergeExec, union::UnionExec, | ||
ExecutionPlan, | ||
}; | ||
use extract_ranges::extract_disjoint_ranges_from_plan; | ||
use util::split_parquet_files; | ||
|
||
use crate::PhysicalOptimizerRule; | ||
|
||
#[allow(dead_code)] | ||
#[derive(Debug)] | ||
struct InsertProgressiveEval; | ||
|
||
impl PhysicalOptimizerRule for InsertProgressiveEval { | ||
fn name(&self) -> &str { | ||
"TBD" | ||
} | ||
|
||
fn schema_check(&self) -> bool { | ||
false | ||
} | ||
|
||
fn optimize( | ||
&self, | ||
plan: Arc<dyn ExecutionPlan>, | ||
_config: &datafusion_common::config::ConfigOptions, | ||
) -> Result<Arc<dyn ExecutionPlan>> { | ||
plan.transform_up(|plan| { | ||
// Find SortPreservingMergeExec | ||
let Some(sort_preserving_merge_exec) = | ||
plan.as_any().downcast_ref::<SortPreservingMergeExec>() | ||
else { | ||
return Ok(Transformed::no(plan)); | ||
}; | ||
|
||
// Split file groups to maximize potential disjoint ranges. | ||
let new_inputs: Vec<Arc<dyn ExecutionPlan>> = sort_preserving_merge_exec | ||
.children() | ||
.into_iter() | ||
.map(|spm_child| { | ||
Arc::clone(spm_child) | ||
.transform_down(|plan| { | ||
split_parquet_files(plan, sort_preserving_merge_exec.expr()) | ||
}) | ||
.map(|t| t.data) | ||
}) | ||
.try_collect()?; | ||
let transformed_input_plan = Arc::new(UnionExec::new(new_inputs)) as _; | ||
|
||
// try to extract the lexical ranges for the input partitions | ||
let Ok(Some(_lexical_ranges)) = extract_disjoint_ranges_from_plan( | ||
sort_preserving_merge_exec.expr(), | ||
&transformed_input_plan, | ||
) else { | ||
return Ok(Transformed::no(plan)); | ||
}; | ||
|
||
// confirm we still have the ordering needed for the SPM | ||
assert!(transformed_input_plan | ||
.properties() | ||
.equivalence_properties() | ||
.ordering_satisfy(sort_preserving_merge_exec.expr())); | ||
|
||
// Replace SortPreservingMergeExec with ProgressiveEvalExec | ||
// TODO: have the ProgressiveEvalExec perform that partition mapping | ||
// let progresive_eval_exec = Arc::new(ProgressiveEvalExec::new( | ||
// transformed_input_plan, | ||
// lexical_ranges, | ||
// sort_preserving_merge_exec.fetch(), | ||
// )); | ||
// Ok(Transformed::yes(progresive_eval_exec)) | ||
|
||
Ok(Transformed::no(plan)) | ||
}) | ||
.map(|t| t.data) | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the start point of the code, and providing an overview.