14484: Fixes bug in pdh transaction grouping

[arvados.git] / services / api / app / models / container.rb

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index b3328d9c76942949f8153449ec1368e4eb8418ba..e46ef6fd378ce225c2fb8d8d75f66735b37ee3bf 100644 (file)
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -428,11 +428,9 @@ class Container < ArvadosModel
         "WHERE portable_data_hash > '#{last_pdh}' "\
         'GROUP BY portable_data_hash LIMIT 1000'
       )
-      if pdhs.rows.count.zero?
-        break
-      end
+      break if pdhs.rows.count.zero?
 
-      Container.group_pdhs_by_manifest_size(pdhs, batch_size_max) do |grouped_pdhs|
+      Container.group_pdhs_by_manifest_size(pdhs.rows, batch_size_max) do |grouped_pdhs|
         any = true
         yield grouped_pdhs
         done += grouped_pdhs.size