Check for cancellation after mutex

ad-freiburg · Nov 22, 2024 · 246b977 · 246b977
1 parent 5f28e83
commit 246b977
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/index/CompressedRelation.cpp b/src/index/CompressedRelation.cpp
@@ -77,8 +77,8 @@ CompressedRelationReader::asyncParallelBlockGenerator(
   auto readAndDecompressBlock = [&]()
       -> std::optional<
           std::pair<size_t, std::optional<DecompressedBlockAndMetadata>>> {
-    cancellationHandle->throwIfCancelled();
     std::unique_lock lock{blockIteratorMutex};
+    cancellationHandle->throwIfCancelled();
     if (blockMetadataIterator == endBlock) {
       return std::nullopt;
     }
@@ -102,8 +102,10 @@ CompressedRelationReader::asyncParallelBlockGenerator(
     CompressedBlock compressedBlock =
         readCompressedBlockFromFile(blockMetadata, columnIndices);
     lock.unlock();
+    cancellationHandle->throwIfCancelled();
     auto decompressedBlockAndMetadata = decompressAndPostprocessBlock(
         compressedBlock, blockMetadata.numRows_, scanConfig, blockMetadata);
+    cancellationHandle->throwIfCancelled();
     return std::pair{myIndex,
                      std::optional{std::move(decompressedBlockAndMetadata)}};
   };