Skip to content

fix: we are missing the unlimited case for bounded streaming when usi… #14815

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
alamb merged 2 commits into from
Feb 22, 2025
Merged

fix: we are missing the unlimited case for bounded streaming when usi… #14815

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e44007
fix: we are missing the unlimited case for bounded streaming when usi…
zhuqi-lucas Feb 21, 2025
808f0d6
Address comments
zhuqi-lucas Feb 22, 2025
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
5 changes: 5 additions & 0 deletions datafusion-cli/src/exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,11 @@ pub(super) async fn exec_and_print(
reservation.try_grow(get_record_batch_memory_size(&batch))?;
results.push(batch);
}
} else if let MaxRows::Unlimited = print_options.maxrows {

@comphead comphead Feb 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

That is a good catch, wondering to avoid code duplication would it be better to

                let max_rows = match print_options.maxrows {
                    MaxRows::Unlimited => usize::MAX,
                    MaxRows::Limited(n) => n
                };

           while let Some(batch) = stream.next().await {
                let batch = batch?;
                let curr_num_rows = batch.num_rows();
                if row_count < max_rows + curr_num_rows {
                        // Try to grow the reservation to accommodate the batch in memory
                        reservation.try_grow(get_record_batch_memory_size(&batch))?;
                        results.push(batch);
                    }
                row_count += curr_num_rows;
            }

so we also remove unnecessary branch and literal evaulation every batch

@zhuqi-lucas zhuqi-lucas Feb 22, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thank you @comphead for review, this is a good suggestion, i have addressed in latest PR!

// Collect all results for unlimited maxrows
// Try to grow the reservation to accommodate the batch in memory
reservation.try_grow(get_record_batch_memory_size(&batch))?;
results.push(batch);
}
row_count += curr_num_rows;
}
Expand Down