mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-24 13:16:28 +00:00
refactor(s3): consolidate semantic boundaries and remove s3-common (#3012)
* refactor(common): introduce rustfs-data-usage core crate * refactor(concurrency): migrate workers crate into concurrency * refactor(crypto): migrate appauth token APIs into crypto * fix docs urls * remove unused crate * refactor(data-usage): switch consumers to rustfs-data-usage * chore(fmt): apply cargo fmt and lockfile sync * refactor(common): remove data_usage compatibility re-export * refactor(capacity): move capacity_scope to object-capacity * refactor(io-metrics): relocate internode metrics from common * refactor(common): decouple scanner report from madmin * chore(fmt): normalize import ordering after pre-commit * refactor(s3): split s3 types and ops crates * refactor(s3): centralize event version and safe parsing * refactor(s3): add op-event compatibility guardrails * refactor(s3): add runtime op-event mismatch observability * refactor(s3): extract delete event mapping helper * refactor(s3): extract put event mapping helper * refactor(s3): consolidate remaining event semantic helpers * refactor(s3): add op-event coverage checks and observability alerts * refactor(s3-ops): consolidate op-event semantic mapping * refactor(scanner): remove last_minute wrapper module * refactor(scanner): consolidate duplicated data usage models
This commit is contained in:
@@ -29,7 +29,7 @@ use lapin::{
|
||||
options::{BasicAckOptions, BasicGetOptions, QueueBindOptions, QueueDeclareOptions, QueueDeleteOptions},
|
||||
types::FieldTable,
|
||||
};
|
||||
use rustfs_s3_common::EventName;
|
||||
use rustfs_s3_types::EventName;
|
||||
use rustfs_targets::Target;
|
||||
use rustfs_targets::check_amqp_broker_available;
|
||||
use rustfs_targets::target::EntityTarget;
|
||||
|
||||
@@ -70,7 +70,7 @@ fn make_args(dsn: &str, table: &str, queue_dir: &str) -> MySqlArgs {
|
||||
}
|
||||
}
|
||||
|
||||
fn make_entity(bucket: &str, object: &str, event_name: rustfs_s3_common::EventName) -> EntityTarget<serde_json::Value> {
|
||||
fn make_entity(bucket: &str, object: &str, event_name: rustfs_s3_types::EventName) -> EntityTarget<serde_json::Value> {
|
||||
EntityTarget {
|
||||
object_name: object.to_string(),
|
||||
bucket_name: bucket.to_string(),
|
||||
@@ -117,7 +117,7 @@ async fn direct_write_and_read() {
|
||||
|
||||
target.init().await.expect("init");
|
||||
|
||||
let entity = make_entity("mybucket", "obj.txt", rustfs_s3_common::EventName::ObjectCreatedPut);
|
||||
let entity = make_entity("mybucket", "obj.txt", rustfs_s3_types::EventName::ObjectCreatedPut);
|
||||
target.save(Arc::new(entity)).await.expect("save");
|
||||
|
||||
let pool = build_test_pool(&dsn);
|
||||
@@ -141,10 +141,10 @@ async fn delete_appends_row_does_not_remove_old() {
|
||||
|
||||
target.init().await.expect("init");
|
||||
|
||||
let put = make_entity("mybucket", "obj.txt", rustfs_s3_common::EventName::ObjectCreatedPut);
|
||||
let put = make_entity("mybucket", "obj.txt", rustfs_s3_types::EventName::ObjectCreatedPut);
|
||||
target.save(Arc::new(put)).await.expect("save put");
|
||||
|
||||
let delete = make_entity("mybucket", "obj.txt", rustfs_s3_common::EventName::ObjectRemovedDelete);
|
||||
let delete = make_entity("mybucket", "obj.txt", rustfs_s3_types::EventName::ObjectRemovedDelete);
|
||||
target.save(Arc::new(delete)).await.expect("save delete");
|
||||
|
||||
let pool = build_test_pool(&dsn);
|
||||
@@ -166,7 +166,7 @@ async fn queue_store_saves_entry_and_replays() {
|
||||
let target: MySqlTarget<serde_json::Value> =
|
||||
MySqlTarget::new("queue".to_string(), make_args(&dsn, &table, queue_dir)).expect("create target");
|
||||
|
||||
let entity = make_entity("mybucket", "obj.txt", rustfs_s3_common::EventName::ObjectCreatedPut);
|
||||
let entity = make_entity("mybucket", "obj.txt", rustfs_s3_types::EventName::ObjectCreatedPut);
|
||||
target.save(Arc::new(entity)).await.expect("save to queue");
|
||||
|
||||
let store = target.store().expect("store should exist");
|
||||
@@ -206,7 +206,7 @@ async fn duplicate_replay_produces_duplicate_rows() {
|
||||
let target: MySqlTarget<serde_json::Value> =
|
||||
MySqlTarget::new("dupe".to_string(), make_args(&dsn, &table, queue_dir)).expect("create target");
|
||||
|
||||
let entity = make_entity("mybucket", "obj.txt", rustfs_s3_common::EventName::ObjectCreatedPut);
|
||||
let entity = make_entity("mybucket", "obj.txt", rustfs_s3_types::EventName::ObjectCreatedPut);
|
||||
target.save(Arc::new(entity)).await.expect("save to queue");
|
||||
|
||||
target.init().await.expect("init");
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
//! podman rm -f rustfs-pg-test
|
||||
//! ```
|
||||
|
||||
use rustfs_s3_common::EventName;
|
||||
use rustfs_s3_types::EventName;
|
||||
use rustfs_targets::Target;
|
||||
use rustfs_targets::check_postgres_server_available;
|
||||
use rustfs_targets::target::EntityTarget;
|
||||
|
||||
Reference in New Issue
Block a user