fix: do not leave uninitialized bytes in datatype input function

usamoi · usamoi · commit 0646a929bb47 · 2023-12-08T22:02:08.000+08:00
Signed-off-by: usamoi &lt;usamoi@outlook.com&gt;
diff --git a/src/datatype/casts_f32.rs b/src/datatype/casts_f32.rs
@@ -13,11 +13,11 @@ fn vecf32_cast_array_to_vector(
     assert!(!array.contains_nulls());
     let typmod = Typmod::parse_from_i32(typmod).unwrap();
     let len = typmod.dims().unwrap_or(array.len() as u16);
-    let mut data = Vecf32::new_zeroed_in_postgres(len as usize);
+    let mut data = vec![F32::zero(); len as usize];
     for (i, x) in array.iter().enumerate() {
         data[i] = F32(x.unwrap_or(f32::NAN));
     }
-    data
+    Vecf32::new_in_postgres(&data)
 }
 
 #[pgrx::pg_extern(immutable, parallel_safe, strict)]
diff --git a/src/datatype/operators_f16.rs b/src/datatype/operators_f16.rs
@@ -14,11 +14,11 @@ fn vecf16_operator_add(lhs: Vecf16Input<'_>, rhs: Vecf16Input<'_>) -> Vecf16Outp
         .friendly();
     }
     let n = lhs.len();
-    let mut v = Vecf16::new_zeroed(n);
+    let mut v = vec![F16::zero(); n];
     for i in 0..n {
         v[i] = lhs[i] + rhs[i];
     }
-    v.copy_into_postgres()
+    Vecf16::new_in_postgres(&v)
 }
 
 #[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf16"])]
@@ -32,11 +32,11 @@ fn vecf16_operator_minus(lhs: Vecf16Input<'_>, rhs: Vecf16Input<'_>) -> Vecf16Ou
         .friendly();
     }
     let n = lhs.len();
-    let mut v = Vecf16::new_zeroed(n);
+    let mut v = vec![F16::zero(); n];
     for i in 0..n {
         v[i] = lhs[i] - rhs[i];
     }
-    v.copy_into_postgres()
+    Vecf16::new_in_postgres(&v)
 }
 
 #[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf16"])]
diff --git a/src/datatype/operators_f32.rs b/src/datatype/operators_f32.rs
@@ -14,11 +14,11 @@ fn vecf32_operator_add(lhs: Vecf32Input<'_>, rhs: Vecf32Input<'_>) -> Vecf32Outp
         .friendly();
     }
     let n = lhs.len();
-    let mut v = Vecf32::new_zeroed(n);
+    let mut v = vec![F32::zero(); n];
     for i in 0..n {
         v[i] = lhs[i] + rhs[i];
     }
-    v.copy_into_postgres()
+    Vecf32::new_in_postgres(&v)
 }
 
 #[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf32"])]
@@ -32,11 +32,11 @@ fn vecf32_operator_minus(lhs: Vecf32Input<'_>, rhs: Vecf32Input<'_>) -> Vecf32Ou
         .friendly();
     }
     let n = lhs.len();
-    let mut v = Vecf32::new_zeroed(n);
+    let mut v = vec![F32::zero(); n];
     for i in 0..n {
         v[i] = lhs[i] - rhs[i];
     }
-    v.copy_into_postgres()
+    Vecf32::new_in_postgres(&v)
 }
 
 #[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf32"])]
