Upgrade cassandra version

.github/workflows/cassandra.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Build
         run: cmake -DCASS_BUILD_INTEGRATION_TESTS=ON . && make
 
-      - name: Run integration tests on Cassandra 3.0.9
+      - name: Run integration tests on Cassandra 4.0.7
         env:
           #        Ignored tests are added in the end, after the "-" sign.
           Tests: "ClusterTests.*\
@@ -51,12 +51,13 @@ jobs:
 :CompressionTests.*\
 :LoggingTests.*\
 :-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
+:PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
 :*5.Integration_Cassandra_*\
 :*19.Integration_Cassandra_*\
-:CassandraTypes/CassandraTypesTests/*.Integration_Cassandra_UDT\
+:*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=3.0.9 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests"
+        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"
 
       - name: Upload test logs
         uses: actions/upload-artifact@v3

scylla-rust-wrapper/src/query_result.rs

@@ -5,14 +5,12 @@ use crate::inet::CassInet;
 use crate::metadata::{
     CassColumnMeta, CassKeyspaceMeta, CassMaterializedViewMeta, CassSchemaMeta, CassTableMeta,
 };
-use crate::statement::CassStatement;
 use crate::types::*;
 use crate::uuid::CassUuid;
 use scylla::frame::response::result::{ColumnSpec, CqlValue};
-use scylla::{BufMut, Bytes, BytesMut};
+use scylla::Bytes;
 use std::convert::TryInto;
 use std::os::raw::c_char;
-use std::slice;
 use std::sync::Arc;
 use uuid::Uuid;
 
@@ -1248,31 +1246,6 @@ pub unsafe extern "C" fn cass_result_paging_state_token(
     CassError::CASS_OK
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn cass_statement_set_paging_state_token(
-    statement: *mut CassStatement,
-    paging_state: *const c_char,
-    paging_state_size: size_t,
-) -> CassError {
-    let statement_from_raw = ptr_to_ref_mut(statement);
-
-    if paging_state.is_null() {
-        statement_from_raw.paging_state = None;
-        return CassError::CASS_ERROR_LIB_NULL_VALUE;
-    }
-
-    let paging_state_usize: usize = paging_state_size.try_into().unwrap();
-    let mut b = BytesMut::with_capacity(paging_state_usize + 1);
-    b.put_slice(slice::from_raw_parts(
-        paging_state as *const u8,
-        paging_state_usize,
-    ));
-    b.extend_from_slice(b"\0");
-    statement_from_raw.paging_state = Some(b.freeze());
-
-    CassError::CASS_OK
-}
-
 // CassResult functions:
 /*
 extern "C" {

scylla-rust-wrapper/src/statement.rs

@@ -12,9 +12,11 @@ use scylla::frame::value::MaybeUnset::{Set, Unset};
 use scylla::query::Query;
 use scylla::statement::prepared_statement::PreparedStatement;
 use scylla::statement::SerialConsistency;
-use scylla::Bytes;
+use scylla::{BufMut, Bytes, BytesMut};
 use std::collections::HashMap;
+use std::convert::TryInto;
 use std::os::raw::{c_char, c_int};
+use std::slice;
 use std::sync::Arc;
 
 include!(concat!(env!("OUT_DIR"), "/cppdriver_data_query_error.rs"));
@@ -224,6 +226,30 @@ pub unsafe extern "C" fn cass_statement_set_paging_state(
     CassError::CASS_OK
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn cass_statement_set_paging_state_token(
+    statement: *mut CassStatement,
+    paging_state: *const c_char,
+    paging_state_size: size_t,
+) -> CassError {
+    let statement_from_raw = ptr_to_ref_mut(statement);
+
+    if paging_state.is_null() {
+        statement_from_raw.paging_state = None;
+        return CassError::CASS_ERROR_LIB_NULL_VALUE;
+    }
+
+    let paging_state_usize: usize = paging_state_size.try_into().unwrap();
+    let mut b = BytesMut::with_capacity(paging_state_usize);
+    let paging_state_bytes = slice::from_raw_parts(paging_state, paging_state_usize);
+    for byte in paging_state_bytes {
+        b.put_i8(*byte);
+    }
+    statement_from_raw.paging_state = Some(b.freeze());
+
+    CassError::CASS_OK
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn cass_statement_set_is_idempotent(
     statement_raw: *mut CassStatement,

tests/src/integration/ccm/bridge.cpp

@@ -1469,6 +1469,7 @@ CCM::Bridge::generate_create_updateconf_command(CassVersion cassandra_version) {
     updateconf_command.push_back("request_timeout_in_ms:10000");
     updateconf_command.push_back("phi_convict_threshold:16");
     updateconf_command.push_back("hinted_handoff_enabled:false");
+    updateconf_command.push_back("enable_materialized_views:true");
     updateconf_command.push_back("dynamic_snitch_update_interval_in_ms:1000");
     updateconf_command.push_back("native_transport_max_threads:1");
     updateconf_command.push_back("concurrent_reads:2");

tests/src/integration/tests/test_tracing.cpp

@@ -35,6 +35,12 @@ CASSANDRA_INTEGRATION_TEST_F(TracingTests, Simple) {
     Statement statement("SELECT * FROM system_traces.sessions WHERE session_id = ?", 1);
     statement.bind(0, tracing_id);
     Result result = session_.execute(statement);
+    int retries = 0;
+    while (result.row_count() == 0u && retries < 10) {
+      msleep(1000);
+      retries++;
+      result = session_.execute(statement);
+    }
     ASSERT_GT(result.row_count(), 0u);
     Uuid session_id = result.first_row().column_by_name<Uuid>("session_id");
     ASSERT_FALSE(session_id.is_null());