watcher: ES syntax update for newer version

Author: mickeyn

bin/watcher.pl

@@ -14,6 +14,7 @@
 use MetaCPAN::Ingest qw<
     cpan_dir
     read_recent_segment
+    true
 >;
 
 # args
@@ -93,9 +94,7 @@ ()
 
 sub backpan_changes () {
     my $scroll_release = $es_release->scroll(
-        size   => 1000,
         scroll => '1m',
-        fields => [qw< author archive >],
         body   => {
             query => {
                 bool => {
@@ -104,12 +103,14 @@ ()
                     ],
                 },
             },
+            size   => 1000,
+            _source => [qw< author archive >],
         },
     );
 
     my @changes;
     while ( my $release = $scroll_release->next ) {
-        my $data = $release->{fields};
+        my $data = $release->{_source};
         my $path
             = $cpan->child( 'authors',
             MetaCPAN::Util::author_dir( $data->{author} ),
@@ -187,8 +188,6 @@ ($release)
 
     my $scroll_file = $es_file->scroll( {
         scroll => '1m',
-        size   => 1000,
-        fields => [qw< _parent _source >],
         body   => {
             query => {
                 bool => {
@@ -206,6 +205,9 @@ ($release)
                     ],
                 },
             },
+            size   => 1000,
+            _source => true,
+            sort   => '_doc',
         },
     } );
     return if $dry_run;
@@ -218,9 +220,6 @@ ($release)
         $bulk_file->index( {
             id     => $row->{_id},
             source => {
-                $row->{fields}{_parent}
-                ? ( parent => $row->{fields}{_parent} )
-                : (),
                 %$source,
                 status => 'backpan',
             }
@@ -230,7 +229,8 @@ ($release)
     $bulk_release->index( {
         id     => $release->{_id},
         source => {
-            %{ $release->{_source} }, status => 'backpan',
+            %{ $release->{_source} },
+            status => 'backpan',
         }
     } );