refactor: split compat facade imports (#3716)

rustfs/src/admin/storage_compat.rs

@@ -15,12 +15,21 @@
 use std::ops::Deref;
 use std::sync::Arc;
 
-use rustfs_ecstore::api::{
-    bucket as ecstore_bucket, capacity as ecstore_capacity, client as ecstore_client, config as ecstore_config,
-    data_usage as ecstore_data_usage, disk as ecstore_disk, error as ecstore_error, global as ecstore_global,
-    layout as ecstore_layout, metrics as ecstore_metrics, notification as ecstore_notification, rebalance as ecstore_rebalance,
-    rpc as ecstore_rpc, storage as ecstore_storage, tier as ecstore_tier,
-};
+use rustfs_ecstore::api::bucket as ecstore_bucket;
+use rustfs_ecstore::api::capacity as ecstore_capacity;
+use rustfs_ecstore::api::client as ecstore_client;
+use rustfs_ecstore::api::config as ecstore_config;
+use rustfs_ecstore::api::data_usage as ecstore_data_usage;
+use rustfs_ecstore::api::disk as ecstore_disk;
+use rustfs_ecstore::api::error as ecstore_error;
+use rustfs_ecstore::api::global as ecstore_global;
+use rustfs_ecstore::api::layout as ecstore_layout;
+use rustfs_ecstore::api::metrics as ecstore_metrics;
+use rustfs_ecstore::api::notification as ecstore_notification;
+use rustfs_ecstore::api::rebalance as ecstore_rebalance;
+use rustfs_ecstore::api::rpc as ecstore_rpc;
+use rustfs_ecstore::api::storage as ecstore_storage;
+use rustfs_ecstore::api::tier as ecstore_tier;
 
 pub(crate) const RUSTFS_META_BUCKET: &str = crate::admin::storage_compat::ecstore_disk::RUSTFS_META_BUCKET;
 pub(crate) const STORAGE_CLASS_SUB_SYS: &str = crate::admin::storage_compat::ecstore_config::com::STORAGE_CLASS_SUB_SYS;

rustfs/src/app/storage_compat.rs

@@ -14,12 +14,22 @@
 
 use std::sync::Arc;
 
-use rustfs_ecstore::api::{
-    admin as ecstore_admin, bucket as ecstore_bucket, capacity as ecstore_capacity, client as ecstore_client,
-    compression as ecstore_compression, config as ecstore_config, data_usage as ecstore_data_usage, disk as ecstore_disk,
-    error as ecstore_error, global as ecstore_global, layout as ecstore_layout, notification as ecstore_notification,
-    rio as ecstore_rio, set_disk as ecstore_set_disk, storage as ecstore_storage, tier as ecstore_tier,
-};
+use rustfs_ecstore::api::admin as ecstore_admin;
+use rustfs_ecstore::api::bucket as ecstore_bucket;
+use rustfs_ecstore::api::capacity as ecstore_capacity;
+use rustfs_ecstore::api::client as ecstore_client;
+use rustfs_ecstore::api::compression as ecstore_compression;
+use rustfs_ecstore::api::config as ecstore_config;
+use rustfs_ecstore::api::data_usage as ecstore_data_usage;
+use rustfs_ecstore::api::disk as ecstore_disk;
+use rustfs_ecstore::api::error as ecstore_error;
+use rustfs_ecstore::api::global as ecstore_global;
+use rustfs_ecstore::api::layout as ecstore_layout;
+use rustfs_ecstore::api::notification as ecstore_notification;
+use rustfs_ecstore::api::rio as ecstore_rio;
+use rustfs_ecstore::api::set_disk as ecstore_set_disk;
+use rustfs_ecstore::api::storage as ecstore_storage;
+use rustfs_ecstore::api::tier as ecstore_tier;
 
 pub(crate) const MIN_DISK_COMPRESSIBLE_SIZE: usize = crate::app::storage_compat::ecstore_compression::MIN_DISK_COMPRESSIBLE_SIZE;
 

rustfs/src/capacity/storage_compat.rs

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use rustfs_ecstore::api::{disk as ecstore_disk, storage as ecstore_storage};
+use rustfs_ecstore::api::disk as ecstore_disk;
+use rustfs_ecstore::api::storage as ecstore_storage;
 
 pub(crate) type Endpoint = ecstore_disk::endpoint::Endpoint;
 

rustfs/src/error_storage_compat.rs

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use rustfs_ecstore::api::{bucket as ecstore_bucket, error as ecstore_error};
+use rustfs_ecstore::api::bucket as ecstore_bucket;
+use rustfs_ecstore::api::error as ecstore_error;
 
 pub(crate) type QuotaError = ecstore_bucket::quota::QuotaError;
 pub(crate) type StorageError = ecstore_error::StorageError;

rustfs/src/runtime_capabilities_storage_compat.rs

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use rustfs_ecstore::api::cluster as ecstore_cluster;
 #[cfg(test)]
 use rustfs_ecstore::api::disk as ecstore_disk;
-use rustfs_ecstore::api::{cluster as ecstore_cluster, layout as ecstore_layout};
+use rustfs_ecstore::api::layout as ecstore_layout;
 
 #[cfg(test)]
 pub(crate) type Endpoint = ecstore_disk::endpoint::Endpoint;

rustfs/src/server/storage_compat.rs

@@ -14,10 +14,14 @@
 
 use std::{collections::HashMap, sync::Arc};
 
-use rustfs_ecstore::api::{
-    config as ecstore_config, disk as ecstore_disk, error as ecstore_error, event as ecstore_event, global as ecstore_global,
-    layout as ecstore_layout, rpc as ecstore_rpc, storage as ecstore_storage,
-};
+use rustfs_ecstore::api::config as ecstore_config;
+use rustfs_ecstore::api::disk as ecstore_disk;
+use rustfs_ecstore::api::error as ecstore_error;
+use rustfs_ecstore::api::event as ecstore_event;
+use rustfs_ecstore::api::global as ecstore_global;
+use rustfs_ecstore::api::layout as ecstore_layout;
+use rustfs_ecstore::api::rpc as ecstore_rpc;
+use rustfs_ecstore::api::storage as ecstore_storage;
 
 pub(crate) const TONIC_RPC_PREFIX: &str = ecstore_rpc::TONIC_RPC_PREFIX;
 

rustfs/src/startup_storage_compat.rs

@@ -14,10 +14,13 @@
 
 use std::sync::Arc;
 
-use rustfs_ecstore::api::{
-    bucket as ecstore_bucket, config as ecstore_config, error as ecstore_error, global as ecstore_global,
-    layout as ecstore_layout, notification as ecstore_notification, storage as ecstore_storage,
-};
+use rustfs_ecstore::api::bucket as ecstore_bucket;
+use rustfs_ecstore::api::config as ecstore_config;
+use rustfs_ecstore::api::error as ecstore_error;
+use rustfs_ecstore::api::global as ecstore_global;
+use rustfs_ecstore::api::layout as ecstore_layout;
+use rustfs_ecstore::api::notification as ecstore_notification;
+use rustfs_ecstore::api::storage as ecstore_storage;
 
 pub(crate) type ECStore = ecstore_storage::ECStore;
 #[cfg(test)]

rustfs/src/storage/storage_compat.rs

@@ -14,12 +14,18 @@
 
 use std::sync::Arc;
 
+use rustfs_ecstore::api::admin as ecstore_admin;
+use rustfs_ecstore::api::bucket as ecstore_bucket;
 #[cfg(test)]
 use rustfs_ecstore::api::config as ecstore_config;
-use rustfs_ecstore::api::{
-    admin as ecstore_admin, bucket as ecstore_bucket, disk as ecstore_disk, error as ecstore_error, global as ecstore_global,
-    metrics as ecstore_metrics, rio as ecstore_rio, rpc as ecstore_rpc, set_disk as ecstore_set_disk, storage as ecstore_storage,
-};
+use rustfs_ecstore::api::disk as ecstore_disk;
+use rustfs_ecstore::api::error as ecstore_error;
+use rustfs_ecstore::api::global as ecstore_global;
+use rustfs_ecstore::api::metrics as ecstore_metrics;
+use rustfs_ecstore::api::rio as ecstore_rio;
+use rustfs_ecstore::api::rpc as ecstore_rpc;
+use rustfs_ecstore::api::set_disk as ecstore_set_disk;
+use rustfs_ecstore::api::storage as ecstore_storage;
 
 pub(crate) const BUCKET_ACCELERATE_CONFIG: &str = ecstore_bucket::metadata::BUCKET_ACCELERATE_CONFIG;
 pub(crate) const BUCKET_LOGGING_CONFIG: &str = ecstore_bucket::metadata::BUCKET_LOGGING_CONFIG;

rustfs/src/table_catalog_storage_compat.rs

@@ -14,7 +14,10 @@
 
 use std::{sync::Arc, time::Duration};
 
-use rustfs_ecstore::api::{bucket as ecstore_bucket, disk as ecstore_disk, error as ecstore_error, set_disk as ecstore_set_disk};
+use rustfs_ecstore::api::bucket as ecstore_bucket;
+use rustfs_ecstore::api::disk as ecstore_disk;
+use rustfs_ecstore::api::error as ecstore_error;
+use rustfs_ecstore::api::set_disk as ecstore_set_disk;
 
 pub(crate) const BUCKET_TABLE_CATALOG_META_PREFIX: &str = ecstore_bucket::metadata::BUCKET_TABLE_CATALOG_META_PREFIX;
 pub(crate) const BUCKET_TABLE_CATALOG_TABLE_BUCKETS_PREFIX: &str =