Changeset 350

Timestamp:

01/26/11 01:08:41 (13 years ago)

Author:

nanardon

Message:

• fix optimisations

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Search.pm (modified) (5 diffs)
• Search/Rpm.pm (modified) (2 diffs)

server/trunk/web/lib/Sophie/Controller/Search.pm

@@ -192 +192 @@
 
         $c->model('BaseSearch')->best_rpm_filter($searchspec)
-        ->search({}, { join => [ 'Deps' ]})->search(
+        ->search({}, { select => [], join => [ 'Deps' ]})->search(
         {
             -and => [
@@ -210 +210 @@
         },
         {
-            '+select' => [ { rpmsenseflag => 'Deps.flags' }, 'Deps.depname', ],
-            '+as'     => [ qw(sense name) ],
+            '+select' => [ { rpmsenseflag => 'Deps.flags' }, 'Deps.depname',
+                'Deps.evr' ],
+            '+as'     => [ qw(sense name evr) ],
 
         }
@@ -230 +231 @@
     $searchspec ||= {};
 
-    my $distrs = $c->forward('distrib_search', [ $searchspec, 1 ]);
-
-    return $c->model('Base::Files')->search(
+    $c->model('BaseSearch')->best_rpm_filter($searchspec)
+        ->search({}, { select => [], join => [ 'Files' ]})->search(
         {
             -and => [
@@ -241 +241 @@
                 basename => $basename,
                 ($searchspec->{content} ? { has_content => 1 } : ()),
-                ($distrs 
-                    ? (pkgid => { IN => $distrs->get_column('pkgid')->as_query, },)
-                    : ()),
                 ($searchspec->{pkgid}
-                    ? { pkgid => { IN => $searchspec->{pkgid} } }
+                    ? { 'Files.pkgid' => { IN => $searchspec->{pkgid} } }
                     : ()),
             ],
@@ -251 +248 @@
         {
             '+select' => [
-                'contents is NOT NULL as has_content',
+                'Files.contents is NOT NULL as has_content',
                 { rpmfilesmode => 'mode' },
+                map { 'Files.' . $_ } $c->model('Base::Files')->result_source->columns,
             ],
-            '+as' => [ qw(has_content perm), ],
+            '+as' => [ qw(has_content perm),
+                $c->model('Base::Files')->result_source->columns ],
         }
     );

server/trunk/web/lib/Sophie/Controller/Search/Rpm.pm

@@ -104 +104 @@
             $depsense, $depevr 
         ],
-    )->get_column('pkgid');
+    )->get_column('Deps.pkgid');
     $c->stash->{rs} = $c->model('Base::Rpms')->search(
         {
@@ -135 +135 @@
 
     my $filers = $c->forward('/search/file_rs', [ $searchspec, $file ])
-        ->get_column('pkgid');
+        ->get_column('Files.pkgid');
     $c->stash->{rs} = $c->model('Base::Rpms')->search(
         {
-            pkgid => { IN => $filers->as_query, },
+            'pkgid' => { IN => $filers->as_query, },
         },
         {