Skip to content

feat: support Vec<T> for DynRecord #314

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

Closed
wants to merge 2 commits into from
Closed

feat: support Vec<T> for DynRecord #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30ba2fa
feat: support `Vec<T>` for `DynRecord`
crwen Apr 9, 2025
b859ced
Merge branch 'main' into feat/type_list
crwen Apr 25, 2025
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
17 changes: 10 additions & 7 deletions bindings/js/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fn to_col_value<T: 'static + Send + Sync>(value: T, primary: bool) -> Arc<dyn An
}
}

fn none_value(datatype: DataType) -> Arc<dyn Any + Send + Sync> {
fn none_value(datatype: &DataType) -> Arc<dyn Any + Send + Sync> {
match datatype {
DataType::UInt8 => Arc::new(Option::<u8>::None),
DataType::UInt16 => Arc::new(Option::<u16>::None),
Expand All @@ -26,6 +26,7 @@ fn none_value(datatype: DataType) -> Arc<dyn Any + Send + Sync> {
DataType::String => Arc::new(Option::<String>::None),
DataType::Boolean => Arc::new(Option::<bool>::None),
DataType::Bytes => Arc::new(Option::<Vec<u8>>::None),
DataType::List(_) => unimplemented!(),
}
}

Expand All @@ -35,9 +36,9 @@ pub(crate) fn parse_key(desc: &ValueDesc, key: JsValue, primary: bool) -> Result
true => return Err(format!("{} can not be null", &desc.name).into()),
false => {
return Ok(Value::new(
desc.datatype,
desc.datatype.clone(),
desc.name.clone(),
none_value(desc.datatype),
none_value(&desc.datatype),
desc.is_nullable,
))
}
Expand All @@ -59,10 +60,11 @@ pub(crate) fn parse_key(desc: &ValueDesc, key: JsValue, primary: bool) -> Result
DataType::Bytes => {
to_col_value::<Vec<u8>>(key.dyn_into::<Uint8Array>().unwrap().to_vec(), primary)
}
DataType::List(_) => unimplemented!(),
};

Ok(Value::new(
desc.datatype,
desc.datatype.clone(),
desc.name.clone(),
value,
desc.is_nullable,
Expand Down Expand Up @@ -160,6 +162,7 @@ pub(crate) fn to_record(cols: &Vec<Value>, primary_key_index: usize) -> JsValue
.map(|v| Uint8Array::from(v.as_slice()).into())
.unwrap_or(JsValue::NULL),
},
DataType::List(_) => unimplemented!(),
};

Reflect::set(&obj, &col.desc.name.as_str().into(), &value).unwrap();
Expand All @@ -181,7 +184,7 @@ mod tests {
{
let desc = ValueDesc::new("id".to_string(), DataType::UInt64, false);
let key_col = parse_key(&desc, JsValue::from(19), true).unwrap();
assert_eq!(key_col.datatype(), DataType::UInt64);
assert_eq!(key_col.datatype(), &DataType::UInt64);
assert_eq!(key_col.value.as_ref().downcast_ref::<u64>(), Some(&19_u64));
}
{
Expand All @@ -192,7 +195,7 @@ mod tests {
{
let desc = ValueDesc::new("name".to_string(), DataType::String, false);
let key_col = parse_key(&desc, JsValue::from("Hello tonbo"), false).unwrap();
assert_eq!(key_col.datatype(), DataType::String);
assert_eq!(key_col.datatype(), &DataType::String);
assert_eq!(
key_col.value.as_ref().downcast_ref::<Option<String>>(),
Some(&Some("Hello tonbo".to_string()))
Expand All @@ -201,7 +204,7 @@ mod tests {
{
let desc = ValueDesc::new("data".to_string(), DataType::Bytes, false);
let key_col = parse_key(&desc, JsValue::from(b"Hello tonbo".to_vec()), false).unwrap();
assert_eq!(key_col.datatype(), DataType::Bytes);
assert_eq!(key_col.datatype(), &DataType::Bytes);
assert_eq!(
key_col.value.as_ref().downcast_ref::<Option<Vec<u8>>>(),
Some(&Some(b"Hello tonbo".to_vec()))
Expand Down
1 change: 1 addition & 0 deletions bindings/python/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ pub(crate) fn to_dict(py: Python, primary_key_index: usize, record: Vec<Value>)
.unwrap();
}
}
TonboDataType::List(_) => unimplemented!(),
}
}
dict
Expand Down
22 changes: 11 additions & 11 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,7 +1924,7 @@ pub(crate) mod tests {
let columns = entry.value().unwrap().columns;

let primary_key_col = columns.first().unwrap();
assert_eq!(primary_key_col.datatype(), DataType::Int64);
assert_eq!(primary_key_col.datatype(), &DataType::Int64);
assert_eq!(primary_key_col.desc.name, "id".to_string());
assert_eq!(
*primary_key_col
Expand All @@ -1936,7 +1936,7 @@ pub(crate) mod tests {
);

let col = columns.get(2).unwrap();
assert_eq!(col.datatype(), DataType::Int16);
assert_eq!(col.datatype(), &DataType::Int16);
assert_eq!(col.desc.name, "height".to_string());
let height = *col.value.as_ref().downcast_ref::<Option<i16>>().unwrap();
if i < 45 {
Expand All @@ -1951,41 +1951,41 @@ pub(crate) mod tests {
}

let col = columns.get(3).unwrap();
assert_eq!(col.datatype(), DataType::Int32);
assert_eq!(col.datatype(), &DataType::Int32);
assert_eq!(col.desc.name, "weight".to_string());
let weight = col.value.as_ref().downcast_ref::<Option<i32>>();
assert!(weight.is_some());
assert_eq!(*weight.unwrap(), None);

let col = columns.get(4).unwrap();
assert_eq!(col.datatype(), DataType::String);
assert_eq!(col.datatype(), &DataType::String);
assert_eq!(col.desc.name, "name".to_string());
let name = col.value.as_ref().downcast_ref::<Option<String>>();
assert!(name.is_some());
assert_eq!(name.unwrap(), &None);

let col = columns.get(6).unwrap();
assert_eq!(col.datatype(), DataType::Boolean);
assert_eq!(col.datatype(), &DataType::Boolean);
assert_eq!(col.desc.name, "enabled".to_string());
let enabled = col.value.as_ref().downcast_ref::<Option<bool>>();
assert!(enabled.is_some());
assert_eq!(*enabled.unwrap(), None);

let col = columns.get(7).unwrap();
assert_eq!(col.datatype(), DataType::Bytes);
assert_eq!(col.datatype(), &DataType::Bytes);
assert_eq!(col.desc.name, "bytes".to_string());
let bytes = col.value.as_ref().downcast_ref::<Option<Vec<u8>>>();
assert!(bytes.is_some());
assert_eq!(bytes.unwrap(), &Some((i as i32).to_le_bytes().to_vec()));

let col = columns.get(8).unwrap();
assert_eq!(col.datatype(), DataType::Float32);
assert_eq!(col.datatype(), &DataType::Float32);
let v = col.value.as_ref().downcast_ref::<Option<F32>>();
assert!(v.is_some());
assert_eq!(v.unwrap(), &Some(F32::from(i as f32 * 1.11)));

let col = columns.get(9).unwrap();
assert_eq!(col.datatype(), DataType::Float64);
assert_eq!(col.datatype(), &DataType::Float64);
let v = col.value.as_ref().downcast_ref::<Option<F64>>();
assert!(v.is_some());
assert_eq!(v.unwrap(), &Some(F64::from(i as f64 * 1.01)));
Expand Down Expand Up @@ -2112,7 +2112,7 @@ pub(crate) mod tests {
let columns = entry.value().unwrap().columns;

let primary_key_col = columns.first().unwrap();
assert_eq!(primary_key_col.datatype(), DataType::Int64);
assert_eq!(primary_key_col.datatype(), &DataType::Int64);
assert_eq!(primary_key_col.desc.name, "id".to_string());
assert_eq!(*cast_arc_value!(primary_key_col.value, i64), i);

Expand All @@ -2132,7 +2132,7 @@ pub(crate) mod tests {
let columns = entry.value().unwrap().columns;

let primary_key_col = columns.first().unwrap();
assert_eq!(primary_key_col.datatype(), DataType::Int64);
assert_eq!(primary_key_col.datatype(), &DataType::Int64);
assert_eq!(primary_key_col.desc.name, "id".to_string());
assert_eq!(*cast_arc_value!(primary_key_col.value, i64), i);

Expand All @@ -2152,7 +2152,7 @@ pub(crate) mod tests {
let columns = entry.value().unwrap().columns;

let primary_key_col = columns.first().unwrap();
assert_eq!(primary_key_col.datatype(), DataType::Int64);
assert_eq!(primary_key_col.datatype(), &DataType::Int64);
assert_eq!(primary_key_col.desc.name, "id".to_string());
assert_eq!(*cast_arc_value!(primary_key_col.value, i64), i);

Expand Down
Loading
Loading