fix

Author: forsaken628

src/query/functions/src/aggregates/aggregator_common.rs

@@ -29,6 +29,7 @@ use databend_common_expression::ColumnBuilder;
 use databend_common_expression::Constant;
 use databend_common_expression::FunctionContext;
 use databend_common_expression::Scalar;
+use databend_common_expression::ScalarRef;
 use databend_common_expression::StateAddr;
 
 use super::get_states_layout;
@@ -186,10 +187,20 @@ pub fn eval_aggr_for_test(
     let state = AggrState::new(eval.addr, &eval.state_layout.states_loc[0]);
     func.accumulate(state, entries.into(), None, rows)?;
     if with_serialize {
-        let mut buf = vec![];
-        func.serialize_binary(state, &mut buf)?;
+        let data_type = func.serialize_data_type();
+        let mut builder = ColumnBuilder::with_capacity(&data_type, 1);
+        let builders = builder.as_tuple_mut().unwrap().as_mut_slice();
+        func.serialize(state, builders)?;
         func.init_state(state);
-        func.merge_binary(state, &mut buf.as_slice())?;
+        let column = builder.build();
+        let data = column.index(0);
+        func.merge(
+            state,
+            data.as_ref()
+                .and_then(ScalarRef::as_tuple)
+                .unwrap()
+                .as_slice(),
+        )?;
     }
     let mut builder = ColumnBuilder::with_capacity(&data_type, 1024);
     func.merge_result(state, &mut builder)?;

src/query/storages/fuse/src/operations/analyze.rs

@@ -186,8 +186,8 @@ impl SinkAnalyzeState {
             let index: u32 = name.strip_prefix("ndv_").unwrap().parse().unwrap();
 
             let col = col.index(0).unwrap();
-            let col = col.as_binary().unwrap();
-            let hll: MetaHLL = borsh_deserialize_from_slice(col)?;
+            let data = col.as_tuple().unwrap()[0].as_binary().unwrap();
+            let hll: MetaHLL = borsh_deserialize_from_slice(data)?;
 
             if !is_full {
                 ndv_states

tests/sqllogictests/suites/query/functions/02_0000_function_aggregate_state.test

@@ -1,9 +1,9 @@
 query IT
-select length(max_state(number)), typeof(max_state(number)) from numbers(100);
+select length(max_state(number).1), typeof(max_state(number)) from numbers(100);
 ----
-10 BINARY
+9 TUPLE(BINARY, BOOLEAN)
 
-query I
-select length(sum_state(number)), typeof(max_state(number)) from numbers(10000);
+query IT
+select length(sum_state(number).1), typeof(max_state(number)) from numbers(10000);
 ----
-9 BINARY
+8 TUPLE(BINARY, BOOLEAN)