Merge pull request #1967 from kuzudb/fix-asan

Fix asan
kuzudb · Aug 28, 2023 · feabe82 · feabe82
2 parents 8174d25 + 8664576
commit feabe82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 118 deletions.
diff --git a/src/include/storage/copier/read_file_state.h b/src/include/storage/copier/read_file_state.h
diff --git a/src/storage/copier/reader_state.cpp b/src/storage/copier/reader_state.cpp
@@ -237,14 +237,13 @@ std::unique_ptr<ReaderMorsel> ReaderSharedState::getParallelMorsel() {
 }
 
 std::unique_ptr<ReaderMorsel> ReaderSharedState::getMorselOfNextBlock() {
+    if (currFileIdx >= blockInfos.size()) {
+        return std::make_unique<ReaderMorsel>(currFileIdx, INVALID_BLOCK_IDX, INVALID_ROW_IDX);
+    }
     auto numBlocksInFile = blockInfos[currFileIdx].numRowsPerBlock.size();
     if (currBlockIdx >= numBlocksInFile) {
         currFileIdx += fileType == CopyDescription::FileType::NPY ? filePaths.size() : 1;
         currBlockIdx = 0;
-        if (currFileIdx >= filePaths.size()) {
-            // End of all files.
-            return std::make_unique<ReaderMorsel>();
-        }
     }
     return std::make_unique<ReaderMorsel>(currFileIdx, currBlockIdx++, currRowIdx);
 }