Merge pull request scylladb#1082 from wprzytula/column-spec-lifetime-…

…generic make `ResultMetadata` lifetime-generic
muzarski · Oct 7, 2024 · 92254fe · 92254fe
2 parents 1a2c51b + 80027e2
commit 92254fe
Show file tree

Hide file tree

Showing 24 changed files with 594 additions and 493 deletions.
diff --git a/scylla-cql/src/frame/frame_errors.rs b/scylla-cql/src/frame/frame_errors.rs
@@ -11,6 +11,7 @@ pub use super::request::{
     startup::StartupSerializationError,
 };
 
+use super::response::result::TableSpec;
 use super::response::CqlResponseKind;
 use super::TryFromPrimitiveError;
 use crate::types::deserialize::DeserializationError;
@@ -372,6 +373,8 @@ pub struct ColumnSpecParseError {
 pub enum ColumnSpecParseErrorKind {
     #[error("Invalid table spec: {0}")]
     TableSpecParseError(#[from] TableSpecParseError),
+    #[error("Table spec differs across columns - got specs: {0:?} and {1:?}")]
+    TableSpecDiffersAcrossColumns(TableSpec<'static>, TableSpec<'static>),
     #[error("Malformed column name: {0}")]
     ColumnNameParseError(#[from] LowLevelDeserializationError),
     #[error("Invalid column type: {0}")]

diff --git a/scylla-cql/src/frame/response/mod.rs b/scylla-cql/src/frame/response/mod.rs
@@ -111,7 +111,7 @@ impl Response {
         features: &ProtocolFeatures,
         opcode: ResponseOpcode,
         buf_bytes: bytes::Bytes,
-        cached_metadata: Option<&Arc<ResultMetadata>>,
+        cached_metadata: Option<&Arc<ResultMetadata<'static>>>,
     ) -> Result<Response, CqlResponseParseError> {
         let buf = &mut &*buf_bytes;
         let response = match opcode {