Skip to content

Commit 889a097

Browse files
ankaneankane
committed
Renamed structs
1 parent 082f3eb commit 889a097

File tree

9 files changed

+120
-120
lines changed

9 files changed

+120
-120
lines changed

‎src/diesel_ext/halfvec.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use diesel::sql_types::SqlType;
66
use std::convert::TryFrom;
77
use std::io::Write;
88

9-
use crate::HalfVec;
9+
use crate::HalfVector;
1010

1111
#[derive(SqlType, QueryId)]
1212
#[diesel(postgres_type(name = "halfvec"))]
13-
pub struct HalfVecType;
13+
pub struct HalfVectorType;
1414

15-
impl ToSql<HalfVecType, Pg> for HalfVec {
15+
impl ToSql<HalfVectorType, Pg> for HalfVector {
1616
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
1717
let dim = self.0.len();
1818
out.write_all(&u16::try_from(dim)?.to_be_bytes())?;
@@ -26,15 +26,15 @@ impl ToSql<HalfVecType, Pg> for HalfVec {
2626
}
2727
}
2828

29-
impl FromSql<HalfVecType, Pg> for HalfVec {
29+
impl FromSql<HalfVectorType, Pg> for HalfVector {
3030
fn from_sql(value: PgValue<'_>) -> deserialize::Result<Self> {
31-
HalfVec::from_sql(value.as_bytes())
31+
HalfVector::from_sql(value.as_bytes())
3232
}
3333
}
3434

3535
#[cfg(test)]
3636
mod tests {
37-
use crate::{HalfVec, VectorExpressionMethods};
37+
use crate::{HalfVector, VectorExpressionMethods};
3838
use diesel::pg::PgConnection;
3939
use diesel::{Connection, QueryDsl, RunQueryDsl};
4040
use half::f16;
@@ -44,7 +44,7 @@ mod tests {
4444

4545
diesel_half_items (id) {
4646
id -> Int4,
47-
embedding -> Nullable<crate::sql_types::HalfVec>,
47+
embedding -> Nullable<crate::sql_types::HalfVector>,
4848
}
4949
}
5050

@@ -54,13 +54,13 @@ mod tests {
5454
#[diesel(table_name = items)]
5555
struct Item {
5656
pub id: i32,
57-
pub embedding: Option<HalfVec>,
57+
pub embedding: Option<HalfVector>,
5858
}
5959

6060
#[derive(Insertable)]
6161
#[diesel(table_name = items)]
6262
struct NewItem {
63-
pub embedding: Option<HalfVec>,
63+
pub embedding: Option<HalfVector>,
6464
}
6565

6666
#[test]
@@ -75,21 +75,21 @@ mod tests {
7575

7676
let new_items = vec![
7777
NewItem {
78-
embedding: Some(HalfVec::from(vec![
78+
embedding: Some(HalfVector::from(vec![
7979
f16::from_f32(1.0),
8080
f16::from_f32(1.0),
8181
f16::from_f32(1.0),
8282
])),
8383
},
8484
NewItem {
85-
embedding: Some(HalfVec::from(vec![
85+
embedding: Some(HalfVector::from(vec![
8686
f16::from_f32(2.0),
8787
f16::from_f32(2.0),
8888
f16::from_f32(2.0),
8989
])),
9090
},
9191
NewItem {
92-
embedding: Some(HalfVec::from(vec![
92+
embedding: Some(HalfVector::from(vec![
9393
f16::from_f32(1.0),
9494
f16::from_f32(1.0),
9595
f16::from_f32(2.0),
@@ -106,7 +106,7 @@ mod tests {
106106
assert_eq!(4, all.len());
107107

108108
let neighbors = items::table
109-
.order(items::embedding.l2_distance(HalfVec::from(vec![
109+
.order(items::embedding.l2_distance(HalfVector::from(vec![
110110
f16::from_f32(1.0),
111111
f16::from_f32(1.0),
112112
f16::from_f32(1.0),
@@ -118,7 +118,7 @@ mod tests {
118118
neighbors.iter().map(|v| v.id).collect::<Vec<i32>>()
119119
);
120120
assert_eq!(
121-
Some(HalfVec::from(vec![
121+
Some(HalfVector::from(vec![
122122
f16::from_f32(1.0),
123123
f16::from_f32(1.0),
124124
f16::from_f32(1.0)
@@ -127,7 +127,7 @@ mod tests {
127127
);
128128

129129
let neighbors = items::table
130-
.order(items::embedding.max_inner_product(HalfVec::from(vec![
130+
.order(items::embedding.max_inner_product(HalfVector::from(vec![
131131
f16::from_f32(1.0),
132132
f16::from_f32(1.0),
133133
f16::from_f32(1.0),
@@ -140,7 +140,7 @@ mod tests {
140140
);
141141

142142
let neighbors = items::table
143-
.order(items::embedding.cosine_distance(HalfVec::from(vec![
143+
.order(items::embedding.cosine_distance(HalfVector::from(vec![
144144
f16::from_f32(1.0),
145145
f16::from_f32(1.0),
146146
f16::from_f32(1.0),
@@ -153,7 +153,7 @@ mod tests {
153153
);
154154

155155
let neighbors = items::table
156-
.order(items::embedding.l1_distance(HalfVec::from(vec![
156+
.order(items::embedding.l1_distance(HalfVector::from(vec![
157157
f16::from_f32(1.0),
158158
f16::from_f32(1.0),
159159
f16::from_f32(1.0),
@@ -166,7 +166,7 @@ mod tests {
166166
);
167167

168168
let distances = items::table
169-
.select(items::embedding.max_inner_product(HalfVec::from(vec![
169+
.select(items::embedding.max_inner_product(HalfVector::from(vec![
170170
f16::from_f32(1.0),
171171
f16::from_f32(1.0),
172172
f16::from_f32(1.0),

‎src/diesel_ext/sparsevec.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use diesel::sql_types::SqlType;
66
use std::convert::TryFrom;
77
use std::io::Write;
88

9-
use crate::SparseVec;
9+
use crate::SparseVector;
1010

1111
#[derive(SqlType, QueryId)]
1212
#[diesel(postgres_type(name = "sparsevec"))]
13-
pub struct SparseVecType;
13+
pub struct SparseVectorType;
1414

15-
impl ToSql<SparseVecType, Pg> for SparseVec {
15+
impl ToSql<SparseVectorType, Pg> for SparseVector {
1616
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
1717
let dim = self.dim;
1818
let nnz = self.indices.len();
@@ -32,15 +32,15 @@ impl ToSql<SparseVecType, Pg> for SparseVec {
3232
}
3333
}
3434

35-
impl FromSql<SparseVecType, Pg> for SparseVec {
35+
impl FromSql<SparseVectorType, Pg> for SparseVector {
3636
fn from_sql(value: PgValue<'_>) -> deserialize::Result<Self> {
37-
SparseVec::from_sql(value.as_bytes())
37+
SparseVector::from_sql(value.as_bytes())
3838
}
3939
}
4040

4141
#[cfg(test)]
4242
mod tests {
43-
use crate::{SparseVec, VectorExpressionMethods};
43+
use crate::{SparseVector, VectorExpressionMethods};
4444
use diesel::pg::PgConnection;
4545
use diesel::{Connection, QueryDsl, RunQueryDsl};
4646

@@ -49,7 +49,7 @@ mod tests {
4949

5050
diesel_sparse_items (id) {
5151
id -> Int4,
52-
embedding -> Nullable<crate::sql_types::SparseVec>,
52+
embedding -> Nullable<crate::sql_types::SparseVector>,
5353
}
5454
}
5555

@@ -59,13 +59,13 @@ mod tests {
5959
#[diesel(table_name = items)]
6060
struct Item {
6161
pub id: i32,
62-
pub embedding: Option<SparseVec>,
62+
pub embedding: Option<SparseVector>,
6363
}
6464

6565
#[derive(Insertable)]
6666
#[diesel(table_name = items)]
6767
struct NewItem {
68-
pub embedding: Option<SparseVec>,
68+
pub embedding: Option<SparseVector>,
6969
}
7070

7171
#[test]
@@ -80,13 +80,13 @@ mod tests {
8080

8181
let new_items = vec![
8282
NewItem {
83-
embedding: Some(SparseVec::from_dense(&[1.0, 1.0, 1.0])),
83+
embedding: Some(SparseVector::from_dense(&[1.0, 1.0, 1.0])),
8484
},
8585
NewItem {
86-
embedding: Some(SparseVec::from_dense(&[2.0, 2.0, 2.0])),
86+
embedding: Some(SparseVector::from_dense(&[2.0, 2.0, 2.0])),
8787
},
8888
NewItem {
89-
embedding: Some(SparseVec::from_dense(&[1.0, 1.0, 2.0])),
89+
embedding: Some(SparseVector::from_dense(&[1.0, 1.0, 2.0])),
9090
},
9191
NewItem { embedding: None },
9292
];
@@ -99,20 +99,20 @@ mod tests {
9999
assert_eq!(4, all.len());
100100

101101
let neighbors = items::table
102-
.order(items::embedding.l2_distance(SparseVec::from_dense(&[1.0, 1.0, 1.0])))
102+
.order(items::embedding.l2_distance(SparseVector::from_dense(&[1.0, 1.0, 1.0])))
103103
.limit(5)
104104
.load::<Item>(&mut conn)?;
105105
assert_eq!(
106106
vec![1, 3, 2, 4],
107107
neighbors.iter().map(|v| v.id).collect::<Vec<i32>>()
108108
);
109109
assert_eq!(
110-
Some(SparseVec::from_dense(&[1.0, 1.0, 1.0])),
110+
Some(SparseVector::from_dense(&[1.0, 1.0, 1.0])),
111111
neighbors.first().unwrap().embedding
112112
);
113113

114114
let neighbors = items::table
115-
.order(items::embedding.max_inner_product(SparseVec::from_dense(&[1.0, 1.0, 1.0])))
115+
.order(items::embedding.max_inner_product(SparseVector::from_dense(&[1.0, 1.0, 1.0])))
116116
.limit(5)
117117
.load::<Item>(&mut conn)?;
118118
assert_eq!(
@@ -121,7 +121,7 @@ mod tests {
121121
);
122122

123123
let neighbors = items::table
124-
.order(items::embedding.cosine_distance(SparseVec::from_dense(&[1.0, 1.0, 1.0])))
124+
.order(items::embedding.cosine_distance(SparseVector::from_dense(&[1.0, 1.0, 1.0])))
125125
.limit(5)
126126
.load::<Item>(&mut conn)?;
127127
assert_eq!(
@@ -130,7 +130,7 @@ mod tests {
130130
);
131131

132132
let neighbors = items::table
133-
.order(items::embedding.l1_distance(SparseVec::from_dense(&[1.0, 1.0, 1.0])))
133+
.order(items::embedding.l1_distance(SparseVector::from_dense(&[1.0, 1.0, 1.0])))
134134
.limit(5)
135135
.load::<Item>(&mut conn)?;
136136
assert_eq!(
@@ -139,7 +139,7 @@ mod tests {
139139
);
140140

141141
let distances = items::table
142-
.select(items::embedding.max_inner_product(SparseVec::from_dense(&[1.0, 1.0, 1.0])))
142+
.select(items::embedding.max_inner_product(SparseVector::from_dense(&[1.0, 1.0, 1.0])))
143143
.order(items::id)
144144
.load::<Option<f64>>(&mut conn)?;
145145
assert_eq!(vec![Some(-3.0), Some(-6.0), Some(-4.0), None], distances);

‎src/halfvec.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
use half::f16;
22

33
#[cfg(feature = "diesel")]
4-
use crate::diesel_ext::halfvec::HalfVecType;
4+
use crate::diesel_ext::halfvec::HalfVectorType;
55

66
#[cfg(feature = "diesel")]
77
use diesel::{deserialize::FromSqlRow, expression::AsExpression};
88

99
/// A half vector.
1010
#[derive(Clone, Debug, PartialEq)]
1111
#[cfg_attr(feature = "diesel", derive(FromSqlRow, AsExpression))]
12-
#[cfg_attr(feature = "diesel", diesel(sql_type = HalfVecType))]
13-
pub struct HalfVec(pub(crate) Vec<f16>);
12+
#[cfg_attr(feature = "diesel", diesel(sql_type = HalfVectorType))]
13+
pub struct HalfVector(pub(crate) Vec<f16>);
1414

15-
impl From<Vec<f16>> for HalfVec {
15+
impl From<Vec<f16>> for HalfVector {
1616
fn from(v: Vec<f16>) -> Self {
17-
HalfVec(v)
17+
HalfVector(v)
1818
}
1919
}
2020

21-
impl From<HalfVec> for Vec<f16> {
22-
fn from(val: HalfVec) -> Self {
21+
impl From<HalfVector> for Vec<f16> {
22+
fn from(val: HalfVector) -> Self {
2323
val.0
2424
}
2525
}
2626

27-
impl HalfVec {
27+
impl HalfVector {
2828
/// Returns a copy of the half vector as a `Vec<f16>`.
2929
pub fn to_vec(&self) -> Vec<f16> {
3030
self.0.clone()
@@ -38,7 +38,7 @@ impl HalfVec {
3838
#[cfg(any(feature = "postgres", feature = "sqlx", feature = "diesel"))]
3939
pub(crate) fn from_sql(
4040
buf: &[u8],
41-
) -> Result<HalfVec, Box<dyn std::error::Error + Sync + Send>> {
41+
) -> Result<HalfVector, Box<dyn std::error::Error + Sync + Send>> {
4242
let dim = u16::from_be_bytes(buf[0..2].try_into()?) as usize;
4343
let unused = u16::from_be_bytes(buf[2..4].try_into()?);
4444
if unused != 0 {
@@ -51,18 +51,18 @@ impl HalfVec {
5151
vec.push(f16::from_be_bytes(buf[s..s + 2].try_into()?));
5252
}
5353

54-
Ok(HalfVec(vec))
54+
Ok(HalfVector(vec))
5555
}
5656
}
5757

5858
#[cfg(test)]
5959
mod tests {
60-
use crate::HalfVec;
60+
use crate::HalfVector;
6161
use half::f16;
6262

6363
#[test]
6464
fn test_into() {
65-
let vec = HalfVec::from(vec![
65+
let vec = HalfVector::from(vec![
6666
f16::from_f32(1.0),
6767
f16::from_f32(2.0),
6868
f16::from_f32(3.0),
@@ -76,7 +76,7 @@ mod tests {
7676

7777
#[test]
7878
fn test_to_vec() {
79-
let vec = HalfVec::from(vec![
79+
let vec = HalfVector::from(vec![
8080
f16::from_f32(1.0),
8181
f16::from_f32(2.0),
8282
f16::from_f32(3.0),
@@ -89,7 +89,7 @@ mod tests {
8989

9090
#[test]
9191
fn test_as_slice() {
92-
let vec = HalfVec::from(vec![
92+
let vec = HalfVector::from(vec![
9393
f16::from_f32(1.0),
9494
f16::from_f32(2.0),
9595
f16::from_f32(3.0),

‎src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ mod sparsevec;
99
mod vector;
1010

1111
pub use bit::Bit;
12-
pub use sparsevec::SparseVec;
12+
pub use sparsevec::SparseVector;
1313
pub use vector::Vector;
1414

1515
#[cfg(feature = "halfvec")]
1616
mod halfvec;
1717

1818
#[cfg(feature = "halfvec")]
19-
pub use halfvec::HalfVec;
19+
pub use halfvec::HalfVector;
2020

2121
#[cfg(feature = "postgres")]
2222
mod postgres_ext;
@@ -30,11 +30,11 @@ mod diesel_ext;
3030
#[cfg(feature = "diesel")]
3131
pub mod sql_types {
3232
pub use super::diesel_ext::bit::BitType as Bit;
33-
pub use super::diesel_ext::sparsevec::SparseVecType as SparseVec;
33+
pub use super::diesel_ext::sparsevec::SparseVectorType as SparseVector;
3434
pub use super::diesel_ext::vector::VectorType as Vector;
3535

3636
#[cfg(feature = "halfvec")]
37-
pub use super::diesel_ext::halfvec::HalfVecType as HalfVec;
37+
pub use super::diesel_ext::halfvec::HalfVectorType as HalfVector;
3838
}
3939

4040
#[cfg(feature = "diesel")]

0 commit comments

Comments
 (0)