diff --git a/src/datatype/vecf16.rs b/src/datatype/vecf16.rs
@@ -40,6 +40,7 @@ CREATE TYPE vecf16 (
 pub struct Vecf16 {
     varlena: u32,
     kind: u8,
+    pad: u8,
     len: u16,
     phantom: [F16; 0],
 }
@@ -55,53 +56,20 @@ impl Vecf16 {
         let layout = layout_alpha.extend(layout_beta).unwrap().0;
         layout.pad_to_align()
     }
-    pub fn new(slice: &[F16]) -> Box<Self> {
-        unsafe {
-            assert!(u16::try_from(slice.len()).is_ok());
-            let layout = Vecf16::layout(slice.len());
-            let ptr = std::alloc::alloc(layout) as *mut Vecf16;
-            std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf16::varlena(layout.size()));
-            std::ptr::addr_of_mut!((*ptr).kind).write(16);
-            std::ptr::addr_of_mut!((*ptr).len).write(slice.len() as u16);
-            std::ptr::copy_nonoverlapping(slice.as_ptr(), (*ptr).phantom.as_mut_ptr(), slice.len());
-            Box::from_raw(ptr)
-        }
-    }
     pub fn new_in_postgres(slice: &[F16]) -> Vecf16Output {
         unsafe {
             assert!(u16::try_from(slice.len()).is_ok());
             let layout = Vecf16::layout(slice.len());
             let ptr = pgrx::pg_sys::palloc(layout.size()) as *mut Vecf16;
+            ptr.cast::<u8>().add(layout.size() - 8).write_bytes(0, 8);
             std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf16::varlena(layout.size()));
             std::ptr::addr_of_mut!((*ptr).kind).write(16);
+            std::ptr::addr_of_mut!((*ptr).pad).write(0);
             std::ptr::addr_of_mut!((*ptr).len).write(slice.len() as u16);
             std::ptr::copy_nonoverlapping(slice.as_ptr(), (*ptr).phantom.as_mut_ptr(), slice.len());
             Vecf16Output(NonNull::new(ptr).unwrap())
         }
     }
-    pub fn new_zeroed(len: usize) -> Box<Self> {
-        unsafe {
-            assert!(u16::try_from(len).is_ok());
-            let layout = Vecf16::layout(len);
-            let ptr = std::alloc::alloc_zeroed(layout) as *mut Vecf16;
-            std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf16::varlena(layout.size()));
-            std::ptr::addr_of_mut!((*ptr).kind).write(16);
-            std::ptr::addr_of_mut!((*ptr).len).write(len as u16);
-            Box::from_raw(ptr)
-        }
-    }
-    #[allow(dead_code)]
-    pub fn new_zeroed_in_postgres(len: usize) -> Vecf16Output {
-        unsafe {
-            assert!(u64::try_from(len).is_ok());
-            let layout = Vecf16::layout(len);
-            let ptr = pgrx::pg_sys::palloc0(layout.size()) as *mut Vecf16;
-            std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf16::varlena(layout.size()));
-            std::ptr::addr_of_mut!((*ptr).kind).write(16);
-            std::ptr::addr_of_mut!((*ptr).len).write(len as u16);
-            Vecf16Output(NonNull::new(ptr).unwrap())
-        }
-    }
     pub fn len(&self) -> usize {
         self.len as usize
     }
@@ -115,13 +83,6 @@ impl Vecf16 {
         debug_assert_eq!(self.kind, 16);
         unsafe { std::slice::from_raw_parts_mut(self.phantom.as_mut_ptr(), self.len as usize) }
     }
