Use newer Scylla driver crate version

Author: ndr-ds

Cargo.lock

@@ -149,7 +149,7 @@ revm-precompile = "16.2.0"
 revm-primitives = "15.2.0"
 rocksdb = "0.21.0"
 ruzstd = "0.7.1"
-scylla = "0.15.1"
+scylla = "1.1.0"
 secp256k1 = { version = "0.30.0", default-features = false, features = [
     "alloc",
     "rand",

Cargo.toml

@@ -18,11 +18,16 @@ use async_trait::async_trait;
 use futures::{future::join_all, FutureExt as _, StreamExt};
 use linera_base::ensure;
 use scylla::{
-    batch::BatchStatement,
-    prepared_statement::PreparedStatement,
-    statement::batch::BatchType,
-    transport::errors::{DbError, QueryError},
-    Session, SessionBuilder,
+    client::{session::Session, session_builder::SessionBuilder},
+    deserialize::{DeserializationError, TypeCheckError},
+    errors::{
+        DbError, ExecutionError, IntoRowsResultError, NewSessionError, NextPageError, NextRowError,
+        PagerExecutionError, PrepareError, RequestAttemptError, RequestError, RowsError,
+    },
+    statement::{
+        batch::{BatchStatement, BatchType},
+        prepared::PreparedStatement,
+    },
 };
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -466,27 +471,27 @@ pub enum ScyllaDbStoreInternalError {
 
     /// A deserialization error in ScyllaDB
     #[error(transparent)]
-    DeserializationError(#[from] scylla::deserialize::DeserializationError),
+    DeserializationError(#[from] DeserializationError),
 
     /// A row error in ScyllaDB
     #[error(transparent)]
-    RowsError(#[from] scylla::transport::query_result::RowsError),
+    RowsError(#[from] RowsError),
 
     /// A type error in the accessed data in ScyllaDB
     #[error(transparent)]
-    IntoRowsResultError(#[from] scylla::transport::query_result::IntoRowsResultError),
+    IntoRowsResultError(#[from] IntoRowsResultError),
 
     /// A type check error in ScyllaDB
     #[error(transparent)]
-    TypeCheckError(#[from] scylla::deserialize::TypeCheckError),
+    TypeCheckError(#[from] TypeCheckError),
 
     /// A query error in ScyllaDB
     #[error(transparent)]
-    ScyllaDbQueryError(#[from] scylla::transport::errors::QueryError),
+    PagerExecutionError(#[from] PagerExecutionError),
 
     /// A query error in ScyllaDB
     #[error(transparent)]
-    ScyllaDbNewSessionError(#[from] scylla::transport::errors::NewSessionError),
+    ScyllaDbNewSessionError(#[from] NewSessionError),
 
     /// Namespace contains forbidden characters
     #[error("Namespace contains forbidden characters")]
@@ -499,6 +504,18 @@ pub enum ScyllaDbStoreInternalError {
     /// The batch is too long to be written
     #[error("The batch is too long to be written")]
     BatchTooLong,
+
+    /// A prepare error in ScyllaDB
+    #[error(transparent)]
+    PrepareError(#[from] PrepareError),
+
+    /// An execution error in ScyllaDB
+    #[error(transparent)]
+    ExecutionError(#[from] ExecutionError),
+
+    /// A next row error in ScyllaDB
+    #[error(transparent)]
+    NextRowError(#[from] NextRowError),
 }
 
 impl KeyValueStoreError for ScyllaDbStoreInternalError {
@@ -692,15 +709,15 @@ impl AdminKeyValueStore for ScyllaDbStoreInternal {
             Ok(result) => result,
             Err(error) => {
                 let invalid_or_not_found = match &error {
-                    QueryError::DbError(db_error, msg) => {
-                        *db_error == DbError::Invalid && msg.as_str() == miss_msg
-                    }
+                    PagerExecutionError::NextPageError(NextPageError::RequestFailure(
+                        RequestError::LastAttemptError(RequestAttemptError::DbError(db_error, msg)),
+                    )) => *db_error == DbError::Invalid && msg.as_str() == miss_msg,
                     _ => false,
                 };
                 if invalid_or_not_found {
                     return Ok(Vec::new());
                 } else {
-                    return Err(ScyllaDbStoreInternalError::ScyllaDbQueryError(error));
+                    return Err(ScyllaDbStoreInternalError::PagerExecutionError(error));
                 }
             }
         };
@@ -782,7 +799,9 @@ impl AdminKeyValueStore for ScyllaDbStoreInternal {
             return Ok(true);
         };
         let missing_table = match &error {
-            QueryError::DbError(db_error, msg) => {
+            PrepareError::AllAttemptsFailed {
+                first_attempt: RequestAttemptError::DbError(db_error, msg),
+            } => {
                 if *db_error != DbError::Invalid {
                     false
                 } else {
@@ -796,7 +815,7 @@ impl AdminKeyValueStore for ScyllaDbStoreInternal {
         if missing_table {
             Ok(false)
         } else {
-            Err(ScyllaDbStoreInternalError::ScyllaDbQueryError(error))
+            Err(ScyllaDbStoreInternalError::PrepareError(error))
         }
     }