Add default impl for async_{en,de}code_opt in codec traits

LDeakin · Dec 4, 2023 · 150a2e4 · 150a2e4
1 parent 39c92b6
commit 150a2e4
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 165 deletions.
diff --git a/src/array/codec.rs b/src/array/codec.rs
@@ -144,14 +144,18 @@ pub trait ArrayCodecTraits: CodecTraits {
     #[cfg(feature = "async")]
     /// Asynchronously encode array with optional parallelism.
     ///
+    /// The default implementation calls [`encode_opt`](ArrayCodecTraits::encode_opt) with parallelism disabled.
+    ///
     /// # Errors
     /// Returns [`CodecError`] if a codec fails or the decoded output is incompatible with `decoded_representation`.
     async fn async_encode_opt(
         &self,
         decoded_value: Vec<u8>,
         decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError>;
+        _parallel: bool,
+    ) -> Result<Vec<u8>, CodecError> {
+        self.encode_opt(decoded_value, decoded_representation, false)
+    }
 
     /// Decode array with optional parallelism.
     ///
@@ -167,14 +171,18 @@ pub trait ArrayCodecTraits: CodecTraits {
     #[cfg(feature = "async")]
     /// Asynchronously decode array with optional parallelism.
     ///
+    /// The default implementation calls [`decode_opt`](ArrayCodecTraits::decode_opt) with parallelism disabled.
+    ///
     /// # Errors
     /// Returns [`CodecError`] if a codec fails or the decoded output is incompatible with `decoded_representation`.
     async fn async_decode_opt(
         &self,
         encoded_value: Vec<u8>,
         decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError>;
+        _parallel: bool,
+    ) -> Result<Vec<u8>, CodecError> {
+        self.decode_opt(encoded_value, decoded_representation, false)
+    }
 
     /// Encode array.
     ///
@@ -716,16 +724,20 @@ pub trait BytesToBytesCodecTraits: CodecTraits + dyn_clone::DynClone + core::fmt
     #[cfg(feature = "async")]
     /// Asynchronously encode bytes with optional parallelism.
     ///
+    /// The default implementation calls [`encode_opt`](BytesToBytesCodecTraits::encode_opt) with parallelism disabled.
+    ///
     /// # Errors
     /// Returns [`CodecError`] if a codec fails.
     async fn async_encode_opt(
         &self,
         decoded_value: Vec<u8>,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError>;
+        _parallel: bool,
+    ) -> Result<Vec<u8>, CodecError> {
+        self.encode_opt(decoded_value, false)
+    }
 
     /// Decode bytes with optional parallelism.
-    ///
+    //
     /// # Errors
     /// Returns [`CodecError`] if a codec fails.
     fn decode_opt(
@@ -738,14 +750,18 @@ pub trait BytesToBytesCodecTraits: CodecTraits + dyn_clone::DynClone + core::fmt
     #[cfg(feature = "async")]
     /// Asynchronously decode bytes with optional parallelism.
     ///
+    /// The default implementation calls [`decode_opt`](BytesToBytesCodecTraits::decode_opt) with parallelism disabled.
+    ///
     /// # Errors
     /// Returns [`CodecError`] if a codec fails.
     async fn async_decode_opt(
         &self,
         encoded_value: Vec<u8>,
         decoded_representation: &BytesRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError>;
+        _parallel: bool,
+    ) -> Result<Vec<u8>, CodecError> {
+        self.decode_opt(encoded_value, decoded_representation, false)
+    }
 
     /// Initialises a partial decoder with optional parallelism.
     ///

diff --git a/src/array/codec/array_to_array/bitround/bitround_codec.rs b/src/array/codec/array_to_array/bitround/bitround_codec.rs
@@ -79,24 +79,6 @@ impl ArrayCodecTraits for BitroundCodec {
     ) -> Result<Vec<u8>, CodecError> {
         Ok(encoded_value)
     }
-
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, decoded_representation, parallel)
-    }
-
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
 }
 
 #[cfg_attr(feature = "async", async_trait::async_trait)]

diff --git a/src/array/codec/array_to_array/transpose/transpose_codec.rs b/src/array/codec/array_to_array/transpose/transpose_codec.rs
@@ -188,24 +188,4 @@ impl ArrayCodecTraits for TransposeCodec {
             )
         })
     }
