Skip to content
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

Minor: allow to build RuntimeEnv from RuntimeConfig #12151

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Minor: allow to build RuntimeEnv from RuntimeConfig #12151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
322967e
Allow to build RuntimeEnv from RuntimeConfig
theirix Aug 24, 2024
0ae5fbe
Fix formatting
theirix Aug 25, 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
9 changes: 5 additions & 4 deletions datafusion/core/tests/fuzz_cases/sort_fuzz.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use arrow::{
compute::SortOptions,
record_batch::RecordBatch,
};
use datafusion::execution::runtime_env::{RuntimeConfig, RuntimeEnv};
use datafusion::execution::runtime_env::RuntimeConfig;
use datafusion::physical_plan::expressions::PhysicalSortExpr;
use datafusion::physical_plan::memory::MemoryExec;
use datafusion::physical_plan::sorts::sort::SortExec;
Expand Down Expand Up @@ -136,9 +136,10 @@ impl SortTest {
.sort_spill_reservation_bytes,
);

let runtime_config = RuntimeConfig::new()
.with_memory_pool(Arc::new(GreedyMemoryPool::new(pool_size)));
let runtime = Arc::new(RuntimeEnv::new(runtime_config).unwrap());
let runtime_env = RuntimeConfig::new()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why it is env, config is more appropriate imho

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because a newly introduced method build returns env. Please check the rest of this expression in diff below.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @comphead this now looks a bit strange -- I filed #12156 with an idea of how to improve it

.with_memory_pool(Arc::new(GreedyMemoryPool::new(pool_size)))
.build();
let runtime = Arc::new(runtime_env.unwrap());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should avoid calling .unwrap() although its not related to the PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Even for tests, if we have complex chains of unwraps, we can use expect with a more detailed failure explanation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note this is a test so I think it is ok to call unwrap() here)

SessionContext::new_with_config_rt(session_config, runtime)
} else {
SessionContext::new_with_config(session_config)
Expand Down
5 changes: 5 additions & 0 deletions datafusion/execution/src/runtime_env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,9 @@ impl RuntimeConfig {
pub fn with_temp_file_path(self, path: impl Into<PathBuf>) -> Self {
self.with_disk_manager(DiskManagerConfig::new_specified(vec![path.into()]))
}

/// Build a `RuntimeEnv` object from the configuration
pub fn build(self) -> Result<RuntimeEnv> {
RuntimeEnv::new(self)
}
}