fix: block_entry.memory_size (#16230)

* fix block_entry.memory_size Signed-off-by: coldWater <[email protected]> * fix Signed-off-by: coldWater <[email protected]> * fix Signed-off-by: coldWater <[email protected]> * refine Signed-off-by: coldWater <[email protected]> --------- Signed-off-by: coldWater <[email protected]>
databendlabs · Aug 12, 2024 · 8467049 · 8467049
1 parent 493af79
commit 8467049
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/src/query/expression/src/block.rs b/src/query/expression/src/block.rs
@@ -586,7 +586,7 @@ impl TryFrom<DataBlock> for ArrowChunk<ArrayRef> {
 impl BlockEntry {
     pub fn memory_size(&self) -> usize {
         match &self.value {
-            Value::Scalar(s) => std::mem::size_of_val(s),
+            Value::Scalar(s) => s.as_ref().memory_size(),
             Value::Column(c) => c.memory_size(),
         }
     }

diff --git a/src/query/expression/tests/it/block.rs b/src/query/expression/tests/it/block.rs
@@ -1,12 +1,17 @@
 use databend_common_expression::block_debug::box_render;
+use databend_common_expression::types::number::NumberScalar;
 use databend_common_expression::types::string::StringColumnBuilder;
+use databend_common_expression::types::AnyType;
 use databend_common_expression::types::DataType;
 use databend_common_expression::types::Int32Type;
 use databend_common_expression::types::NumberDataType;
+use databend_common_expression::BlockEntry;
 use databend_common_expression::Column;
 use databend_common_expression::DataField;
 use databend_common_expression::DataSchemaRefExt;
 use databend_common_expression::FromData;
+use databend_common_expression::Scalar;
+use databend_common_expression::Value;
 
 use crate::common::new_block;
 
@@ -56,3 +61,18 @@ fn test_box_render_block() {
 └────────────────────┘"#;
     assert_eq!(d, expected);
 }
+
+#[test]
+fn test_block_entry_memory_size() {
+    let scalar_u8 = Scalar::Number(NumberScalar::UInt8(1));
+
+    let entry = BlockEntry::new(
+        DataType::Number(NumberDataType::UInt8),
+        Value::<AnyType>::Scalar(scalar_u8),
+    );
+    assert_eq!(1, entry.memory_size());
+
+    let scalar_str = Scalar::String("abc".to_string());
+    let entry = BlockEntry::new(DataType::String, Value::<AnyType>::Scalar(scalar_str));
+    assert_eq!(3, entry.memory_size());
+}
diff --git a/tests/sqllogictests/suites/stage/formats/parquet/options/parquet_missing_uuid.test b/tests/sqllogictests/suites/stage/formats/parquet/options/parquet_missing_uuid.test
@@ -10,7 +10,7 @@ remove @data/parquet/unload/uuid
 query
 copy into @data/parquet/unload/uuid/ from (select 1 as a)  file_format = (type = parquet)
 ----
-1 64 377
+1 1 377
 
 query error column id doesn't exist
 copy into t_uuid from @data/parquet/unload/uuid file_format = (type = parquet) RETURN_FAILED_ONLY=TRUE
@@ -22,7 +22,7 @@ select * from t_uuid
 query
 copy into @data/parquet/unload/uuid/ from (select 1 as a)  file_format = (type = parquet)
 ----
-1 64 377
+1 1 377
 
 statement ok
 truncate table t_uuid

diff --git a/tests/suites/0_stateless/05_hints/05_0001_set_var.result b/tests/suites/0_stateless/05_hints/05_0001_set_var.result
@@ -22,5 +22,5 @@ Asia/Shanghai
 America/Toronto
 2022-02-02 03:00:00
 2022-02-01 14:00:00
-1	64	415
+1	13	415
 Asia/Shanghai
diff --git a/tests/suites/0_stateless/18_rbac/18_0007_privilege_access.result b/tests/suites/0_stateless/18_rbac/18_0007_privilege_access.result
@@ -87,7 +87,7 @@ Error: APIError: ResponseError with 1063: Permission denied: privilege READ is r
 Error: APIError: ResponseError with 1063: Permission denied: No privilege on database root_db for user b.
 Error: APIError: ResponseError with 1063: Permission denied: No privilege on table root_table for user b.
 Error: APIError: ResponseError with 1063: Permission denied: No privilege on table root_table for user b.
-1	64	377
+1	1	377
 Error: APIError: ResponseError with 1063: Permission denied: privilege [Select] is required on 'default'.'default'.'t1' for user 'b'@'%' with roles [public]
 Error: APIError: ResponseError with 1063: Permission denied: privilege [Read] is required on STAGE s3 for user 'b'@'%' with roles [public]. Note: Please ensure that your current role have the appropriate permissions to create a new Database|Table|UDF|Stage.
 Error: APIError: ResponseError with 1063: Permission denied: privilege [Select] is required on 'default'.'default'.'t' for user 'b'@'%' with roles [public]

diff --git a/tests/suites/1_stateful/00_stage/00_0012_stage_priv.result b/tests/suites/1_stateful/00_stage/00_0012_stage_priv.result
@@ -17,7 +17,7 @@ Error: APIError: ResponseError with 1063: Permission denied: privilege [Write] i
 Error: APIError: ResponseError with 1063: Permission denied: privilege [Read] is required on STAGE presign_stage for user 'u1'@'%' with roles [public]. Note: Please ensure that your current role have the appropriate permissions to create a new Database|Table|UDF|Stage.
 000
 Error: APIError: ResponseError with 1063: Permission denied: privilege [Write] is required on STAGE s3 for user 'u1'@'%' with roles [public]. Note: Please ensure that your current role have the appropriate permissions to create a new Database|Table|UDF|Stage.
-1	64	377
+1	1	377
 Error: APIError: ResponseError with 1063: Permission denied: privilege [Read] is required on STAGE s3 for user 'u1'@'%' with roles [public]. Note: Please ensure that your current role have the appropriate permissions to create a new Database|Table|UDF|Stage.
 Error: APIError: ResponseError with 1063: Permission denied: privilege READ is required on stage s3 for user 'u1'@'%'
 Error: APIError: ResponseError with 1063: Permission denied: privilege READ is required on stage s3 for user 'u1'@'%'

diff --git a/tests/suites/1_stateful/07_stage_attachment/07_0000_insert_with_stage.result b/tests/suites/1_stateful/07_stage_attachment/07_0000_insert_with_stage.result
@@ -1,7 +1,7 @@
 sample.csv
 Succeeded
 96
-227
+168
 null
 1	'Beijing'	100	China
 2	'Shanghai'	80	China

diff --git a/tests/suites/1_stateful/07_stage_attachment/07_0001_replace_with_stage.result b/tests/suites/1_stateful/07_stage_attachment/07_0001_replace_with_stage.result
@@ -1,6 +1,6 @@
 sample.csv
 96
-227
+168
 null
 1	'Beijing'	100	China
 2	'Shanghai'	80	China

diff --git a/tests/suites/1_stateful/07_stage_attachment/07_0002_insert_with_stage_deduplicate.result b/tests/suites/1_stateful/07_stage_attachment/07_0002_insert_with_stage_deduplicate.result
@@ -1,6 +1,6 @@
 sample.csv
 96
-227
+168
 null
 1	'Beijing'	100	China
 2	'Shanghai'	80	China