Refactor: get deleted dists num prior to dumping them instead of fetc…

…hing all rows twice in db builder
Raku · Nov 25, 2015 · 727a71e · 727a71e
1 parent 76486e8
commit 727a71e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/lib/DbBuilder.pm b/lib/DbBuilder.pm
@@ -170,12 +170,9 @@ sub _metas {
 sub _remove_old_dists {
     my ( $self, $build_id ) = @_;
 
-    my $before = $self->_model_dists->find->@*;
-    $self->_model_dists->remove_old( $build_id );
-    my $after = $self->_model_dists->find->@*;
-    log info => 'Removed ' . ( $before - $after )
-            . ' dists that are no longer in the ecosystem'
-        if ($before - $after) != 0;
+    my $delta = $self->_model_dists->remove_old( $build_id );
+    log info => "Removed $delta dists that are no longer in the ecosystem"
+        if $delta;
 
     $self;
 }

diff --git a/lib/ModulesPerl6/Model/Dists.pm b/lib/ModulesPerl6/Model/Dists.pm
@@ -96,11 +96,13 @@ sub remove_old {
     my ( $self, $build_id ) = @_;
     length $build_id or croak 'Missing Build ID to keep';
 
-    $self->_db->resultset('Dist')->search({
+    my $res = $self->_db->resultset('Dist')->search({
         build_id => { '!=', $build_id }
-    })->delete_all;
+    });
+    my $num_deleted = $res->all;
+    $res->delete_all;
 
-    $self;
+    $num_deleted;
 }
 
 1;