martin-g commented on code in PR #20734: URL: https://github.com/apache/datafusion/pull/20734#discussion_r2894892781
########## datafusion/core/tests/heap_profile_hash_aggregate.rs: ########## @@ -0,0 +1,72 @@ +// 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. + +//! Heap profiling test for grouped hash aggregation with spilling. +//! Data has many distinct groups to force hash table growth beyond +//! the memory pool, triggering spilling. + +#[global_allocator] +static ALLOC: dhat::Alloc = dhat::Alloc; + +use std::sync::Arc; + +use datafusion::prelude::{SessionConfig, SessionContext}; +use datafusion_execution::memory_pool::FairSpillPool; +use datafusion_execution::runtime_env::RuntimeEnvBuilder; + +const MEMORY_LIMIT: usize = 10 * 1024 * 1024; // 10MB + +#[tokio::test] Review Comment: I am not sure whether these new IT tests are going to stay but if they do then maybe the dhat dev-dependency should be optional and loaded only when some new feature is enabled, e.g. `memory-profiling`, and all IT tests be gated behind this feature. ########## datafusion/core/tests/heap_profile_hash_join.rs: ########## @@ -0,0 +1,96 @@ +// 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. + +//! Heap profiling test for HashJoinExec. + +#[global_allocator] +static ALLOC: dhat::Alloc = dhat::Alloc; + +use std::sync::Arc; + +use datafusion::prelude::{SessionConfig, SessionContext}; +use datafusion_execution::memory_pool::FairSpillPool; +use datafusion_execution::runtime_env::RuntimeEnvBuilder; + +const MEMORY_LIMIT: usize = 40 * 1024 * 1024; // 40MB + +#[tokio::test] +async fn heap_profile_hash_join() { + // HashJoin does not spill, so the pool must fit the build side + // hash table. 1M rows of (i64, i64) ~16MB plus hash table overhead. + let runtime = RuntimeEnvBuilder::new() + .with_memory_pool(Arc::new(FairSpillPool::new(MEMORY_LIMIT))) + .build_arc() + .unwrap(); + let config = SessionConfig::new().with_target_partitions(1); + let ctx = SessionContext::new_with_config_rt(config, runtime); + + // Create tables before starting the profiler + ctx.sql( + "CREATE TABLE t1 AS \ + SELECT v AS id, v * 2 AS val \ + FROM generate_series(1, 1000000) AS t(v)", + ) + .await + .unwrap(); + + ctx.sql( + "CREATE TABLE t2 AS \ + SELECT v AS id, v * 3 AS val \ + FROM generate_series(1, 1000000) AS t(v)", + ) + .await + .unwrap(); + + // Verify HashJoin is used + let explain = ctx + .sql("EXPLAIN SELECT t1.id, t1.val, t2.val FROM t1 JOIN t2 ON t1.id = t2.id") + .await + .unwrap() + .collect() + .await + .unwrap(); + let plan_str = format!("{explain:?}"); + assert!( + plan_str.contains("HashJoinExec"), + "Expected HashJoinExec in plan but got: {plan_str}" + ); + + // Start profiling after table creation + let _profiler = dhat::Profiler::builder().testing().build(); Review Comment: Here you start the profiling after the setup but in many of the other IT tests this is done before the setup -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
