diff --git a/src/array/array_view.rs b/src/array/array_view.rs index 268bea59..51f76fd2 100644 --- a/src/array/array_view.rs +++ b/src/array/array_view.rs @@ -41,7 +41,7 @@ impl<'a> ArrayView<'a> { Err(IncompatibleDimensionalityError::new(subset.dimensionality(), shape.len()).into()) } else if std::iter::zip(subset.end_exc(), shape).any(|(end, &shape)| end > shape) { Err(ArrayViewCreateError::ArraySubsetOutOfBounds( - subset.clone(), + subset, shape.to_vec(), )) } else { diff --git a/src/array/chunk_grid/rectangular.rs b/src/array/chunk_grid/rectangular.rs index 39ad7995..06217273 100644 --- a/src/array/chunk_grid/rectangular.rs +++ b/src/array/chunk_grid/rectangular.rs @@ -28,9 +28,7 @@ fn is_name_rectangular(name: &str) -> bool { name.eq(IDENTIFIER) } -pub(crate) fn create_chunk_grid_rectangular( - metadata: &Metadata, -) -> Result { +pub fn create_chunk_grid_rectangular(metadata: &Metadata) -> Result { let configuration: RectangularChunkGridConfiguration = metadata .to_configuration() .map_err(|_| PluginMetadataInvalidError::new(IDENTIFIER, "chunk grid", metadata.clone()))?; diff --git a/src/array/chunk_grid/regular.rs b/src/array/chunk_grid/regular.rs index 17849a69..8971297d 100644 --- a/src/array/chunk_grid/regular.rs +++ b/src/array/chunk_grid/regular.rs @@ -27,9 +27,7 @@ fn is_name_regular(name: &str) -> bool { name.eq(IDENTIFIER) } -pub(crate) fn create_chunk_grid_regular( - metadata: &Metadata, -) -> Result { +pub fn create_chunk_grid_regular(metadata: &Metadata) -> Result { let configuration: RegularChunkGridConfiguration = metadata .to_configuration() .map_err(|_| PluginMetadataInvalidError::new(IDENTIFIER, "chunk grid", metadata.clone()))?; diff --git a/src/array/chunk_key_encoding/default.rs b/src/array/chunk_key_encoding/default.rs index af50d524..0ebec983 100644 --- a/src/array/chunk_key_encoding/default.rs +++ b/src/array/chunk_key_encoding/default.rs @@ -24,7 +24,7 @@ fn is_name_default(name: &str) -> bool { name.eq(IDENTIFIER) } -pub(crate) fn create_chunk_key_encoding_default( +pub fn create_chunk_key_encoding_default( metadata: &Metadata, ) -> Result { let configuration: DefaultChunkKeyEncodingConfiguration = diff --git a/src/array/chunk_key_encoding/v2.rs b/src/array/chunk_key_encoding/v2.rs index 88ee5d70..917049a0 100644 --- a/src/array/chunk_key_encoding/v2.rs +++ b/src/array/chunk_key_encoding/v2.rs @@ -24,7 +24,7 @@ fn is_name_v2(name: &str) -> bool { name.eq(IDENTIFIER) } -pub(crate) fn create_chunk_key_encoding_v2( +pub fn create_chunk_key_encoding_v2( metadata: &Metadata, ) -> Result { let configuration: V2ChunkKeyEncodingConfiguration = diff --git a/src/array/chunk_shape.rs b/src/array/chunk_shape.rs index d34a81e7..1ee384c0 100644 --- a/src/array/chunk_shape.rs +++ b/src/array/chunk_shape.rs @@ -51,7 +51,7 @@ impl ChunkShape { impl From for Vec { fn from(val: ChunkShape) -> Self { - val.0.clone() + val.0 } } diff --git a/src/array/codec/array_to_bytes/pcodec/pcodec_configuration.rs b/src/array/codec/array_to_bytes/pcodec/pcodec_configuration.rs index 0c760507..1d241a70 100644 --- a/src/array/codec/array_to_bytes/pcodec/pcodec_configuration.rs +++ b/src/array/codec/array_to_bytes/pcodec/pcodec_configuration.rs @@ -55,7 +55,7 @@ pub struct PcodecCodecConfigurationV1 { impl Default for PcodecCodecConfigurationV1 { fn default() -> Self { - PcodecCodecConfigurationV1 { + Self { level: default_compression(), delta_encoding_order: None, int_mult_spec: default_mult_spec(), @@ -69,11 +69,11 @@ fn default_compression() -> PcodecCompressionLevel { PcodecCompressionLevel::default() } -fn default_mult_spec() -> bool { +const fn default_mult_spec() -> bool { true } -fn default_max_page_n() -> usize { +const fn default_max_page_n() -> usize { // pco::constants::DEFAULT_MAX_PAGE_N 1 << 18 } diff --git a/src/config.rs b/src/config.rs index 55261bba..7c2e6ee1 100644 --- a/src/config.rs +++ b/src/config.rs @@ -31,7 +31,6 @@ use std::sync::{OnceLock, RwLock, RwLockReadGuard, RwLockWriteGuard}; /// For array operations involving multiple chunks, this is the preferred minimum chunk concurrency. /// For example, `array_store_chunks` will concurrently encode and store four chunks at a time by default. /// The concurrency of internal codecs is adjusted to accomodate for the chunk concurrency in accordance with the concurrent target set in the [`CodecOptions`](crate::array::codec::CodecOptions) parameter of an encode or decode method. - #[derive(Debug)] pub struct Config { validate_checksums: bool, @@ -44,7 +43,7 @@ impl Default for Config { fn default() -> Self { let concurrency_multiply = 1; let concurrency_add = 0; - Config { + Self { validate_checksums: true, codec_concurrent_target: std::thread::available_parallelism().unwrap().get() * concurrency_multiply