fix

Author: youngsofun

src/common/column/tests/it/binview/mod.rs

@@ -153,11 +153,11 @@ fn test_slice() {
     let array: Utf8ViewColumn = data.into_iter().collect();
     assert_eq!(array.total_bytes_len(), 78);
     assert_eq!(array.total_buffer_len(), 60);
-    assert_eq!(array.memory_size(), 156);
+    assert_eq!(array.memory_size(), 198);
 
     let a0 = array.clone().sliced(0, 2);
     assert_eq!(a0.into_iter().collect::<Vec<_>>(), vec!["hello", "world",]);
-    assert_eq!(a0.memory_size(), 32);
+    assert_eq!(a0.memory_size(), 50);
     assert_eq!(a0.total_bytes_len(), 10);
 
     let a1 = array.clone().sliced(2, 3);
@@ -166,14 +166,14 @@ fn test_slice() {
         "yyyyyyyyyyyyyyyyyyyyy",
         "zzzzzzzzzzzzzzzzzzzzz",
     ]);
-    assert_eq!(a1.memory_size(), 90);
+    assert_eq!(a1.memory_size(), 110);
     assert_eq!(a1.total_bytes_len(), 50);
 
     let a2 = array.sliced(5, 1);
     assert_eq!(a2.into_iter().collect::<Vec<_>>(), vec![
         "abcabcabcabcabcabc",
     ]);
-    assert_eq!(a2.memory_size(), 34);
+    assert_eq!(a2.memory_size(), 38);
     assert_eq!(a2.total_bytes_len(), 18);
 }
 

src/query/expression/src/values.rs

@@ -892,7 +892,7 @@ impl ScalarRef<'_> {
             ScalarRef::Decimal(_) => n * self.memory_size(),
             ScalarRef::Boolean(_) => n.div_ceil(8),
             ScalarRef::Binary(s) => s.len() * n + (n + 1) * 8,
-            ScalarRef::String(s) => n * (20 + if s.len() > 12 { s.len() } else { 0 }),
+            ScalarRef::String(s) => n * (20 + s.len()),
             ScalarRef::Timestamp(_) => n * 8,
             ScalarRef::TimestampTz(_) => n * 16,
             ScalarRef::Date(_) => n * 4,

src/query/expression/tests/it/block.rs

@@ -90,7 +90,7 @@ fn test_block_entry_memory_size() {
     assert_eq!(3, entry.memory_size());
 
     let col = StringType::from_data((0..10).map(|x| x.to_string()).collect::<Vec<_>>());
-    assert_eq!(col.memory_size(), 10 * 16);
+    assert_eq!(col.memory_size(), 210);
 
     let array = ArrayColumn::<Int64Type>::new(
         Buffer::from_iter(0..10i64),