fix

Author: forsaken628

src/query/expression/src/aggregate/aggregate_function.rs

@@ -166,9 +166,4 @@ pub trait AggregateFunction: fmt::Display + Sync + Send {
     fn get_if_condition(&self, _columns: ProjectedBlock) -> Option<Bitmap> {
         None
     }
-
-    // some features
-    fn convert_const_to_full(&self) -> bool {
-        true
-    }
 }

src/query/expression/src/aggregate/payload.rs

@@ -421,14 +421,13 @@ impl Payload {
         true
     }
 
-    pub fn empty_block(&self, fake_rows: Option<usize>) -> DataBlock {
-        let fake_rows = fake_rows.unwrap_or(0);
+    pub fn empty_block(&self, fake_rows: usize) -> DataBlock {
         assert_eq!(self.aggrs.is_empty(), self.states_layout.is_none());
         let entries = self
             .states_layout
             .as_ref()
             .iter()
-            .flat_map(|x| x.serialize_type.iter())
+            .flat_map(|layout| layout.serialize_type.iter())
             .map(|serde_type| {
                 ColumnBuilder::repeat_default(&serde_type.data_type(), fake_rows)
                     .build()

src/query/expression/src/aggregate/payload_flush.rs

@@ -125,7 +125,7 @@ impl Payload {
         }
 
         if blocks.is_empty() {
-            return Ok(self.empty_block(None));
+            return Ok(self.empty_block(0));
         }
         DataBlock::concat(&blocks)
     }
@@ -172,7 +172,7 @@ impl Payload {
         }
 
         if blocks.is_empty() {
-            return Ok(self.empty_block(None));
+            return Ok(self.empty_block(0));
         }
 
         DataBlock::concat(&blocks)

src/query/functions/src/aggregates/adaptors/aggregate_null_adaptor.rs

@@ -207,10 +207,6 @@ impl<const NULLABLE_RESULT: bool> AggregateFunction for AggregateNullUnaryAdapto
         self.0.drop_state(place);
     }
 
-    fn convert_const_to_full(&self) -> bool {
-        self.0.nested.convert_const_to_full()
-    }
-
     fn get_if_condition(&self, columns: ProjectedBlock) -> Option<Bitmap> {
         self.0.nested.get_if_condition(columns)
     }
@@ -332,10 +328,6 @@ impl<const NULLABLE_RESULT: bool> AggregateFunction
         self.0.drop_state(place);
     }
 
-    fn convert_const_to_full(&self) -> bool {
-        self.0.nested.convert_const_to_full()
-    }
-
     fn get_if_condition(&self, columns: ProjectedBlock) -> Option<Bitmap> {
         self.0.nested.get_if_condition(columns)
     }

src/query/functions/src/aggregates/adaptors/aggregate_ornull_adaptor.rs

@@ -237,10 +237,6 @@ impl AggregateFunction for AggregateFunctionOrNullAdaptor {
     unsafe fn drop_state(&self, place: AggrState) {
         self.inner.drop_state(place.remove_last_loc())
     }
-
-    fn convert_const_to_full(&self) -> bool {
-        self.inner.convert_const_to_full()
-    }
 }
 
 impl fmt::Display for AggregateFunctionOrNullAdaptor {

src/query/service/src/pipelines/executor/query_pipeline_executor.rs

@@ -33,7 +33,6 @@ use databend_common_pipeline_core::FinishedCallbackChain;
 use databend_common_pipeline_core::LockGuard;
 use databend_common_pipeline_core::Pipeline;
 use databend_common_pipeline_core::PlanProfile;
-use fastrace::func_path;
 use fastrace::prelude::*;
 use futures::future::select;
 use futures_util::future::Either;

src/query/service/src/pipelines/processors/transforms/aggregator/serde/transform_aggregate_serializer.rs

@@ -224,7 +224,7 @@ impl SerializeAggregateStream {
                 // always return at least one block
                 if self.nums == 0 {
                     self.nums += 1;
-                    let block = p.payload.empty_block(Some(1));
+                    let block = p.payload.empty_block(1);
                     Ok(Some(block.add_meta(Some(
                         AggregateSerdeMeta::create_agg_payload(
                             p.bucket,