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

fix: clone data instead of moving it - homemade future is dangerous #3542

Merged
merged 2 commits into from
Mar 19, 2024
Merged

fix: clone data instead of moving it - homemade future is dangerous #3542

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257fdb8
fix: clone data instead of moving it - homemade future is dangerous
waynexia Mar 19, 2024
cf13f78
add comment
waynexia Mar 19, 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
9 changes: 6 additions & 3 deletions src/promql/src/extension_plan/series_divide.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,18 +255,21 @@ impl Stream for SeriesDivideStream {

fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
loop {
if let Some(batch) = self.buffer.take() {
// It has to be cloned here, otherwise the later ready! will mess things up
if let Some(batch) = self.buffer.clone() {
waynexia marked this conversation as resolved.
Show resolved Hide resolved
let same_length = self.find_first_diff_row(&batch) + 1;
if same_length >= batch.num_rows() {
let next_batch = match ready!(self.as_mut().fetch_next_batch(cx)) {
waynexia marked this conversation as resolved.
Show resolved Hide resolved
Some(Ok(next_batch)) => next_batch,
Some(Ok(batch)) => batch,
None => {
self.buffer = None;
self.num_series += 1;
return Poll::Ready(Some(Ok(batch)));
}
error => return Poll::Ready(error),
};
let new_batch = compute::concat_batches(&batch.schema(), &[batch, next_batch])?;
let new_batch =
compute::concat_batches(&batch.schema(), &[batch.clone(), next_batch])?;
self.buffer = Some(new_batch);
continue;
} else {
Expand Down