fix(storage): rollback multi stream code changes to avoid performance regression (#15471)

Author: bajajneha27

google/cloud/storage/async/object_descriptor.cc

@@ -27,11 +27,14 @@ absl::optional<google::storage::v2::Object> ObjectDescriptor::metadata() const {
 
 std::pair<AsyncReader, AsyncToken> ObjectDescriptor::Read(std::int64_t offset,
                                                           std::int64_t limit) {
-  std::int64_t max_range =
-      impl_->options().get<storage_experimental::MaximumRangeSizeOption>();
-  if (limit > max_range) {
-    impl_->MakeSubsequentStream();
-  }
+  // TODO(15340): This change is causing performance regression. We need to
+  // revisit it after benchmarking our code.
+
+  // std::int64_t max_range =
+  // impl_->options().get<storage_experimental::MaximumRangeSizeOption>();
+  // if (limit > max_range) {
+  //   impl_->MakeSubsequentStream();
+  // }
   auto reader = impl_->Read({offset, limit});
   auto token = storage_internal::MakeAsyncToken(reader.get());
   return {AsyncReader(std::move(reader)), std::move(token)};

google/cloud/storage/async/object_descriptor_test.cc

@@ -149,6 +149,7 @@ TEST(ObjectDescriptor, ReadLast) {
 }
 
 TEST(ObjectDescriptor, ReadExceedsMaxRange) {
+  GTEST_SKIP();
   auto mock = std::make_shared<MockAsyncObjectDescriptorConnection>();
   auto constexpr kMaxRange = 1024;
   EXPECT_CALL(*mock, options)

google/cloud/storage/tests/async_client_integration_test.cc

@@ -964,7 +964,7 @@ TEST_F(AsyncClientIntegrationTest, Open) {
 }
 
 TEST_F(AsyncClientIntegrationTest, OpenExceedMaximumRange) {
-  if (!UsingEmulator()) GTEST_SKIP();
+  GTEST_SKIP();
   auto async = AsyncClient(
       TestOptions().set<storage_experimental::MaximumRangeSizeOption>(1024));
   auto client = MakeIntegrationTestClient(true, TestOptions());