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]: Limit stream replace with slice #9303

Merged
merged 2 commits into from
Feb 22, 2024
Merged

[MINOR]: Limit stream replace with slice #9303

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0be310
Initial commit
mustafasrepo Feb 21, 2024
5abc754
Minor changes
mustafasrepo Feb 22, 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
25 changes: 7 additions & 18 deletions datafusion/physical-plan/src/limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ use crate::{
DisplayFormatType, Distribution, EquivalenceProperties, ExecutionPlan, Partitioning,
};

use arrow::array::ArrayRef;
use arrow::datatypes::SchemaRef;
use arrow::record_batch::{RecordBatch, RecordBatchOptions};
use arrow::record_batch::RecordBatch;
use datafusion_common::stats::Precision;
use datafusion_common::{internal_err, DataFusionError, Result};
use datafusion_execution::TaskContext;
Expand Down Expand Up @@ -507,26 +506,15 @@ impl LimitStream {
//
self.fetch -= batch.num_rows();
Some(batch)
} else {
} else if batch.num_rows() >= self.fetch {
let batch_rows = self.fetch;
self.fetch = 0;
self.input = None; // clear input so it can be dropped early

let limited_columns: Vec<ArrayRef> = batch
.columns()
.iter()
.map(|col| col.slice(0, col.len().min(batch_rows)))
.collect();
let options =
RecordBatchOptions::new().with_row_count(Option::from(batch_rows));
Some(
RecordBatch::try_new_with_options(
batch.schema(),
limited_columns,
&options,
)
.unwrap(),
)
// It is guaranteed that batch_rows is <= batch.num_rows
Some(batch.slice(0, batch_rows))
} else {
unreachable!()
}
}
}
Expand Down Expand Up @@ -575,6 +563,7 @@ mod tests {
use crate::{common, test};

use crate::aggregates::{AggregateExec, AggregateMode, PhysicalGroupBy};
use arrow_array::RecordBatchOptions;
use arrow_schema::Schema;
use datafusion_physical_expr::expressions::col;
use datafusion_physical_expr::PhysicalExpr;
Expand Down
Loading