Skip to content

Commit

Permalink
fix(udf): fix wrong number of rows (risingwavelabs#9003)
Browse files Browse the repository at this point in the history
Signed-off-by: Runji Wang <[email protected]>
  • Loading branch information
wangrunji0408 authored Apr 5, 2023
1 parent db072cb commit ce25cf5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
16 changes: 11 additions & 5 deletions src/expr/src/expr/expr_udf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,21 @@ impl Expression for UdfExpression {
columns.push(array.as_ref().into());
}
let opts =
arrow_array::RecordBatchOptions::default().with_row_count(Some(input.cardinality()));
arrow_array::RecordBatchOptions::default().with_row_count(Some(input.capacity()));
let input =
arrow_array::RecordBatch::try_new_with_options(self.arg_schema.clone(), columns, &opts)
.expect("failed to build record batch");
let output = self.client.call(&self.identifier, input).await?;
let arrow_array = output
.columns()
.get(0)
.ok_or(risingwave_udf::Error::NoColumn)?;
if output.num_rows() != vis.len() {
bail!(
"UDF returned {} rows, but expected {}",
output.num_rows(),
vis.len(),
);
}
let Some(arrow_array) = output.columns().get(0) else {
bail!("UDF returned no columns");
};
let mut array = ArrayImpl::from(arrow_array);
array.set_bitmap(array.null_bitmap() & vis);
Ok(Arc::new(array))
Expand Down
2 changes: 0 additions & 2 deletions src/udf/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,6 @@ pub enum Error {
},
#[error("UDF service returned no data")]
NoReturned,
#[error("UDF service returned a batch with no column")]
NoColumn,
}

/// Check if two list of data types match, ignoring field names.
Expand Down

0 comments on commit ce25cf5

Please sign in to comment.