Skip to content

Commit 8278940

Browse files
HJLebbinkHJLebbink
committed
made client Arc
1 parent c9d7458 commit 8278940

File tree

139 files changed

+2322
-1346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+2322
-1346
lines changed

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ring = { version = "0.17.14", optional = true, default-features = false, feature
4848
serde = { version = "1.0.219", features = ["derive"] }
4949
serde_json = "1.0.140"
5050
sha2 = { version = "0.10.8", optional = true }
51-
tokio = { version = "1.44.1", features = ["full"] }
51+
tokio = { version = "1.44.2", features = ["full"] }
5252
tokio-stream = "0.1.17"
5353
tokio-util = { version = "0.7.14", features = ["io"] }
5454
urlencoding = "2.1.3"
@@ -59,7 +59,7 @@ http = "1.3.1"
5959
[dev-dependencies]
6060
minio_common = { path = "./common" }
6161
async-std = { version = "1.13.1", features = ["attributes", "tokio1"] }
62-
clap = { version = "4.5.34", features = ["derive"] }
62+
clap = { version = "4.5.35", features = ["derive"] }
6363
quickcheck = "1.0.3"
6464
criterion = "0.5.1"
6565

‎benches/s3/bench_bucket_exists.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ pub(crate) fn bench_bucket_exists(criterion: &mut Criterion) {
2323
"bucket_exists",
2424
criterion,
2525
|| async { Ctx2::new().await },
26-
|ctx| BucketExists::new(&ctx.bucket).client(&ctx.client),
26+
|ctx| BucketExists::new(&ctx.client, ctx.bucket.to_owned()),
2727
);
2828
}

‎benches/s3/bench_bucket_lifecycle.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ pub(crate) fn bench_set_bucket_lifecycle(criterion: &mut Criterion) {
2727
|| async { Ctx2::new().await },
2828
|ctx| {
2929
let config = create_bucket_lifecycle_config_examples();
30-
SetBucketLifecycle::new(&ctx.bucket)
31-
.client(&ctx.client)
32-
.life_cycle_config(config)
30+
SetBucketLifecycle::new(&ctx.client, ctx.bucket.to_owned()).life_cycle_config(config)
3331
},
3432
)
3533
}
@@ -40,22 +38,22 @@ pub(crate) fn bench_get_bucket_lifecycle(criterion: &mut Criterion) {
4038
|| async {
4139
let ctx = Ctx2::new().await;
4240
let config = create_bucket_lifecycle_config_examples();
43-
SetBucketLifecycle::new(&ctx.bucket)
44-
.client(&ctx.client)
41+
ctx.client
42+
.set_bucket_lifecycle(&ctx.bucket)
4543
.life_cycle_config(config)
4644
.send()
4745
.await
4846
.unwrap();
4947
ctx
5048
},
51-
|ctx| GetBucketLifecycle::new(&ctx.bucket).client(&ctx.client),
49+
|ctx| GetBucketLifecycle::new(&ctx.client, ctx.bucket.to_owned()),
5250
)
5351
}
5452
pub(crate) fn bench_delete_bucket_lifecycle(criterion: &mut Criterion) {
5553
benchmark_s3_api(
5654
"delete_bucket_lifecycle",
5755
criterion,
5856
|| async { Ctx2::new().await },
59-
|ctx| DeleteBucketLifecycle::new(&ctx.bucket).client(&ctx.client),
57+
|ctx| DeleteBucketLifecycle::new(&ctx.client, ctx.bucket.to_owned()),
6058
)
6159
}

‎benches/s3/bench_bucket_notification.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ pub(crate) fn bench_set_bucket_notification(criterion: &mut Criterion) {
2828
|| async { Ctx2::new().await },
2929
|ctx| {
3030
let config = create_bucket_notification_config_example();
31-
SetBucketNotification::new(&ctx.bucket)
32-
.client(&ctx.client)
31+
SetBucketNotification::new(&ctx.client, ctx.bucket.to_owned())
3332
.notification_config(config)
3433
},
3534
)
@@ -42,15 +41,15 @@ pub(crate) fn bench_get_bucket_notification(criterion: &mut Criterion) {
4241
|| async {
4342
let ctx = Ctx2::new().await;
4443
let config = create_bucket_notification_config_example();
45-
SetBucketNotification::new(&ctx.bucket)
46-
.client(&ctx.client)
44+
ctx.client
45+
.set_bucket_notification(&ctx.bucket)
4746
.notification_config(config)
4847
.send()
4948
.await
5049
.unwrap();
5150
ctx
5251
},
53-
|ctx| GetBucketNotification::new(&ctx.bucket).client(&ctx.client),
52+
|ctx| GetBucketNotification::new(&ctx.client, ctx.bucket.to_owned()),
5453
)
5554
}
5655
#[allow(dead_code)]
@@ -59,6 +58,6 @@ pub(crate) fn bench_delete_bucket_notification(criterion: &mut Criterion) {
5958
"delete_bucket_notification",
6059
criterion,
6160
|| async { Ctx2::new().await },
62-
|ctx| DeleteBucketNotification::new(&ctx.bucket).client(&ctx.client),
61+
|ctx| DeleteBucketNotification::new(&ctx.client, ctx.bucket.to_owned()),
6362
)
6463
}

