Use usize for SparseVector dim and indices

Author: ankane

src/diesel_ext/sparsevec.rs

@@ -16,12 +16,12 @@ impl ToSql<SparseVectorType, Pg> for SparseVector {
     fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
         let dim = self.dim;
         let nnz = self.indices.len();
-        out.write_all(&dim.to_be_bytes())?;
+        out.write_all(&i32::try_from(dim)?.to_be_bytes())?;
         out.write_all(&i32::try_from(nnz)?.to_be_bytes())?;
         out.write_all(&0_i32.to_be_bytes())?;
 
         for v in &self.indices {
-            out.write_all(&v.to_be_bytes())?;
+            out.write_all(&i32::try_from(*v)?.to_be_bytes())?;
         }
 
         for v in &self.values {

src/postgres_ext/sparsevec.rs

@@ -19,12 +19,12 @@ impl ToSql for SparseVector {
     fn to_sql(&self, _ty: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
         let dim = self.dim;
         let nnz = self.indices.len();
-        w.put_i32(dim);
+        w.put_i32(dim.try_into()?);
         w.put_i32(nnz.try_into()?);
         w.put_i32(0);
 
         for v in &self.indices {
-            w.put_i32(*v);
+            w.put_i32((*v).try_into()?);
         }
 
         for v in &self.values {

src/sparsevec.rs

@@ -9,21 +9,21 @@ use diesel::{deserialize::FromSqlRow, expression::AsExpression};
 #[cfg_attr(feature = "diesel", derive(FromSqlRow, AsExpression))]
 #[cfg_attr(feature = "diesel", diesel(sql_type = SparseVectorType))]
 pub struct SparseVector {
-    pub(crate) dim: i32,
-    pub(crate) indices: Vec<i32>,
+    pub(crate) dim: usize,
+    pub(crate) indices: Vec<usize>,
     pub(crate) values: Vec<f32>,
 }
 
 impl SparseVector {
     /// Creates a sparse vector from a dense vector.
     pub fn from_dense(vec: &[f32]) -> SparseVector {
-        let dim: i32 = vec.len().try_into().unwrap();
+        let dim = vec.len();
         let mut indices = Vec::new();
         let mut values = Vec::new();
 
         for (i, v) in vec.iter().enumerate() {
             if *v != 0.0 {
-                indices.push(i.try_into().unwrap());
+                indices.push(i);
                 values.push(*v);
             }
         }
@@ -36,13 +36,13 @@ impl SparseVector {
     }
 
     /// Creates a sparse vector from a map of non-zero elements.
-    pub fn from_map<'a, I: IntoIterator<Item = (&'a i32, &'a f32)>>(
+    pub fn from_map<'a, I: IntoIterator<Item = (&'a usize, &'a f32)>>(
         map: I,
-        dim: i32,
+        dim: usize,
     ) -> SparseVector {
-        let mut elements: Vec<(&i32, &f32)> = map.into_iter().filter(|v| *v.1 != 0.0).collect();
+        let mut elements: Vec<(&usize, &f32)> = map.into_iter().filter(|v| *v.1 != 0.0).collect();
         elements.sort_by_key(|v| *v.0);
-        let indices: Vec<i32> = elements.iter().map(|v| *v.0).collect();
+        let indices: Vec<usize> = elements.iter().map(|v| *v.0).collect();
         let values: Vec<f32> = elements.iter().map(|v| *v.1).collect();
 
         SparseVector {
@@ -53,12 +53,12 @@ impl SparseVector {
     }
 
     /// Returns the number of dimensions.
-    pub fn dimensions(&self) -> i32 {
+    pub fn dimensions(&self) -> usize {
         self.dim
     }
 
     /// Returns the non-zero indices.
-    pub fn indices(&self) -> &[i32] {
+    pub fn indices(&self) -> &[usize] {
         &self.indices
     }
 
@@ -69,9 +69,9 @@ impl SparseVector {
 
     /// Returns the sparse vector as a `Vec<f32>`.
     pub fn to_vec(&self) -> Vec<f32> {
-        let mut vec = vec![0.0; self.dim.try_into().unwrap()];
+        let mut vec = vec![0.0; self.dim];
         for (i, v) in self.indices.iter().zip(&self.values) {
-            vec[usize::try_from(*i).unwrap()] = *v;
+            vec[*i] = *v;
         }
         vec
     }
@@ -80,7 +80,7 @@ impl SparseVector {
     pub(crate) fn from_sql(
         buf: &[u8],
     ) -> Result<SparseVector, Box<dyn std::error::Error + Sync + Send>> {
-        let dim = i32::from_be_bytes(buf[0..4].try_into()?);
+        let dim = i32::from_be_bytes(buf[0..4].try_into()?).try_into()?;
         let nnz = i32::from_be_bytes(buf[4..8].try_into()?).try_into()?;
         let unused = i32::from_be_bytes(buf[8..12].try_into()?);
         if unused != 0 {
@@ -90,7 +90,7 @@ impl SparseVector {
         let mut indices = Vec::with_capacity(nnz);
         for i in 0..nnz {
             let s = 12 + 4 * i;
-            indices.push(i32::from_be_bytes(buf[s..s + 4].try_into()?));
+            indices.push(i32::from_be_bytes(buf[s..s + 4].try_into()?).try_into()?);
         }
 
         let mut values = Vec::with_capacity(nnz);

src/sqlx_ext/sparsevec.rs

@@ -16,12 +16,12 @@ impl Encode<'_, Postgres> for SparseVector {
     fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> Result<IsNull, BoxDynError> {
         let dim = self.dim;
         let nnz = self.indices.len();
-        buf.extend(dim.to_be_bytes());
+        buf.extend(&i32::try_from(dim)?.to_be_bytes());
         buf.extend(&i32::try_from(nnz)?.to_be_bytes());
         buf.extend(&0_i32.to_be_bytes());
 
         for v in &self.indices {
-            buf.extend(&v.to_be_bytes());
+            buf.extend(&i32::try_from(*v)?.to_be_bytes());
         }
 
         for v in &self.values {