Fixed a crash during the second merge phase where a batch was empty

phylo42 · Apr 17, 2024 · 7f1917f · 7f1917f
1 parent 32a1262
commit 7f1917f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/i2l b/i2l
diff --git a/ipk/src/db_builder.cpp b/ipk/src/db_builder.cpp
@@ -326,7 +326,10 @@ namespace ipk
         std::priority_queue<kmer_fv, std::vector<kmer_fv>, std::greater<>> heap;
         for (const auto& batch_db : batch_dbs)
         {
-            heap.push(batch_db.kmer_order[0]);
+            if (!batch_db.kmer_order.empty())
+            {
+                heap.push(batch_db.kmer_order[0]);
+            }
         }
 
         ProgressBar bar2{
@@ -438,7 +441,7 @@ namespace ipk
         for (size_t batch_id = 0; batch_id < _num_batches; ++batch_id)
         {
             batches.emplace_back(get_batch_db_name(batch_id));
-            auto& loader = batches[batch_id];
+            auto& loader= batches[batch_id];
 
             /// pre-load the first k-mer and push the loader to the queue
             if (loader.has_next())
+8 −15		CMakeLists.txt
+1 −0		examples/stats/src/main.cpp
+1 −1		include/i2l/phylo_tree.h
+7 −7		include/i2l/serialization.h