From 71138993fd15d981b5e0e2cdb156f795dedb388b Mon Sep 17 00:00:00 2001 From: zhyass Date: Mon, 20 Jan 2025 11:44:11 +0800 Subject: [PATCH] fix --- .../transforms/transform_compact_builder.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/query/pipeline/transforms/src/processors/transforms/transform_compact_builder.rs b/src/query/pipeline/transforms/src/processors/transforms/transform_compact_builder.rs index 33d60a461d56e..7535814026138 100644 --- a/src/query/pipeline/transforms/src/processors/transforms/transform_compact_builder.rs +++ b/src/query/pipeline/transforms/src/processors/transforms/transform_compact_builder.rs @@ -16,6 +16,7 @@ use databend_common_exception::Result; use databend_common_expression::BlockThresholds; use databend_common_expression::Column; use databend_common_expression::DataBlock; +use databend_common_expression::Scalar; use databend_common_expression::Value; use databend_common_pipeline_core::Pipeline; @@ -120,13 +121,10 @@ pub(crate) fn memory_size(data_block: &DataBlock) -> usize { data_block .columns() .iter() - .map(|entry| { - if let Value::Column(Column::Nullable(col)) = &entry.value { - if col.validity.true_count() == 0 { - return num_rows; - } - } - entry.memory_size() + .map(|entry| match &entry.value { + Value::Column(Column::Nullable(col)) if col.validity.true_count() == 0 => num_rows, + Value::Scalar(Scalar::Null) => num_rows, + _ => entry.memory_size(), }) .sum() }