-    #[allow(dead_code)]
-    pub fn copy(&self) -> Box<Vecf16> {
-        Vecf16::new(self.data())
-    }
-    pub fn copy_into_postgres(&self) -> Vecf16Output {
-        Vecf16::new_in_postgres(self.data())
-    }
 }
 
 impl Deref for Vecf16 {
diff --git a/src/datatype/vecf32.rs b/src/datatype/vecf32.rs
@@ -40,6 +40,7 @@ CREATE TYPE vector (
 pub struct Vecf32 {
     varlena: u32,
     kind: u8,
+    pad: u8,
     len: u16,
     phantom: [F32; 0],
 }
@@ -55,53 +56,20 @@ impl Vecf32 {
         let layout = layout_alpha.extend(layout_beta).unwrap().0;
         layout.pad_to_align()
     }
-    pub fn new(slice: &[F32]) -> Box<Self> {
-        unsafe {
-            assert!(u16::try_from(slice.len()).is_ok());
-            let layout = Vecf32::layout(slice.len());
-            let ptr = std::alloc::alloc(layout) as *mut Vecf32;
-            std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf32::varlena(layout.size()));
-            std::ptr::addr_of_mut!((*ptr).kind).write(32);
-            std::ptr::addr_of_mut!((*ptr).len).write(slice.len() as u16);
-            std::ptr::copy_nonoverlapping(slice.as_ptr(), (*ptr).phantom.as_mut_ptr(), slice.len());
-            Box::from_raw(ptr)
-        }
-    }
     pub fn new_in_postgres(slice: &[F32]) -> Vecf32Output {
         unsafe {
             assert!(u16::try_from(slice.len()).is_ok());
             let layout = Vecf32::layout(slice.len());
             let ptr = pgrx::pg_sys::palloc(layout.size()) as *mut Vecf32;
+            ptr.cast::<u8>().add(layout.size() - 8).write_bytes(0, 8);
             std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf32::varlena(layout.size()));
             std::ptr::addr_of_mut!((*ptr).kind).write(32);
+            std::ptr::addr_of_mut!((*ptr).pad).write(0);
             std::ptr::addr_of_mut!((*ptr).len).write(slice.len() as u16);
             std::ptr::copy_nonoverlapping(slice.as_ptr(), (*ptr).phantom.as_mut_ptr(), slice.len());
             Vecf32Output(NonNull::new(ptr).unwrap())
         }
     }
-    pub fn new_zeroed(len: usize) -> Box<Self> {
-        unsafe {
-            assert!(u16::try_from(len).is_ok());
-            let layout = Vecf32::layout(len);
-            let ptr = std::alloc::alloc_zeroed(layout) as *mut Vecf32;
-            std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf32::varlena(layout.size()));
-            std::ptr::addr_of_mut!((*ptr).kind).write(32);
-            std::ptr::addr_of_mut!((*ptr).len).write(len as u16);
-            Box::from_raw(ptr)
-        }
-    }
-    #[allow(dead_code)]
-    pub fn new_zeroed_in_postgres(len: usize) -> Vecf32Output {
-        unsafe {
-            assert!(u64::try_from(len).is_ok());
-            let layout = Vecf32::layout(len);
-            let ptr = pgrx::pg_sys::palloc0(layout.size()) as *mut Vecf32;
-            std::ptr::addr_of_mut!((*ptr).varlena).write(Vecf32::varlena(layout.size()));
-            std::ptr::addr_of_mut!((*ptr).kind).write(32);
-            std::ptr::addr_of_mut!((*ptr).len).write(len as u16);
-            Vecf32Output(NonNull::new(ptr).unwrap())
-        }
-    }
     pub fn len(&self) -> usize {
         self.len as usize
     }
@@ -115,13 +83,6 @@ impl Vecf32 {
         debug_assert_eq!(self.kind, 32);
         unsafe { std::slice::from_raw_parts_mut(self.phantom.as_mut_ptr(), self.len as usize) }
     }
