query cleanups

metacpan · Apr 30, 2016 · ca63dab · ca63dab
1 parent fc12b19
commit ca63dab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/lib/MetaCPAN/Script/Pagerank.pm b/lib/MetaCPAN/Script/Pagerank.pm
@@ -29,7 +29,7 @@ sub run {
                         and => [
                             {
                                 term => {
-                                    'release.dependency.phase' => 'runtime'
+                                    'dependency.phase' => 'runtime'
                                 }
                             },
                             { term => { status => 'latest' } },
@@ -87,7 +87,7 @@ sub get_recent_modules {
         },
         size   => 1000,
         fields => [
-            qw(release distribution file.module.authorized file.module.indexed file.module.name)
+            qw(release distribution module.authorized module.indexed module.name)
         ],
         scroll => '1m',
     );

diff --git a/lib/MetaCPAN/Script/ReindexDist.pm b/lib/MetaCPAN/Script/ReindexDist.pm
@@ -34,10 +34,9 @@ has releases => (
 
 sub _build_releases {
     my ($self) = @_;
-    return [
-        $self->index->type('release')->filter(
-            { term => { 'release.distribution' => $self->distribution } }
-            )->fields( [qw( download_url )] )->sort( ['date'] )->size(5000)
+    return [ $self->index->type('release')
+            ->filter( { term => { distribution => $self->distribution } } )
+            ->fields( [qw( download_url )] )->sort( ['date'] )->size(5000)
             ->all
     ];
 }

diff --git a/lib/MetaCPAN/Script/Watcher.pm b/lib/MetaCPAN/Script/Watcher.pm
@@ -205,13 +205,13 @@ sub reindex_release {
                             and => [
                                 {
                                     term => {
-                                        'file.release' =>
+                                        'release' =>
                                             $release->{_source}->{name}
                                     }
                                 },
                                 {
                                     term => {
-                                        'file.author' =>
+                                        'author' =>
                                             $release->{_source}->{author}
                                     }
                                 }

diff --git a/lib/MetaCPAN/Server/Controller/Changes.pm b/lib/MetaCPAN/Server/Controller/Changes.pm
@@ -47,7 +47,7 @@ sub get : Chained('index') : PathPart('') : Args(2) {
                                     { term => { distribution => 'perl' } },
                                     {
                                         term => {
-                                            'file.name' => 'perldelta.pod'
+                                            'name' => 'perldelta.pod'
                                         }
                                     },
                                 ]
@@ -61,9 +61,7 @@ sub get : Chained('index') : PathPart('') : Args(2) {
                                     {
                                         or => [
                                             map {
-                                                { term =>
-                                                        { 'file.name' => $_ }
-                                                }
+                                                { term => { 'name' => $_ } }
                                             } @candidates
                                         ]
                                     }