Merge pull request #672 from metacpan/mickey/scripts_updating_distrib…

…ution_type Fix type updates in distribution
metacpan · May 30, 2017 · 8259336 · 8259336
2 parents 71c4524 + 5c76efc
commit 8259336
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/lib/MetaCPAN/Script/External.pm b/lib/MetaCPAN/Script/External.pm
@@ -76,6 +76,7 @@ sub update {
 
     while ( my $s = $scroll->next ) {
         my $name = $s->{_source}{name};
+        next unless $name;
 
         if ( exists $dist->{$name} ) {
             delete $dist->{$name}
@@ -93,13 +94,6 @@ sub update {
     );
 
     for my $d ( keys %{$dist} ) {
-        my $exists = $self->es->exists(
-            index => $self->index->name,
-            type  => 'distribution',
-            id    => $d,
-        );
-        next unless $exists;
-
         log_debug {"[$external_source] adding $d"};
         $bulk->update(
             {
@@ -108,7 +102,8 @@ sub update {
                     'external_package' => {
                         $external_source => $dist->{$d}
                     }
-                }
+                },
+                doc_as_upsert => 1,
             }
         );
     }

diff --git a/lib/MetaCPAN/Script/River.pm b/lib/MetaCPAN/Script/River.pm
@@ -27,17 +27,27 @@ sub run {
 
 sub index_river_summaries {
     my ( $self, $summaries ) = @_;
-    $self->index->refresh;
-    my $dists = $self->index->type('distribution');
-    my $bulk = $self->index->bulk( size => 300 );
-    for my $summary (@$summaries) {
+
+    my $bulk = $self->es->bulk_helper(
+        index => $self->index->name,
+        type  => 'distribution',
+    );
+
+    for my $summary ( @{$summaries} ) {
         my $dist = delete $summary->{dist};
-        my $doc  = $dists->get($dist);
-        $doc ||= $dists->new_document( { name => $dist } );
-        $doc->_set_river($summary);
-        $bulk->put($doc);
+
+        $bulk->update(
+            {
+                id  => $dist,
+                doc => {
+                    name  => $dist,
+                    river => $summary,
+                },
+                doc_as_upsert => 1,
+            }
+        );
     }
-    $bulk->commit;
+    $bulk->flush;
 }
 
 sub retrieve_river_summaries {