-    #[allow(dead_code)]
-    pub fn copy(&self) -> Box<Vecf32> {
-        Vecf32::new(self.data())
-    }
-    pub fn copy_into_postgres(&self) -> Vecf32Output {
-        Vecf32::new_in_postgres(self.data())
-    }
 }
 
 impl Deref for Vecf32 {
diff --git a/src/index/utils.rs b/src/index/utils.rs
@@ -6,6 +6,7 @@ use service::prelude::DynamicVector;
 struct Header {
     varlena: u32,
     kind: u8,
+    pad: u8,
     len: u16,
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ fn vecf32_cast_array_to_vector(`
`13`	`13`	`assert!(!array.contains_nulls());`
`14`	`14`	`let typmod = Typmod::parse_from_i32(typmod).unwrap();`
`15`	`15`	`let len = typmod.dims().unwrap_or(array.len() as u16);`
`16`		`- let mut data = Vecf32::new_zeroed_in_postgres(len as usize);`
	`16`	`+ let mut data = vec![F32::zero(); len as usize];`
`17`	`17`	`for (i, x) in array.iter().enumerate() {`
`18`	`18`	`data[i] = F32(x.unwrap_or(f32::NAN));`
`19`	`19`	`}`
`20`		`- data`
	`20`	`+ Vecf32::new_in_postgres(&data)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`#[pgrx::pg_extern(immutable, parallel_safe, strict)]`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ fn vecf16_operator_add(lhs: Vecf16Input<'_>, rhs: Vecf16Input<'_>) -> Vecf16Outp`
`14`	`14`	`.friendly();`
`15`	`15`	`}`
`16`	`16`	`let n = lhs.len();`
`17`		`- let mut v = Vecf16::new_zeroed(n);`
	`17`	`+ let mut v = vec![F16::zero(); n];`
`18`	`18`	`for i in 0..n {`
`19`	`19`	`v[i] = lhs[i] + rhs[i];`
`20`	`20`	`}`
`21`		`- v.copy_into_postgres()`
	`21`	`+ Vecf16::new_in_postgres(&v)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`#[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf16"])]`
`@@ -32,11 +32,11 @@ fn vecf16_operator_minus(lhs: Vecf16Input<'_>, rhs: Vecf16Input<'_>) -> Vecf16Ou`
`32`	`32`	`.friendly();`
`33`	`33`	`}`
`34`	`34`	`let n = lhs.len();`
`35`		`- let mut v = Vecf16::new_zeroed(n);`
	`35`	`+ let mut v = vec![F16::zero(); n];`
`36`	`36`	`for i in 0..n {`
`37`	`37`	`v[i] = lhs[i] - rhs[i];`
`38`	`38`	`}`
`39`		`- v.copy_into_postgres()`
	`39`	`+ Vecf16::new_in_postgres(&v)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`#[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf16"])]`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ fn vecf32_operator_add(lhs: Vecf32Input<'_>, rhs: Vecf32Input<'_>) -> Vecf32Outp`
`14`	`14`	`.friendly();`
`15`	`15`	`}`
`16`	`16`	`let n = lhs.len();`
`17`		`- let mut v = Vecf32::new_zeroed(n);`
	`17`	`+ let mut v = vec![F32::zero(); n];`
`18`	`18`	`for i in 0..n {`
`19`	`19`	`v[i] = lhs[i] + rhs[i];`
`20`	`20`	`}`
`21`		`- v.copy_into_postgres()`
	`21`	`+ Vecf32::new_in_postgres(&v)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`#[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf32"])]`
`@@ -32,11 +32,11 @@ fn vecf32_operator_minus(lhs: Vecf32Input<'_>, rhs: Vecf32Input<'_>) -> Vecf32Ou`
`32`	`32`	`.friendly();`
`33`	`33`	`}`
`34`	`34`	`let n = lhs.len();`
`35`		`- let mut v = Vecf32::new_zeroed(n);`
	`35`	`+ let mut v = vec![F32::zero(); n];`
`36`	`36`	`for i in 0..n {`
`37`	`37`	`v[i] = lhs[i] - rhs[i];`
`38`	`38`	`}`
`39`		`- v.copy_into_postgres()`
	`39`	`+ Vecf32::new_in_postgres(&v)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`#[pgrx::pg_operator(immutable, parallel_safe, requires = ["vecf32"])]`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ use service::prelude::DynamicVector;`
`6`	`6`	`struct Header {`
`7`	`7`	`varlena: u32,`
`8`	`8`	`kind: u8,`
	`9`	`+ pad: u8,`
`9`	`10`	`len: u16,`
`10`	`11`	`}`
`11`	`12`