frame/value: deprecate SerializeValuesError

This is part of the legacy serialization framework.
scylladb · Dec 11, 2024 · 59eb5c1 · 59eb5c1
1 parent 04c6f31
commit 59eb5c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/scylla-cql/src/frame/value.rs b/scylla-cql/src/frame/value.rs
@@ -12,31 +12,10 @@ use super::response::result::CqlValue;
 use super::types::vint_encode;
 use super::types::RawValue;
 
-#[derive(Debug, Error, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-#[error("Value too big to be sent in a request - max 2GiB allowed")]
-#[deprecated(
-    since = "0.15.1",
-    note = "Legacy serialization API is not type-safe and is going to be removed soon"
-)]
-pub struct ValueTooBig;
-
 #[derive(Debug, Error, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 #[error("Value is too large to fit in the CQL type")]
 pub struct ValueOverflow;
 
-#[allow(deprecated)]
-#[derive(Debug, Error, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub enum SerializeValuesError {
-    #[error("Too many values to add, max 65,535 values can be sent in a request")]
-    TooManyValues,
-    #[error("Mixing named and not named values is not allowed")]
-    MixingNamedAndNotNamedValues,
-    #[error(transparent)]
-    ValueTooBig(#[from] ValueTooBig),
-    #[error("Parsing serialized values failed")]
-    ParseError,
-}
-
 /// Represents an unset value
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Unset;
@@ -684,6 +663,22 @@ mod legacy {
         fn serialize(&self, buf: &mut Vec<u8>) -> Result<(), ValueTooBig>;
     }
 
+    #[derive(Debug, Error, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    #[error("Value too big to be sent in a request - max 2GiB allowed")]
+    pub struct ValueTooBig;
+
+    #[derive(Debug, Error, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum SerializeValuesError {
+        #[error("Too many values to add, max 65,535 values can be sent in a request")]
+        TooManyValues,
+        #[error("Mixing named and not named values is not allowed")]
+        MixingNamedAndNotNamedValues,
+        #[error(transparent)]
+        ValueTooBig(#[from] ValueTooBig),
+        #[error("Parsing serialized values failed")]
+        ParseError,
+    }
+
     /// Keeps a buffer with serialized Values
     /// Allows adding new Values and iterating over serialized ones
     #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
@@ -1887,5 +1882,6 @@ mod legacy {
 pub use legacy::{
     LegacyBatchValues, LegacyBatchValuesFirstSerialized, LegacyBatchValuesFromIter,
     LegacyBatchValuesIterator, LegacyBatchValuesIteratorFromIterator, LegacySerializedValues,
-    LegacySerializedValuesIterator, SerializedResult, TupleValuesIter, Value, ValueList,
+    LegacySerializedValuesIterator, SerializeValuesError, SerializedResult, TupleValuesIter, Value,
+    ValueList, ValueTooBig,
 };
diff --git a/scylla/src/transport/errors.rs b/scylla/src/transport/errors.rs
@@ -12,6 +12,7 @@ use std::{
     sync::Arc,
 };
 
+#[allow(deprecated)]
 use scylla_cql::{
     frame::{
         frame_errors::{
@@ -124,6 +125,7 @@ pub enum QueryError {
     IntoLegacyQueryResultError(#[from] IntoLegacyQueryResultError),
 }
 
+#[allow(deprecated)]
 impl From<SerializeValuesError> for QueryError {
     fn from(serialized_err: SerializeValuesError) -> QueryError {
         QueryError::BadQuery(BadQuery::SerializeValuesError(serialized_err))
@@ -573,7 +575,12 @@ pub enum ViewsMetadataError {
 #[non_exhaustive]
 pub enum BadQuery {
     /// Failed to serialize values passed to a query - values too big
+    #[deprecated(
+        since = "0.15.1",
+        note = "Legacy serialization API is not type-safe and is going to be removed soon"
+    )]
     #[error("Serializing values failed: {0} ")]
+    #[allow(deprecated)]
     SerializeValuesError(#[from] SerializeValuesError),
 
     #[error("Serializing values failed: {0} ")]