Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions datafusion/expr/src/logical_plan/plan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2543,16 +2543,22 @@ impl Window {
)
}

/// Create a new window function using the provided schema to avoid the overhead of
/// building the schema again when the schema is already known.
///
/// This method should only be called when you are absolutely sure that the schema being
/// provided is correct for the window function. If in doubt, call [try_new](Self::try_new) instead.
Comment on lines +2546 to +2550
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I reuse the docs from Aggregate::try_new_with_schema

/// Create a new aggregate operator using the provided schema to avoid the overhead of
/// building the schema again when the schema is already known.
///
/// This method should only be called when you are absolutely sure that the schema being
/// provided is correct for the aggregate. If in doubt, call [try_new](Self::try_new) instead.
pub fn try_new_with_schema(

pub fn try_new_with_schema(
window_expr: Vec<Expr>,
input: Arc<LogicalPlan>,
schema: DFSchemaRef,
) -> Result<Self> {
if window_expr.len() != schema.fields().len() - input.schema().fields().len() {
let input_fields_count = input.schema().fields().len();
if schema.fields().len() != input_fields_count + window_expr.len() {
return plan_err!(
"Window has mismatch between number of expressions ({}) and number of fields in schema ({})",
window_expr.len(),
schema.fields().len() - input.schema().fields().len()
"Window schema has wrong number of fields. Expected {} got {}",
input_fields_count + window_expr.len(),
schema.fields().len()
Comment on lines -2551 to +2561
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I follow the error message from Aggregate::try_new_with_schema.

let group_expr_count = grouping_set_expr_count(&group_expr)?;
if schema.fields().len() != group_expr_count + aggr_expr.len() {
return plan_err!(
"Aggregate schema has wrong number of fields. Expected {} got {}",
group_expr_count + aggr_expr.len(),
schema.fields().len()
);
}

);
}

Expand Down