New deserialization api

.github/workflows/build.yml

@@ -50,8 +50,6 @@ jobs:
 :CompressionTests.*\
 :LoggingTests.*\
 :-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
-:*5.Integration_Cassandra_*\
-:*19.Integration_Cassandra_*\
 :ExecutionProfileTest.InvalidName"
       run: valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite ./cassandra-integration-tests --scylla --version=release:5.0.0 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"
 

.github/workflows/cassandra.yml

@@ -52,9 +52,6 @@ jobs:
 :LoggingTests.*\
 :-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
 :PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
-:*5.Integration_Cassandra_*\
-:*19.Integration_Cassandra_*\
-:*7.Integration_Cassandra_*\
 :SslTests.Integration_Cassandra_ReconnectAfterClusterCrashAndRestart\
 :ExecutionProfileTest.InvalidName"
         run: valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite ./cassandra-integration-tests --version=4.0.7 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"

scylla-rust-wrapper/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scylla-cpp-driver-rust"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 description = "Wrapper for Scylla's Rust driver, exports functions to be used by C"
 repository = "https://github.com/scylladb/scylla-rust-driver"
 readme = "./README.md"
@@ -10,14 +10,16 @@ categories = ["database"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "1a913a19", features = ["ssl"]}
+scylla = { git = "https://github.com/Gor027/scylla-rust-driver.git", rev = "6585f06", features = ["ssl"]}
 tokio = { version = "1.1.0", features = ["full"] }
 lazy_static = "1.4.0"
 uuid = "1.1.2"
 machine-uid = "0.2.0"
 rand = "0.8.4"
 num-traits = "0.2"
 num-derive = "0.3"
+bigdecimal = "0.2.0"
+num-bigint = "0.3"
 libc = "0.2.108"
 openssl-sys = "0.9.75"
 openssl = "0.10.32"
@@ -30,9 +32,11 @@ chrono = "0.4.20"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
+scylla-cql = "0.0.7"
 ntest = "0.9.0"
 rusty-fork = "0.3.0"
-scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "1a913a19"}
+bytes = "1.4.0"
+scylla-proxy = { git = "https://github.com/Gor027/scylla-rust-driver.git", rev = "6585f06"}
 
 [lib]
 name = "scylla_cpp_driver"

scylla-rust-wrapper/src/argconv.rs

@@ -94,3 +94,14 @@ macro_rules! make_c_str {
 
 #[cfg(test)]
 pub(crate) use make_c_str;
+
+macro_rules! unwrap_or_return_false {
+    ( $e:expr ) => {
+        match $e {
+            Ok(x) => x,
+            Err(_) => return false,
+        }
+    };
+}
+
+pub(crate) use unwrap_or_return_false;

scylla-rust-wrapper/src/binding.rs

@@ -139,8 +139,6 @@ macro_rules! make_appender {
 
 // TODO: Types for which binding is not implemented yet:
 // custom - Not implemented in Rust driver?
-// decimal
-// duration - DURATION not implemented in Rust Driver
 
 macro_rules! invoke_binder_maker_macro_with_type {
     (null, $macro_name:ident, $this:ty, $consume_v:expr, $fn:ident) => {
@@ -275,6 +273,32 @@ macro_rules! invoke_binder_maker_macro_with_type {
             [v @ crate::inet::CassInet]
         );
     };
+    (decimal, $macro_name:ident, $this:ty, $consume_v:expr, $fn:ident) => {
+        $macro_name!(
+            $this,
+            $consume_v,
+            $fn,
+            |v, v_size, scale| {
+                // The value is copied, the memory pointed to by this parameter can be freed after this call.
+                let val = std::slice::from_raw_parts(v as *const u8, v_size as usize).to_vec();
+                let int_value = num_bigint::BigInt::from_signed_bytes_be(val.as_slice());
+                Ok(Some(Decimal(bigdecimal::BigDecimal::from((int_value, scale as i64)))))
+            },
+            [v @ *const cass_byte_t, v_size @ size_t, scale @ cass_int32_t]
+        );
+    };
+    (duration, $macro_name:ident, $this:ty, $consume_v:expr, $fn:ident) => {
+        $macro_name!(
+            $this,
+            $consume_v,
+            $fn,
+            |m, d, n| {
+                use scylla::frame::value::CqlDuration;
+                Ok(Some(Duration(CqlDuration {months: m, days: d, nanoseconds: n,})))
+            },
+            [m @ cass_int32_t, d @ cass_int32_t, n @ cass_int64_t]
+        );
+    };
     (collection, $macro_name:ident, $this:ty, $consume_v:expr, $fn:ident) => {
         $macro_name!(
             $this,

scylla-rust-wrapper/src/cass_error.rs

@@ -1,4 +1,6 @@
+use scylla::frame::frame_errors::ParseError;
 use scylla::transport::errors::*;
+use scylla::transport::query_result::{FirstRowError, RowsError};
 
 include!(concat!(env!("OUT_DIR"), "/cppdriver_data_errors.rs"));
 
@@ -95,6 +97,38 @@ impl From<&BadKeyspaceName> for CassError {
     }
 }
 
+impl From<&ParseError> for CassError {
+    fn from(error: &ParseError) -> Self {
+        match error {
+            ParseError::BadDataToSerialize(_) => CassError::CASS_ERROR_LIB_MESSAGE_ENCODE,
+            ParseError::BadIncomingData(_) => CassError::CASS_ERROR_LIB_MESSAGE_ENCODE,
+            ParseError::IoError(_) => CassError::CASS_ERROR_LIB_MESSAGE_ENCODE,
+            ParseError::TypeNotImplemented(_) => CassError::CASS_ERROR_LIB_MESSAGE_ENCODE,
+            ParseError::SerializeValuesError(_) => CassError::CASS_ERROR_LIB_MESSAGE_ENCODE,
+            ParseError::CqlTypeError(_) => CassError::CASS_ERROR_LIB_MESSAGE_ENCODE,
+        }
+    }
+}
+
+impl From<&RowsError> for CassError {
+    fn from(error: &RowsError) -> Self {
+        match error {
+            RowsError::NotRowsResponse => CassError::CASS_ERROR_LIB_BAD_PARAMS, // same error code returned in C++ driver
+            RowsError::TypeCheckFailed(err) => err.into(),
+        }
+    }
+}
+
+impl From<&FirstRowError> for CassError {
+    fn from(error: &FirstRowError) -> Self {
+        match error {
+            FirstRowError::NotRowsResponse => CassError::CASS_ERROR_LIB_BAD_PARAMS, // same error code returned in C++ driver
+            FirstRowError::RowsEmpty => CassError::CASS_ERROR_LIB_INVALID_ITEM_COUNT,
+            FirstRowError::TypeCheckFailed(err) => err.into(),
+        }
+    }
+}
+
 pub trait CassErrorMessage {
     fn msg(&self) -> String;
 }
@@ -129,6 +163,24 @@ impl CassErrorMessage for BadKeyspaceName {
     }
 }
 
+impl CassErrorMessage for ParseError {
+    fn msg(&self) -> String {
+        self.to_string()
+    }
+}
+
+impl CassErrorMessage for RowsError {
+    fn msg(&self) -> String {
+        self.to_string()
+    }
+}
+
+impl CassErrorMessage for FirstRowError {
+    fn msg(&self) -> String {
+        self.to_string()
+    }
+}
+
 impl CassErrorMessage for str {
     fn msg(&self) -> String {
         self.to_string()