Skip to content

Add uuid type support in core engine. #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
badmonster0 merged 1 commit into from
Mar 25, 2025
Merged

Add uuid type support in core engine. #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ log = "0.4.26"
regex = "1.11.1"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
sqlx = { version = "0.8.3", features = ["chrono", "postgres", "runtime-tokio"] }
sqlx = { version = "0.8.3", features = ["chrono", "postgres", "runtime-tokio", "uuid"] }
tokio = { version = "1.44.1", features = [
"macros",
"rt-multi-thread",
Expand Down Expand Up @@ -89,3 +89,4 @@ rustls = { version = "0.23.25" }
http-body-util = "0.1.3"
yaml-rust2 = "0.10.0"
urlencoding = "2.1.3"
uuid = "1.16.0"
10 changes: 7 additions & 3 deletions src/base/json_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ impl ToJsonSchema for schema::BasicValueType {
schema::BasicValueType::Float32 | schema::BasicValueType::Float64 => {
schema.instance_type = Some(SingleOrVec::Single(Box::new(InstanceType::Number)));
}
schema::BasicValueType::Json => {
// Can be any value. No type constraint.
}
schema::BasicValueType::Range => {
schema.instance_type = Some(SingleOrVec::Single(Box::new(InstanceType::Array)));
schema.array = Some(Box::new(ArrayValidation {
Expand All @@ -51,6 +48,13 @@ impl ToJsonSchema for schema::BasicValueType {
.description =
Some("A range, start pos (inclusive), end pos (exclusive).".to_string());
}
schema::BasicValueType::Uuid => {
schema.instance_type = Some(SingleOrVec::Single(Box::new(InstanceType::String)));
schema.format = Some("uuid".to_string());
}
schema::BasicValueType::Json => {
// Can be any value. No type constraint.
}
schema::BasicValueType::Vector(s) => {
schema.instance_type = Some(SingleOrVec::Single(Box::new(InstanceType::Array)));
schema.array = Some(Box::new(ArrayValidation {
Expand Down
4 changes: 4 additions & 0 deletions src/base/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ pub enum BasicValueType {
/// A range, with a start offset and a length.
Range,

/// A UUID.
Uuid,

/// A JSON value.
Json,

Expand All @@ -52,6 +55,7 @@ impl std::fmt::Display for BasicValueType {
BasicValueType::Float32 => write!(f, "float32"),
BasicValueType::Float64 => write!(f, "float64"),
BasicValueType::Range => write!(f, "range"),
BasicValueType::Uuid => write!(f, "uuid"),
BasicValueType::Json => write!(f, "json"),
BasicValueType::Vector(s) => write!(
f,
Expand Down
11 changes: 11 additions & 0 deletions src/base/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use serde::{
Deserialize, Serialize,
};
use std::{collections::BTreeMap, ops::Deref, sync::Arc};
use uuid::Uuid;

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct RangeValue {
Expand Down Expand Up @@ -76,6 +77,7 @@ pub enum KeyValue {
Bool(bool),
Int64(i64),
Range(RangeValue),
Uuid(Uuid),
Struct(Vec<KeyValue>),
}

Expand Down Expand Up @@ -141,6 +143,7 @@ impl std::fmt::Display for KeyValue {
KeyValue::Bool(v) => write!(f, "{}", v),
KeyValue::Int64(v) => write!(f, "{}", v),
KeyValue::Range(v) => write!(f, "[{}, {})", v.start, v.end),
KeyValue::Uuid(v) => write!(f, "{}", v),
KeyValue::Struct(v) => {
write!(
f,
Expand Down Expand Up @@ -205,6 +208,7 @@ impl KeyValue {
output.push(v.start.to_string());
output.push(v.end.to_string());
}
KeyValue::Uuid(v) => output.push(v.to_string()),
KeyValue::Struct(v) => {
for part in v {
part.parts_to_strs(output);
Expand Down Expand Up @@ -235,6 +239,7 @@ impl KeyValue {
KeyValue::Bool(_) => "bool",
KeyValue::Int64(_) => "int64",
KeyValue::Range { .. } => "range",
KeyValue::Uuid(_) => "uuid",
KeyValue::Struct(_) => "struct",
}
}
Expand Down Expand Up @@ -299,6 +304,7 @@ pub enum BasicValue {
Float32(f32),
Float64(f64),
Range(RangeValue),
Uuid(Uuid),
Json(Arc<serde_json::Value>),
Vector(Arc<[BasicValue]>),
}
Expand Down Expand Up @@ -373,6 +379,7 @@ impl BasicValue {
BasicValue::Bool(v) => KeyValue::Bool(v),
BasicValue::Int64(v) => KeyValue::Int64(v),
BasicValue::Range(v) => KeyValue::Range(v),
BasicValue::Uuid(v) => KeyValue::Uuid(v),
BasicValue::Float32(_)
| BasicValue::Float64(_)
| BasicValue::Json(_)
Expand All @@ -388,6 +395,7 @@ impl BasicValue {
BasicValue::Bool(v) => KeyValue::Bool(*v),
BasicValue::Int64(v) => KeyValue::Int64(*v),
BasicValue::Range(v) => KeyValue::Range(*v),
BasicValue::Uuid(v) => KeyValue::Uuid(*v),
BasicValue::Float32(_)
| BasicValue::Float64(_)
| BasicValue::Json(_)
Expand All @@ -405,6 +413,7 @@ impl BasicValue {
BasicValue::Float32(_) => "float32",
BasicValue::Float64(_) => "float64",
BasicValue::Range(_) => "range",
BasicValue::Uuid(_) => "uuid",
BasicValue::Json(_) => "json",
BasicValue::Vector(_) => "vector",
}
Expand Down Expand Up @@ -436,6 +445,7 @@ impl From<KeyValue> for Value {
KeyValue::Bool(v) => Value::Basic(BasicValue::Bool(v)),
KeyValue::Int64(v) => Value::Basic(BasicValue::Int64(v)),
KeyValue::Range(v) => Value::Basic(BasicValue::Range(v)),
KeyValue::Uuid(v) => Value::Basic(BasicValue::Uuid(v)),
KeyValue::Struct(v) => Value::Struct(FieldValues {
fields: v.into_iter().map(Value::from).collect(),
}),
Expand Down Expand Up @@ -734,6 +744,7 @@ impl serde::Serialize for BasicValue {
BasicValue::Float32(v) => serializer.serialize_f32(*v),
BasicValue::Float64(v) => serializer.serialize_f64(*v),
BasicValue::Range(v) => v.serialize(serializer),
BasicValue::Uuid(v) => serializer.serialize_str(&v.to_string()),
BasicValue::Json(v) => v.serialize(serializer),
BasicValue::Vector(v) => v.serialize(serializer),
}
Expand Down
1 change: 1 addition & 0 deletions src/execution/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ impl SimpleSemanticsQueryHandler {
| value::BasicValue::Str(_)
| value::BasicValue::Bool(_)
| value::BasicValue::Range(_)
| value::BasicValue::Uuid(_)
| value::BasicValue::Json(_)
| value::BasicValue::Vector(_) => {
bail!("Query results is not a vector of number")
Expand Down
17 changes: 14 additions & 3 deletions src/ops/storages/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use serde::Serialize;
use sqlx::postgres::types::PgRange;
use sqlx::postgres::PgRow;
use sqlx::{PgPool, Row};
use uuid::Uuid;

#[derive(Debug, Deserialize)]
pub struct Spec {
Expand Down Expand Up @@ -78,6 +79,9 @@ fn bind_key_field<'arg>(
end: Bound::Excluded(v.end as i64),
});
}
KeyValue::Uuid(v) => {
builder.push_bind(v);
}
KeyValue::Struct(fields) => {
builder.push_bind(sqlx::types::Json(fields));
}
Expand Down Expand Up @@ -110,15 +114,18 @@ fn bind_value_field<'arg>(
BasicValue::Float64(v) => {
builder.push_bind(v);
}
BasicValue::Json(v) => {
builder.push_bind(sqlx::types::Json(&**v));
}
BasicValue::Range(v) => {
builder.push_bind(PgRange {
start: Bound::Included(v.start as i64),
end: Bound::Excluded(v.end as i64),
});
}
BasicValue::Uuid(v) => {
builder.push_bind(v);
}
BasicValue::Json(v) => {
builder.push_bind(sqlx::types::Json(&**v));
}
BasicValue::Vector(v) => match &field_schema.value_type.typ {
ValueType::Basic(BasicValueType::Vector(vs)) if convertible_to_pgvector(vs) => {
let vec = v
Expand Down Expand Up @@ -186,6 +193,9 @@ fn from_pg_value(row: &PgRow, field_idx: usize, typ: &ValueType) -> Result<Value
_ => anyhow::bail!("invalid range value"),
})
.transpose()?,
BasicValueType::Uuid => row
.try_get::<Option<Uuid>, _>(field_idx)?
.map(BasicValue::Uuid),
BasicValueType::Json => row
.try_get::<Option<serde_json::Value>, _>(field_idx)?
.map(|v| BasicValue::Json(Arc::from(v))),
Expand Down Expand Up @@ -655,6 +665,7 @@ fn to_column_type_sql(column_type: &ValueType) -> Cow<'static, str> {
BasicValueType::Float32 => "real".into(),
BasicValueType::Float64 => "double precision".into(),
BasicValueType::Range => "int8range".into(),
BasicValueType::Uuid => "uuid".into(),
BasicValueType::Json => "jsonb".into(),
BasicValueType::Vector(vec_schema) => {
if convertible_to_pgvector(vec_schema) {
Expand Down