Apache DataFusion SQL Query Engine
fix: Remove nested async block causing Stacked Borrows violation in PushDecoderStreamState (#21663)
Matt Butrovich8b47f45ad216
diff --git a/datafusion/datasource-parquet/src/opener.rs b/datafusion/datasource-parquet/src/opener.rsindex 6d1c22c0b0..72549d5b87 100644--- a/datafusion/datasource-parquet/src/opener.rs+++ b/datafusion/datasource-parquet/src/opener.rs@@ -75,7 +75,6 @@ use parquet::arrow::parquet_column;use parquet::arrow::push_decoder::{ParquetPushDecoder, ParquetPushDecoderBuilder};use parquet::basic::Type;use parquet::bloom_filter::Sbbf;-use parquet::errors::ParquetError;use parquet::file::metadata::{PageIndexPolicy, ParquetMetaDataReader};/// Stateless Parquet morselizer implementation.@@ -1253,13 +1252,23 @@ impl PushDecoderStreamState {loop {match self.decoder.try_decode() {Ok(DecodeResult::NeedsData(ranges)) => {- let fetch = async {- let data = self.reader.get_byte_ranges(ranges.clone()).await?;- self.decoder.push_ranges(ranges, data)?;- Ok::<_, ParquetError>(())- };- if let Err(e) = fetch.await {- return Some(Err(DataFusionError::from(e)));+ // IO (get_byte_ranges) and CPU (push_ranges) are still+ // decoupled — they just can't live in a nested async block+ // because that captures `&mut self` as one opaque borrow,+ // which violates Stacked Borrows across the yield point.+ // Inlining lets the compiler split the disjoint field borrows.+ let data = self+ .reader+ .get_byte_ranges(ranges.clone())+ .await+ .map_err(DataFusionError::from);+ match data {+ Ok(data) => {+ if let Err(e) = self.decoder.push_ranges(ranges, data) {+ return Some(Err(DataFusionError::from(e)));+ }+ }+ Err(e) => return Some(Err(e)),}}Ok(DecodeResult::Data(batch)) => {