Skip to content

Commit 783d3ba

Browse files
bajajneha27bajajneha27
committed
No default for MaximumRangeSizeOption till we decide one
1 parent 4250a62 commit 783d3ba

File tree

5 files changed

+58
-63
lines changed

5 files changed

+58
-63
lines changed

‎google/cloud/storage/examples/storage_async_samples.cc‎

Lines changed: 44 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,16 @@ void OpenObjectReadFullObject(google::cloud::storage::AsyncClient& client,
288288
std::cout << "The range contains " << count << " newlines\n";
289289
}
290290

291-
void OpenMultipleObjectsRangedRead(
292-
google::cloud::storage_experimental::AsyncClient& client,
293-
std::vector<std::string> const& argv) {
291+
void OpenMultipleObjectsRangedRead(google::cloud::storage::AsyncClient& client,
292+
std::vector<std::string> const& argv) {
294293
//! [open-multiple-objects-ranged-read]
295294
// [START storage_open_multiple_objects_ranged_read]
296-
namespace gcs_ex = google::cloud::storage_experimental;
295+
namespace gcs = google::cloud::storage;
297296

298297
// Helper coroutine to count newlines returned by an AsyncReader.
299298
auto count_newlines =
300-
[](gcs_ex::AsyncReader reader,
301-
gcs_ex::AsyncToken token) -> google::cloud::future<std::uint64_t> {
299+
[](gcs::AsyncReader reader,
300+
gcs::AsyncToken token) -> google::cloud::future<std::uint64_t> {
302301
std::uint64_t count = 0;
303302
while (token.valid()) {
304303
auto [payload, t] = (co_await reader.Read(std::move(token))).value();
@@ -311,7 +310,7 @@ void OpenMultipleObjectsRangedRead(
311310
};
312311

313312
auto coro = [&count_newlines](
314-
gcs_ex::AsyncClient& client, std::string bucket_name,
313+
gcs::AsyncClient& client, std::string bucket_name,
315314
std::string object_name1, std::string object_name2,
316315
std::string object_name3) -> google::cloud::future<void> {
317316
// List of object names to read (passed as arguments)
@@ -323,7 +322,7 @@ void OpenMultipleObjectsRangedRead(
323322
// This example opens multiple objects, not one object multiple times.
324323
for (auto const& name : object_names) {
325324
auto descriptor =
326-
(co_await client.Open(gcs_ex::BucketName(bucket_name), name)).value();
325+
(co_await client.Open(gcs::BucketName(bucket_name), name)).value();
327326
auto [reader, token] = descriptor.Read(0, 1024);
328327
futures.push_back(count_newlines(std::move(reader), std::move(token)));
329328
}
@@ -387,7 +386,7 @@ void ReadAll(google::cloud::storage::AsyncClient& client,
387386
std::vector<std::string> const& argv) {
388387
//! [read-all]
389388
// [START storage_read_all]
390-
namespace gcs = google::cloud::storage;
389+
namespace gcs = google::cloud::storage;
391390
auto coro =
392391
[](gcs::AsyncClient& client, std::string bucket_name,
393392
std::string object_name) -> google::cloud::future<std::uint64_t> {
@@ -683,19 +682,18 @@ void ResumeUnbufferedUpload(google::cloud::storage::AsyncClient& client,
683682
std::cout << "Object successfully uploaded " << object.DebugString() << "\n";
684683
}
685684

686-
void CreateAndWriteAppendableObject(
687-
google::cloud::storage::AsyncClient& client,
688-
std::vector<std::string> const& argv) {
685+
void CreateAndWriteAppendableObject(google::cloud::storage::AsyncClient& client,
686+
std::vector<std::string> const& argv) {
689687
//! [create-and-write-appendable-object]
690688
// [START storage_create_and_write_appendable_object]
691689
namespace gcs = google::cloud::storage;
692690
auto coro = [](gcs::AsyncClient& client, std::string bucket_name,
693691
std::string object_name)
694692
-> google::cloud::future<google::storage::v2::Object> {
695-
auto [writer, token] = (co_await client.StartAppendableObjectUpload(
696-
gcs::BucketName(std::move(bucket_name)),
697-
std::move(object_name)))
698-
.value();
693+
auto [writer, token] =
694+
(co_await client.StartAppendableObjectUpload(
695+
gcs::BucketName(std::move(bucket_name)), std::move(object_name)))
696+
.value();
699697
std::cout << "Appendable upload started for object " << object_name "\n";
700698

701699
token = (co_await writer.Write(std::move(token),
@@ -729,9 +727,8 @@ void CreateAndWriteAppendableObject(
729727
std::cout << "File successfully uploaded " << object.DebugString() << "\n";
730728
}
731729

732-
void PauseAndResumeAppendableUpload(
733-
google::cloud::storage::AsyncClient& client,
734-
std::vector<std::string> const& argv) {
730+
void PauseAndResumeAppendableUpload(google::cloud::storage::AsyncClient& client,
731+
std::vector<std::string> const& argv) {
735732
//! [pause-and-resume-appendable-upload]
736733
// [START storage_pause_and_resume_appendable_upload]
737734
namespace gcs = google::cloud::storage;
@@ -761,10 +758,10 @@ void PauseAndResumeAppendableUpload(
761758
std::cout << "Object generation is " << metadata.generation() << "\n";
762759

763760
// Now resume the upload.
764-
std::tie(writer, token) = (co_await client.ResumeAppendableObjectUpload(
765-
gcs::BucketName(bucket_name), object_name,
766-
metadata.generation()))
767-
.value();
761+
std::tie(writer, token) =
762+
(co_await client.ResumeAppendableObjectUpload(
763+
gcs::BucketName(bucket_name), object_name, metadata.generation()))
764+
.value();
768765
std::cout << "Upload resumed from offset "
769766
<< absl::get<std::int64_t>(writer.PersistedState()) << "\n";
770767

@@ -785,20 +782,19 @@ void PauseAndResumeAppendableUpload(
785782
<< object.DebugString() << "\n";
786783
}
787784

788-
void FinalizeAppendableObjectUpload(
789-
google::cloud::storage::AsyncClient& client,
790-
std::vector<std::string> const& argv) {
785+
void FinalizeAppendableObjectUpload(google::cloud::storage::AsyncClient& client,
786+
std::vector<std::string> const& argv) {
791787
//! [finalize-appendable-object-upload]
792788
// [START storage_finalize_appendable_object_upload]
793789
namespace gcs = google::cloud::storage;
794790
auto coro = [](gcs::AsyncClient& client, std::string bucket_name,
795791
std::string object_name)
796792
-> google::cloud::future<google::storage::v2::Object> {
797793
// Start an appendable upload.
798-
auto [writer, token] = (co_await client.StartAppendableObjectUpload(
799-
gcs::BucketName(std::move(bucket_name)),
800-
std::move(object_name)))
801-
.value();
794+
auto [writer, token] =
795+
(co_await client.StartAppendableObjectUpload(
796+
gcs::BucketName(std::move(bucket_name)), std::move(object_name)))
797+
.value();
802798
std::cout << "Appendable upload started. \n";
803799

804800
// Write some data.
@@ -819,9 +815,8 @@ void FinalizeAppendableObjectUpload(
819815
std::cout << "Finalized object: " << object.DebugString() << "\n";
820816
}
821817

822-
void ReadAppendableObjectTail(
823-
google::cloud::storage_experimental::AsyncClient& client,
824-
std::vector<std::string> const& argv) {
818+
void ReadAppendableObjectTail(google::cloud::storage::AsyncClient& client,
819+
std::vector<std::string> const& argv) {
825820
//! [read-appendable-object-tail]
826821
// [START storage_read_appendable_object_tail]
827822
namespace gcs = google::cloud::storage;
@@ -844,9 +839,9 @@ void ReadAppendableObjectTail(
844839
// We simulate this by writing to the object.
845840
auto content =
846841
"More data for tail example, iteration " + std::to_string(i) + "\n";
847-
token = (co_await writer.Write(std::move(token),
848-
gcs::WritePayload(content)))
849-
.value();
842+
token =
843+
(co_await writer.Write(std::move(token), gcs::WritePayload(content)))
844+
.value();
850845
(void)co_await writer.Flush();
851846

852847
// Poll for new content by reading from the last known offset.
@@ -964,15 +959,13 @@ void OpenObjectMultipleRangedRead(google::cloud::storage::AsyncClient&,
964959
std::cerr << "AsyncClient::Open() example requires coroutines\n";
965960
}
966961

967-
void OpenMultipleObjectsRangedRead(
968-
google::cloud::storage::AsyncClient&,
969-
std::vector<std::string> const&) {
962+
void OpenMultipleObjectsRangedRead(google::cloud::storage::AsyncClient&,
963+
std::vector<std::string> const&) {
970964
std::cerr << "AsyncClient::Open() example requires coroutines\n";
971965
}
972966

973-
void OpenMultipleObjectsRangedRead(
974-
google::cloud::storage::AsyncClient&,
975-
std::vector<std::string> const&) {
967+
void OpenMultipleObjectsRangedRead(google::cloud::storage::AsyncClient&,
968+
std::vector<std::string> const&) {
976969
std::cerr << "AsyncClient::Open() example requires coroutines\n";
977970
}
978971

@@ -1040,28 +1033,25 @@ void ResumeUnbufferedUpload(google::cloud::storage::AsyncClient&,
10401033
<< "AsyncClient::ResumeUnbufferedUpload() example requires coroutines\n";
10411034
}
10421035

1043-
void CreateAndWriteAppendableObject(
1044-
google::cloud::storage::AsyncClient&,
1045-
std::vector<std::string> const&) {
1036+
void CreateAndWriteAppendableObject(google::cloud::storage::AsyncClient&,
1037+
std::vector<std::string> const&) {
10461038
std::cerr << "AsyncClient::CreateAndWriteAppendableObject() example requires "
10471039
"coroutines\n";
10481040
}
10491041

1050-
void PauseAndResumeAppendableUpload(
1051-
google::cloud::storage::AsyncClient&,
1052-
std::vector<std::string> const&) {
1042+
void PauseAndResumeAppendableUpload(google::cloud::storage::AsyncClient&,
1043+
std::vector<std::string> const&) {
10531044
std::cerr << "AsyncClient::PauseAndResumeAppendableUpload() example requires "
10541045
"coroutines\n";
10551046
}
10561047

1057-
void FinalizeAppendableObjectUpload(
1058-
google::cloud::storage_experimental::AsyncClient&,
1059-
std::vector<std::string> const&) {
1048+
void FinalizeAppendableObjectUpload(google::cloud::storage::AsyncClient&,
1049+
std::vector<std::string> const&) {
10601050
std::cerr << "AsyncClient::FinalizeAppendableObjectUpload() example requires "
10611051
"coroutines\n";
10621052
}
10631053

1064-
void ReadAppendableObjectTail(google::cloud::storage_experimental::AsyncClient&,
1054+
void ReadAppendableObjectTail(google::cloud::storage::AsyncClient&,
10651055
std::vector<std::string> const&) {
10661056
std::cerr << "AsyncClient::ReadAppendableObjectTail() example requires "
10671057
"coroutines\n";
@@ -1379,9 +1369,8 @@ void AutoRun(std::vector<std::string> const& argv) {
13791369
// Create a dummy object for the tail example to read. In a real
13801370
// application another process would be writing to this object.
13811371
(void)client
1382-
.InsertObject(
1383-
google::cloud::storage_experimental::BucketName(bucket_name),
1384-
object_name, "content for tail example\n")
1372+
.InsertObject(google::cloud::storage::BucketName(bucket_name),
1373+
object_name, "content for tail example\n")
13851374
.get()
13861375
.value();
13871376
ReadAppendableObjectTail(client, {bucket_name, object_name});

‎google/cloud/storage/examples/storage_otel_samples.cc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,25 @@ void InstrumentedClient(std::vector<std::string> const& argv) {
4141
}
4242
//! [instrumented-client]
4343
namespace gc = ::google::cloud;
44-
namespace gcs_ex = ::google::cloud::storage_experimental;
4544
[](std::string const& project_id, std::string const& bucket_name,
4645
std::string const& object_name) {
4746
auto configuration =
4847
gc::otel::ConfigureBasicTracing(gc::Project(project_id));
4948

50-
auto client = google::cloud::storage_experimental::AsyncClient(
49+
auto client = google::cloud::storage::AsyncClient(
5150
gc::Options{}.set<gc::OpenTelemetryTracingOption>(true));
5251

5352
auto coro = [&]() -> gc::future<void> {
5453
std::vector<std::string> data(1'000'000);
5554
std::generate(data.begin(), data.end(),
5655
[n = 0]() mutable { return std::to_string(++n) + "\n"; });
5756
auto metadata = co_await client.InsertObject(
58-
gcs_ex::BucketName(bucket_name), object_name, std::move(data));
57+
gcs::BucketName(bucket_name), object_name, std::move(data));
5958
if (!metadata) throw std::move(metadata).status();
6059

6160
std::int64_t count = 0;
6261
auto [reader, token] = (co_await client.ReadObject(
63-
gcs_ex::BucketName(bucket_name), object_name))
62+
gcs::BucketName(bucket_name), object_name))
6463
.value();
6564
while (token.valid()) {
6665
auto [payload, t] = (co_await reader.Read(std::move(token))).value();
@@ -71,8 +70,8 @@ void InstrumentedClient(std::vector<std::string> const& argv) {
7170
}
7271
std::cout << "Counted " << count << " 7's in the GCS object\n";
7372

74-
auto deleted = co_await client.DeleteObject(
75-
gcs_ex::BucketName(bucket_name), object_name);
73+
auto deleted = co_await client.DeleteObject(gcs::BucketName(bucket_name),
74+
object_name);
7675
if (!deleted.ok()) throw gc::Status(std::move(deleted));
7776

7877
co_return;

‎google/cloud/storage/internal/async/default_options.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ Options DefaultOptionsAsync(Options opts) {
7474
storage::StopOnConsecutiveErrorsResumePolicy())
7575
.set<storage::AsyncIdempotencyPolicyOption>(
7676
storage::MakeStrictAsyncIdempotencyPolicy)
77-
.set<storage::EnableCrc32cValidationOption>(true)
78-
.set<storage::MaximumRangeSizeOption>(128 * 1024 * 1024L));
77+
.set<storage::EnableCrc32cValidationOption>(true));
78+
// TODO(15340): This change is causing performance regression. We need to
79+
// revisit it after benchmarking our code.
80+
// .set<storage::MaximumRangeSizeOption>(128 * 1024 * 1024L));
7981
return Adjust(DefaultOptionsGrpc(std::move(opts)));
8082
}
8183

‎google/cloud/storage/internal/async/default_options_test.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ TEST(DefaultOptionsAsync, Adjust) {
8686
}
8787

8888
TEST(DefaultOptionsAsync, MaximumRangeSizeOption) {
89+
// TODO(15340): This change is causing performance regression. We need to
90+
// revisit it after benchmarking our code.
91+
GTEST_SKIP();
8992
auto const options = DefaultOptionsAsync({});
9093
auto const max_range_size_option =
9194
options.get<storage::MaximumRangeSizeOption>();

‎google/cloud/storage/tests/async_client_integration_test.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,6 +1005,8 @@ TEST_F(AsyncClientIntegrationTest, Open) {
10051005
}
10061006

10071007
TEST_F(AsyncClientIntegrationTest, OpenExceedMaximumRange) {
1008+
// TODO(15340): This change is causing performance regression. We need to
1009+
// revisit it after benchmarking our code.
10081010
GTEST_SKIP();
10091011
auto async =
10101012
AsyncClient(TestOptions().set<storage::MaximumRangeSizeOption>(1024));

0 commit comments

Comments
 (0)