Merge pull request #206 from muzarski/bump-0.15

bump rust-driver to 0.15 (with eager deserialization)

Author: muzarski

scylla-rust-wrapper/Cargo.lock

@@ -10,7 +10,7 @@ categories = ["database"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "64b4afcd", features = [
+scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v0.15.0", features = [
     "ssl",
 ] }
 tokio = { version = "1.27.0", features = ["full"] }
@@ -26,13 +26,14 @@ openssl = "0.10.32"
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 tracing = "0.1.37"
 futures = "0.3"
+thiserror = "1.0"
 
 [build-dependencies]
 bindgen = "0.65"
 chrono = "0.4.20"
 
 [dev-dependencies]
-scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "64b4afcd" }
+scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v0.15.0" }
 
 assert_matches = "1.5.0"
 ntest = "0.9.3"

scylla-rust-wrapper/Cargo.toml

@@ -2,12 +2,35 @@ use scylla::transport::errors::*;
 
 // Re-export error types.
 pub(crate) use crate::cass_error_types::{CassError, CassErrorSource};
+use crate::query_error::CassErrorResult;
 
-impl From<&QueryError> for CassError {
-    fn from(error: &QueryError) -> Self {
-        match error {
-            QueryError::DbError(db_error, _string) => CassError::from(db_error),
-            QueryError::BadQuery(bad_query) => CassError::from(bad_query),
+pub trait ToCassError {
+    fn to_cass_error(&self) -> CassError;
+}
+
+impl ToCassError for CassErrorResult {
+    fn to_cass_error(&self) -> CassError {
+        match self {
+            CassErrorResult::Query(query_error) => query_error.to_cass_error(),
+
+            // TODO:
+            // For now let's leave these as LIB_INVALID_DATA.
+            // I don't see any variants that would make more sense.
+            // TBH, I'm almost sure that we should introduce additional enum variants
+            // of CassError in the future ~ muzarski.
+            CassErrorResult::ResultMetadataLazyDeserialization(_) => {
+                CassError::CASS_ERROR_LIB_INVALID_DATA
+            }
+            CassErrorResult::Deserialization(_) => CassError::CASS_ERROR_LIB_INVALID_DATA,
+        }
+    }
+}
+
+impl ToCassError for QueryError {
+    fn to_cass_error(&self) -> CassError {
+        match self {
+            QueryError::DbError(db_error, _string) => db_error.to_cass_error(),
+            QueryError::BadQuery(bad_query) => bad_query.to_cass_error(),
             QueryError::ProtocolError(_str) => CassError::CASS_ERROR_SERVER_PROTOCOL_ERROR,
             QueryError::TimeoutError => CassError::CASS_ERROR_LIB_REQUEST_TIMED_OUT, // This may be either read or write timeout error
             QueryError::UnableToAllocStreamId => CassError::CASS_ERROR_LIB_NO_STREAMS,
@@ -32,9 +55,9 @@ impl From<&QueryError> for CassError {
     }
 }
 
-impl From<&DbError> for CassError {
-    fn from(error: &DbError) -> Self {
-        match error {
+impl ToCassError for DbError {
+    fn to_cass_error(&self) -> CassError {
+        match self {
             DbError::ServerError => CassError::CASS_ERROR_SERVER_SERVER_ERROR,
             DbError::ProtocolError => CassError::CASS_ERROR_SERVER_PROTOCOL_ERROR,
             DbError::AuthenticationError => CassError::CASS_ERROR_SERVER_BAD_CREDENTIALS,
@@ -62,9 +85,9 @@ impl From<&DbError> for CassError {
     }
 }
 
-impl From<&BadQuery> for CassError {
-    fn from(error: &BadQuery) -> Self {
-        match error {
+impl ToCassError for BadQuery {
+    fn to_cass_error(&self) -> CassError {
+        match self {
             BadQuery::SerializeValuesError(_serialize_values_error) => {
                 CassError::CASS_ERROR_LAST_ENTRY
             }
@@ -81,9 +104,9 @@ impl From<&BadQuery> for CassError {
     }
 }
 
-impl From<&NewSessionError> for CassError {
-    fn from(error: &NewSessionError) -> Self {
-        match error {
+impl ToCassError for NewSessionError {
+    fn to_cass_error(&self) -> CassError {
+        match self {
             NewSessionError::FailedToResolveAnyHostname(_hostnames) => {
                 CassError::CASS_ERROR_LIB_NO_HOSTS_AVAILABLE
             }
@@ -117,9 +140,9 @@ impl From<&NewSessionError> for CassError {
     }
 }
 
-impl From<&BadKeyspaceName> for CassError {
-    fn from(error: &BadKeyspaceName) -> Self {
-        match error {
+impl ToCassError for BadKeyspaceName {
+    fn to_cass_error(&self) -> CassError {
+        match self {
             BadKeyspaceName::Empty => CassError::CASS_ERROR_LAST_ENTRY,
             BadKeyspaceName::TooLong(_string, _usize) => CassError::CASS_ERROR_LAST_ENTRY,
             BadKeyspaceName::IllegalCharacter(_string, _char) => CassError::CASS_ERROR_LAST_ENTRY,
@@ -133,6 +156,12 @@ pub trait CassErrorMessage {
     fn msg(&self) -> String;
 }
 
+impl CassErrorMessage for CassErrorResult {
+    fn msg(&self) -> String {
+        self.to_string()
+    }
+}
+
 impl CassErrorMessage for QueryError {
     fn msg(&self) -> String {
         self.to_string()

scylla-rust-wrapper/src/cass_error.rs

@@ -1,6 +1,7 @@
 use crate::argconv::*;
 use crate::cass_error::CassError;
 use crate::cass_error::CassErrorMessage;
+use crate::cass_error::ToCassError;
 use crate::prepared::CassPrepared;
 use crate::query_error::CassErrorResult;
 use crate::query_result::CassResult;
@@ -320,7 +321,7 @@ pub unsafe extern "C" fn cass_future_ready(future_raw: *const CassFuture) -> cas
 #[no_mangle]
 pub unsafe extern "C" fn cass_future_error_code(future_raw: *const CassFuture) -> CassError {
     ptr_to_ref(future_raw).with_waited_result(|r: &mut CassFutureResult| match r {
-        Ok(CassResultValue::QueryError(err)) => CassError::from(err.as_ref()),
+        Ok(CassResultValue::QueryError(err)) => err.to_cass_error(),
         Err((err, _)) => *err,
         _ => CassError::CASS_OK,
     })