‎benches/s3/bench_bucket_policy.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ pub(crate) fn bench_set_bucket_policy(criterion: &mut Criterion) {
2727
|| async { Ctx2::new().await },
2828
|ctx| {
2929
let config = create_bucket_policy_config_example(&ctx.bucket);
30-
SetBucketPolicy::new(&ctx.bucket)
31-
.client(&ctx.client)
32-
.config(config)
30+
SetBucketPolicy::new(&ctx.client, ctx.bucket.to_owned()).config(config)
3331
},
3432
)
3533
}
@@ -40,22 +38,21 @@ pub(crate) fn bench_get_bucket_policy(criterion: &mut Criterion) {
4038
|| async {
4139
let ctx = Ctx2::new().await;
4240
let config = create_bucket_policy_config_example(&ctx.bucket);
43-
SetBucketPolicy::new(&ctx.bucket)
44-
.client(&ctx.client)
41+
SetBucketPolicy::new(&ctx.client, ctx.bucket.to_owned())
4542
.config(config)
4643
.send()
4744
.await
4845
.unwrap();
4946
ctx
5047
},
51-
|ctx| GetBucketPolicy::new(&ctx.bucket).client(&ctx.client),
48+
|ctx| GetBucketPolicy::new(&ctx.client, ctx.bucket.to_owned()),
5249
)
5350
}
5451
pub(crate) fn bench_delete_bucket_policy(criterion: &mut Criterion) {
5552
benchmark_s3_api(
5653
"delete_bucket_policy",
5754
criterion,
5855
|| async { Ctx2::new().await },
59-
|ctx| DeleteBucketPolicy::new(&ctx.bucket).client(&ctx.client),
56+
|ctx| DeleteBucketPolicy::new(&ctx.client, ctx.bucket.to_owned()),
6057
)
6158
}

‎benches/s3/bench_bucket_replication.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ pub(crate) fn bench_set_bucket_replication(criterion: &mut Criterion) {
5353
|ctx| {
5454
let config =
5555
create_bucket_replication_config_example(ctx.aux_bucket.clone().unwrap().as_str());
56-
SetBucketReplication::new(&ctx.bucket)
57-
.client(&ctx.client)
58-
.replication_config(config)
56+
SetBucketReplication::new(&ctx.client, ctx.bucket.to_owned()).replication_config(config)
5957
},
6058
)
6159
}
@@ -86,7 +84,7 @@ pub(crate) fn bench_get_bucket_replication(criterion: &mut Criterion) {
8684

8785
ctx
8886
},
89-
|ctx| GetBucketReplication::new(&ctx.bucket).client(&ctx.client),
87+
|ctx| GetBucketReplication::new(&ctx.client, ctx.bucket.to_owned()),
9088
)
9189
}
9290
#[allow(dead_code)]
@@ -116,6 +114,6 @@ pub(crate) fn bench_delete_bucket_replication(criterion: &mut Criterion) {
116114

117115
ctx
118116
},
119-
|ctx| DeleteBucketReplication::new(&ctx.bucket).client(&ctx.client),
117+
|ctx| DeleteBucketReplication::new(&ctx.client, ctx.bucket.to_owned()),
120118
)
121119
}

‎benches/s3/bench_bucket_tags.rs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use crate::common_benches::{Ctx2, benchmark_s3_api};
1717

1818
use criterion::Criterion;
1919
use minio::s3::builders::{DeleteBucketTags, GetBucketTags, SetBucketTags};
20-
use minio::s3::response::SetBucketTagsResponse;
2120
use minio::s3::types::S3Api;
2221
use minio_common::example::create_tags_example;
2322

