Add check if an operation was cancelled (#1332)

Add checking if the download operation was cancelled after getting a result and not wait for all operations to be done. Relates-To: OLPEDGE-2746 Signed-off-by: Yevhenii Dudnyk <ext-yevhenii.dudnyk@here.com>
heremaps · Jun 8, 2022 · c0c6445 · c0c6445
1 parent 849fbd4
commit c0c6445
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 6 deletions.
diff --git a/olp-cpp-sdk-dataservice-read/src/DownloadItemsJob.h b/olp-cpp-sdk-dataservice-read/src/DownloadItemsJob.h
@@ -84,6 +84,16 @@ 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::ErrorCode::Cancelled, "Cancelled"}});
+        }
+        return;
+      }
+
       requests_failed_++;
     }
 

diff --git a/olp-cpp-sdk-dataservice-read/src/QueryMetadataJob.h b/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_));
       }

diff --git a/...s/integration/olp-cpp-sdk-dataservice-read/VersionedLayerClientPrefetchPartitionsTest.cpp b/...s/integration/olp-cpp-sdk-dataservice-read/VersionedLayerClientPrefetchPartitionsTest.cpp
@@ -216,6 +216,62 @@ 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;