Revert "Add check if an operation was cancelled" (#1339)

This reverts commit 6ae2ab2
and c0c6445

Relates-To: OLPEDGE-2746

Signed-off-by: Yevhenii Dudnyk <[email protected]>

Author: dudnyk

olp-cpp-sdk-dataservice-read/src/DownloadItemsJob.h

@@ -84,16 +84,6 @@ class DownloadItemsJob {
     if (response.IsSuccessful()) {
       requests_succeeded_++;
     } else {
-      if (response.GetError().GetErrorCode() ==
-              olp::client::ErrorCode::Cancelled &&
-          user_callback_) {
-        auto user_callback = std::move(user_callback_);
-        if (user_callback) {
-          user_callback(client::ApiError::Cancelled());
-        }
-        return;
-      }
-
       requests_failed_++;
     }
 
@@ -105,7 +95,7 @@ class DownloadItemsJob {
           GetAccumulatedBytes(accumulated_statistics_)});
     }
 
-    if (!--download_task_count_ && user_callback_) {
+    if (!--download_task_count_) {
       OLP_SDK_LOG_DEBUG_F("DownloadItemsJob",
                           "Download complete, succeeded=%zu, failed=%zu",
                           requests_succeeded_, requests_failed_);

olp-cpp-sdk-dataservice-read/src/QueryMetadataJob.h

@@ -112,18 +112,18 @@ class QueryMetadataJob {
       }
     }
 
-    if (canceled_) {
-      download_job_->OnPrefetchCompleted(
-          {{client::ErrorCode::Cancelled, "Cancelled"}});
-      return;
-    }
-
     if (!--query_count_) {
       if (CheckIfFail()) {
         download_job_->OnPrefetchCompleted(query_errors_.front());
         return;
       }
 
+      if (canceled_) {
+        download_job_->OnPrefetchCompleted(
+            {{client::ErrorCode::Cancelled, "Cancelled"}});
+        return;
+      }
+
       if (filter_) {
         query_result_ = filter_(std::move(query_result_));
       }

tests/integration/olp-cpp-sdk-dataservice-read/VersionedLayerClientPrefetchPartitionsTest.cpp

@@ -216,62 +216,6 @@ TEST_F(VersionedLayerClientPrefetchPartitionsTest, PrefetchPartitionsFails) {
   }
 }
 
-TEST_F(VersionedLayerClientPrefetchPartitionsTest, PrefetchPartitionCancelled) {
-  auto partitions_count = 1;
-  auto client =
-      read::VersionedLayerClient(kCatalogHrn, kLayer, boost::none, settings_);
-  auto partitions = GeneratePartitionIds(partitions_count);
-  auto partitions_response =
-      ReadDefaultResponses::GeneratePartitionsResponse(partitions_count);
-  const auto request =
-      read::PrefetchPartitionsRequest().WithPartitionIds(partitions);
-  {
-    SCOPED_TRACE("Get version fails");
-
-    ExpectVersionRequest(
-        http::NetworkResponse().WithStatus(HttpStatusCode::BAD_REQUEST));
-
-    auto future = client.PrefetchPartitions(request).GetFuture();
-    ASSERT_NE(future.wait_for(std::chrono::seconds(kTimeout)),
-              std::future_status::timeout);
-
-    auto response = future.get();
-    ASSERT_FALSE(response.IsSuccessful());
-  }
-  {
-    SCOPED_TRACE("Query partition fails");
-    ExpectVersionRequest();
-    ExpectQueryPartitionsRequest(
-        partitions, partitions_response,
-        http::NetworkResponse().WithStatus(HttpStatusCode::BAD_REQUEST));
-
-    auto future = client.PrefetchPartitions(request).GetFuture();
-    ASSERT_NE(future.wait_for(std::chrono::seconds(kTimeout)),
-              std::future_status::timeout);
-
-    auto response = future.get();
-    ASSERT_FALSE(response.IsSuccessful());
-  }
-  {
-    SCOPED_TRACE("Get data cancelled");
-    ExpectQueryPartitionsRequest(partitions, partitions_response);
-
-    ExpectBlobRequest(
-        partitions_response.GetPartitions().begin()->GetDataHandle(), "data",
-        http::NetworkResponse().WithStatus(
-            static_cast<int>(http::ErrorCode::CANCELLED_ERROR)));
-
-    auto test_request = client.PrefetchPartitions(request);
-    auto future = test_request.GetFuture();
-    ASSERT_NE(future.wait_for(std::chrono::seconds(kTimeout)),
-              std::future_status::timeout);
-
-    auto response = future.get();
-    ASSERT_FALSE(response.IsSuccessful());
-    ASSERT_EQ(response.GetError().GetErrorCode(), client::ErrorCode::Cancelled);
-  }
-}
-
 TEST_F(VersionedLayerClientPrefetchPartitionsTest, PrefetchBatchFails) {
   // Should result in two metadata query
   constexpr auto partitions_count = 200u;