@@ -26,11 +25,7 @@ pub(crate) fn bench_set_bucket_tags(criterion: &mut Criterion) {
2625
"set_bucket_tags",
2726
criterion,
2827
|| async { Ctx2::new().await },
29-
|ctx| {
30-
SetBucketTags::new(&ctx.bucket)
31-
.client(&ctx.client)
32-
.tags(create_tags_example())
33-
},
28+
|ctx| SetBucketTags::new(&ctx.client, ctx.bucket.to_owned()).tags(create_tags_example()),
3429
)
3530
}
3631
pub(crate) fn bench_get_bucket_tags(criterion: &mut Criterion) {
@@ -39,23 +34,22 @@ pub(crate) fn bench_get_bucket_tags(criterion: &mut Criterion) {
3934
criterion,
4035
|| async {
4136
let ctx = Ctx2::new().await;
42-
let _resp: SetBucketTagsResponse = ctx
43-
.client
37+
ctx.client
4438
.set_bucket_tags(&ctx.bucket)
4539
.tags(create_tags_example())
4640
.send()
4741
.await
4842
.unwrap();
4943
ctx
5044
},
51-
|ctx| GetBucketTags::new(&ctx.bucket).client(&ctx.client),
45+
|ctx| GetBucketTags::new(&ctx.client, ctx.bucket.to_owned()),
5246
)
5347
}
5448
pub(crate) fn bench_delete_bucket_tags(criterion: &mut Criterion) {
5549
benchmark_s3_api(
5650
"delete_bucket_tags",
5751
criterion,
5852
|| async { Ctx2::new().await },
59-
|ctx| DeleteBucketTags::new(&ctx.bucket).client(&ctx.client),
53+
|ctx| DeleteBucketTags::new(&ctx.client, ctx.bucket.to_owned()),
6054
)
6155
}

‎benches/s3/bench_bucket_versioning.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub(crate) fn bench_get_bucket_versioning(criterion: &mut Criterion) {
2323
"get_bucket_versioning",
2424
criterion,
2525
|| async { Ctx2::new().await },
26-
|ctx| GetBucketVersioning::new(&ctx.bucket).client(&ctx.client),
26+
|ctx| GetBucketVersioning::new(&ctx.client, ctx.bucket.to_owned()),
2727
)
2828
}
2929
pub(crate) fn bench_set_bucket_versioning(criterion: &mut Criterion) {
@@ -32,10 +32,8 @@ pub(crate) fn bench_set_bucket_versioning(criterion: &mut Criterion) {
3232
criterion,
3333
|| async { Ctx2::new().await },
3434
|ctx| {
35-
let status = VersioningStatus::Enabled;
36-
SetBucketVersioning::new(&ctx.bucket)
37-
.client(&ctx.client)
38-
.versioning_status(status)
35+
SetBucketVersioning::new(&ctx.client, ctx.bucket.to_owned())
36+
.versioning_status(VersioningStatus::Enabled)
3937
},
4038
)
4139
}

‎benches/s3/bench_list_bucket.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ pub(crate) fn bench_list_buckets(criterion: &mut Criterion) {
2323
"list_buckets",
2424
criterion,
2525
|| async { Ctx2::new().await },
26-
|ctx| ListBuckets::new().client(&ctx.client),
26+
|ctx| ListBuckets::new(&ctx.client),
2727
)
2828
}

‎benches/s3/bench_object_legal_hold.rs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,14 @@ use criterion::Criterion;
1919
use minio::s3::builders::{
2020
DisableObjectLegalHold, EnableObjectLegalHold, IsObjectLegalHoldEnabled,
2121
};
22+
use minio::s3::types::S3Api;
2223

2324
pub(crate) fn bench_enable_object_legal_hold(criterion: &mut Criterion) {
2425
benchmark_s3_api(
2526
"enable_object_legal_hold",
2627
criterion,
2728
|| async { Ctx2::new_with_object(true).await },
28-
|ctx| {
29-
EnableObjectLegalHold::new(&ctx.bucket)
30-
.client(&ctx.client)
31-
.object(ctx.object.clone())
32-
},
29+
|ctx| EnableObjectLegalHold::new(&ctx.client, ctx.bucket.to_owned(), ctx.object.to_owned()),
3330
)
3431
}
3532
pub(crate) fn bench_disable_object_legal_hold(criterion: &mut Criterion) {
@@ -38,21 +35,25 @@ pub(crate) fn bench_disable_object_legal_hold(criterion: &mut Criterion) {
3835
criterion,
3936
|| async { Ctx2::new_with_object(true).await },
4037
|ctx| {
41-
DisableObjectLegalHold::new(&ctx.bucket)
42-
.client(&ctx.client)
43-
.object(ctx.object.clone())
38+
DisableObjectLegalHold::new(&ctx.client, ctx.bucket.to_owned(), ctx.object.to_owned())
4439
},
4540
)
4641
}
4742
pub(crate) fn bench_is_object_legal_hold(criterion: &mut Criterion) {
4843
benchmark_s3_api(
4944
"is_object_legal_hold",
5045
criterion,
51-
|| async { Ctx2::new().await },
46+
|| async {
47+
let ctx = Ctx2::new_with_object(true).await;
48+
ctx.client
49+
.enable_object_legal_hold(&ctx.bucket, &ctx.object)
50+
.send()
51+
.await
52+
.unwrap();
53+
ctx
54+
},
5255
|ctx| {
53-
IsObjectLegalHoldEnabled::new(&ctx.bucket)
54-
.client(&ctx.client)
55-
.object(ctx.object.clone())
56+
IsObjectLegalHoldEnabled::new(&ctx.client, ctx.bucket.to_owned(), ctx.object.to_owned())
5657
},
5758
)
5859
}

0 commit comments

Comments
 (0)