Merge pull request scylladb#970 from wprzytula/value_tests

Deserialization refactor: introduce new deserialization traits
muzarski · Jun 13, 2024 · ab9a80e · ab9a80e
2 parents 3d3c353 + 30d5149
commit ab9a80e
Show file tree

Hide file tree

Showing 10 changed files with 4,460 additions and 225 deletions.
diff --git a/scylla-cql/Cargo.toml b/scylla-cql/Cargo.toml
@@ -33,6 +33,7 @@ assert_matches = "1.5.0"
 criterion = "0.4"        # Note: v0.5 needs at least rust 1.70.0
 # Use large-dates feature to test potential edge cases
 time = { version = "0.3.21", features = ["large-dates"] }
+uuid = { version = "1.0", features = ["v4"] }
 
 [[bench]]
 name = "benchmark"

diff --git a/scylla-cql/src/frame/frame_errors.rs b/scylla-cql/src/frame/frame_errors.rs
@@ -1,6 +1,7 @@
 use super::TryFromPrimitiveError;
 use crate::cql_to_rust::CqlTypeError;
 use crate::frame::value::SerializeValuesError;
+use crate::types::deserialize::DeserializationError;
 use crate::types::serialize::SerializationError;
 use thiserror::Error;
 
@@ -39,6 +40,8 @@ pub enum ParseError {
     #[error("Could not deserialize frame: {0}")]
     BadIncomingData(String),
     #[error(transparent)]
+    DeserializationError(#[from] DeserializationError),
+    #[error(transparent)]
     IoError(#[from] std::io::Error),
     #[error("type not yet implemented, id: {0}")]
     TypeNotImplemented(u16),