-
-    #[cfg(feature = "async")]
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, decoded_representation, parallel)
-    }
-
-    #[cfg(feature = "async")]
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
 }
diff --git a/src/array/codec/array_to_bytes/bytes/bytes_codec.rs b/src/array/codec/array_to_bytes/bytes/bytes_codec.rs
@@ -139,26 +139,6 @@ impl ArrayCodecTraits for BytesCodec {
     ) -> Result<Vec<u8>, CodecError> {
         self.do_encode_or_decode(encoded_value, decoded_representation)
     }
-
-    #[cfg(feature = "async")]
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, decoded_representation, parallel)
-    }
-
-    #[cfg(feature = "async")]
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
 }
 
 #[cfg_attr(feature = "async", async_trait::async_trait)]

diff --git a/src/array/codec/array_to_bytes/zfp/zfp_codec.rs b/src/array/codec/array_to_bytes/zfp/zfp_codec.rs
@@ -214,24 +214,6 @@ impl ArrayCodecTraits for ZfpCodec {
             parallel,
         )
     }
-
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, decoded_representation, parallel)
-    }
-
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &ArrayRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
 }
 
 #[cfg_attr(feature = "async", async_trait::async_trait)]

diff --git a/src/array/codec/bytes_to_bytes/blosc/blosc_codec.rs b/src/array/codec/bytes_to_bytes/blosc/blosc_codec.rs
@@ -179,26 +179,6 @@ impl BytesToBytesCodecTraits for BloscCodec {
         }
     }
 
-    #[cfg(feature = "async")]
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, parallel)
-    }
-
-    #[cfg(feature = "async")]
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &BytesRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        // FIXME: Remove
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
-
     fn partial_decoder_opt<'a>(
         &'a self,
         input_handle: Box<dyn BytesPartialDecoderTraits + 'a>,

diff --git a/src/array/codec/bytes_to_bytes/crc32c/crc32c_codec.rs b/src/array/codec/bytes_to_bytes/crc32c/crc32c_codec.rs
@@ -106,26 +106,6 @@ impl BytesToBytesCodecTraits for Crc32cCodec {
         }
     }
 
-    #[cfg(feature = "async")]
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, parallel)
-    }
-
-    #[cfg(feature = "async")]
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &BytesRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        // FIXME: Remove
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
-
     fn partial_decoder_opt<'a>(
         &'a self,
         input_handle: Box<dyn BytesPartialDecoderTraits + 'a>,

diff --git a/src/array/codec/bytes_to_bytes/gzip/gzip_codec.rs b/src/array/codec/bytes_to_bytes/gzip/gzip_codec.rs
@@ -107,26 +107,6 @@ impl BytesToBytesCodecTraits for GzipCodec {
         Ok(out)
     }
 
-    #[cfg(feature = "async")]
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, parallel)
-    }
-
-    #[cfg(feature = "async")]
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &BytesRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        // FIXME: Remove
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
-
     fn partial_decoder_opt<'a>(
         &self,
         r: Box<dyn BytesPartialDecoderTraits + 'a>,

diff --git a/src/array/codec/bytes_to_bytes/zstd/zstd_codec.rs b/src/array/codec/bytes_to_bytes/zstd/zstd_codec.rs
@@ -104,26 +104,6 @@ impl BytesToBytesCodecTraits for ZstdCodec {
         zstd::decode_all(encoded_value.as_slice()).map_err(CodecError::IOError)
     }
 
-    #[cfg(feature = "async")]
-    async fn async_encode_opt(
-        &self,
-        decoded_value: Vec<u8>,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        self.encode_opt(decoded_value, parallel)
-    }
-
-    #[cfg(feature = "async")]
-    async fn async_decode_opt(
-        &self,
-        encoded_value: Vec<u8>,
-        decoded_representation: &BytesRepresentation,
-        parallel: bool,
-    ) -> Result<Vec<u8>, CodecError> {
-        // FIXME: Remove
-        self.decode_opt(encoded_value, decoded_representation, parallel)
-    }
-
     fn partial_decoder_opt<'a>(
         &self,
         r: Box<dyn BytesPartialDecoderTraits + 'a>,