diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bba152..d28eab8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - **Breaking**: Disabled data type extensions `array::data_type::DataType::Extension`. + - **Breaking**: Remove `StoreExtension` traits ## [0.5.1] - 2023-10-10 diff --git a/src/storage/store.rs b/src/storage/store.rs index b4cff9d..da91a20 100644 --- a/src/storage/store.rs +++ b/src/storage/store.rs @@ -24,19 +24,17 @@ pub use http::{HTTPStore, HTTPStoreCreateError}; use std::sync::Arc; -use super::{ListableStorageTraits, ReadableStorageTraits, WritableStorageTraits}; - /// An [`Arc`] wrapped readable store. -pub type ReadableStore = Arc; +pub type ReadableStore = Arc; /// An [`Arc`] wrapped writable store. -pub type WritableStore = Arc; +pub type WritableStore = Arc; /// An [`Arc`] wrapped listable store. -pub type ListableStore = Arc; +pub type ListableStore = Arc; /// An [`Arc`] wrapped readable and writable store. -pub type ReadableWritableStore = Arc; +pub type ReadableWritableStore = Arc; // /// A readable store plugin. // pub type ReadableStorePlugin = StorePlugin; @@ -54,23 +52,11 @@ pub type ReadableWritableStore = Arc; // pub type ReadableWritableStorePlugin = StorePlugin; // inventory::collect!(ReadableWritableStorePlugin); -/// Traits for a store extension. -pub trait StoreExtension: Send + Sync { - // /// The URI scheme of the store, if it has one. - // fn uri_scheme(&self) -> Option<&'static str>; -} - -/// A readable store extension. -pub trait ReadableStoreExtension: StoreExtension + ReadableStorageTraits {} - -/// A writable store extension. -pub trait WritableStoreExtension: StoreExtension + WritableStorageTraits {} - -/// A listable store extension. -pub trait ListableStoreExtension: StoreExtension + ListableStorageTraits {} - -/// A readable and writable store extension. -pub trait ReadableWritableStoreExtension: ReadableStoreExtension + WritableStoreExtension {} +// /// Traits for a store extension. +// pub trait StoreExtension: Send + Sync { +// // /// The URI scheme of the store, if it has one. +// // fn uri_scheme(&self) -> Option<&'static str>; +// } // /// Get a readable store from a Uniform Resource Identifier (URI). // /// diff --git a/src/storage/store/filesystem.rs b/src/storage/store/filesystem.rs index 913ad0d..ba4c851 100644 --- a/src/storage/store/filesystem.rs +++ b/src/storage/store/filesystem.rs @@ -8,15 +8,11 @@ use crate::{ storage::{ ListableStorageTraits, ReadableListableStorageTraits, ReadableStorageTraits, ReadableWritableStorageTraits, StorageError, StoreKeyRange, StoreKeyStartValue, - StoreKeysPrefixes, + StoreKeysPrefixes, WritableStorageTraits, }, }; -use super::{ - ListableStoreExtension, ReadableStoreExtension, ReadableWritableStoreExtension, StoreExtension, - StoreKey, StoreKeyError, StoreKeys, StorePrefix, StorePrefixes, WritableStorageTraits, - WritableStoreExtension, -}; +use super::{StoreKey, StoreKeyError, StoreKeys, StorePrefix, StorePrefixes}; use parking_lot::RwLock; use thiserror::Error; @@ -62,16 +58,6 @@ pub struct FilesystemStore { files: Mutex>>>, } -impl ReadableStoreExtension for FilesystemStore {} - -impl WritableStoreExtension for FilesystemStore {} - -impl ListableStoreExtension for FilesystemStore {} - -impl ReadableWritableStoreExtension for FilesystemStore {} - -impl StoreExtension for FilesystemStore {} - impl FilesystemStore { /// Create a new file system store at a given `base_path`. /// diff --git a/src/storage/store/http.rs b/src/storage/store/http.rs index 75a3ad3..951cd58 100644 --- a/src/storage/store/http.rs +++ b/src/storage/store/http.rs @@ -6,7 +6,7 @@ use crate::{ storage::{ReadableStorageTraits, StorageError, StoreKeyRange}, }; -use super::{ReadableStoreExtension, StoreExtension, StoreKey}; +use super::StoreKey; use itertools::Itertools; use reqwest::{ @@ -23,10 +23,6 @@ pub struct HTTPStore { batch_range_requests: bool, } -impl ReadableStoreExtension for HTTPStore {} - -impl StoreExtension for HTTPStore {} - impl From for StorageError { fn from(err: reqwest::Error) -> Self { Self::Other(err.to_string()) diff --git a/src/storage/store/memory.rs b/src/storage/store/memory.rs index 82f1b01..4edaadd 100644 --- a/src/storage/store/memory.rs +++ b/src/storage/store/memory.rs @@ -18,10 +18,7 @@ use std::{ sync::Arc, }; -use super::{ - ReadableStoreExtension, StoreExtension, StoreKey, StoreKeys, StorePrefix, - WritableStoreExtension, -}; +use super::{StoreKey, StoreKeys, StorePrefix}; /// An in-memory store. #[derive(Debug)] @@ -45,12 +42,6 @@ impl Default for MemoryStore { } } -impl StoreExtension for MemoryStore {} - -impl ReadableStoreExtension for MemoryStore {} - -impl WritableStoreExtension for MemoryStore {} - impl MemoryStore { fn set_impl(&self, key: &StoreKey, value: &[u8], offset: Option, _truncate: bool) { let mut data_map = self.data_map.lock().unwrap();