From 709ccd3e31e1d46176980f7fdcb5f80e7872ae1a Mon Sep 17 00:00:00 2001 From: discord9 Date: Mon, 22 Dec 2025 18:39:14 +0800 Subject: [PATCH] c Signed-off-by: discord9 --- src/query/src/part_sort.rs | 49 ++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/src/query/src/part_sort.rs b/src/query/src/part_sort.rs index 34063b47d9..e89f801a6a 100644 --- a/src/query/src/part_sort.rs +++ b/src/query/src/part_sort.rs @@ -1282,33 +1282,30 @@ mod test { .unwrap(), ) } - } else { - if chain_windowed_sort { - // if chain_windowed_sort is true, we expect a single output batch sorted across all ranges - let mut sorted = output_data.into_iter().flatten().collect_vec(); - if descending { - sorted.sort_by(|a, b| b.cmp(a)); - } else { - sorted.sort(); - } - - Some( - DfRecordBatch::try_new(schema.clone(), vec![new_ts_array(unit, sorted)]) - .unwrap(), - ) + } else if chain_windowed_sort { + // if chain_windowed_sort is true, we expect a single output batch sorted across all ranges + let mut sorted = output_data.into_iter().flatten().collect_vec(); + if descending { + sorted.sort_by(|a, b| b.cmp(a)); } else { - let batches = output_data - .into_iter() - .map(|a| { - DfRecordBatch::try_new(schema.clone(), vec![new_ts_array(unit, a)]) - .unwrap() - }) - .collect_vec(); - if batches.is_empty() { - None - } else { - Some(concat_batches(&schema, &batches).unwrap()) - } + sorted.sort(); + } + + Some( + DfRecordBatch::try_new(schema.clone(), vec![new_ts_array(unit, sorted)]) + .unwrap(), + ) + } else { + let batches = output_data + .into_iter() + .map(|a| { + DfRecordBatch::try_new(schema.clone(), vec![new_ts_array(unit, a)]).unwrap() + }) + .collect_vec(); + if batches.is_empty() { + None + } else { + Some(concat_batches(&schema, &batches).unwrap()) } };