Changeset 351

Timestamp:

01/26/11 02:29:37 (13 years ago)

Author:

nanardon

Message:

• optimize in a fester way

Location:

server/trunk/web/lib/Sophie

Files:

• Base/Result/Deps.pm (modified) (1 diff)
• Base/Result/Files.pm (modified) (1 diff)
• Base/Result/Rpms.pm (modified) (1 diff)
• Controller/Search.pm (modified) (6 diffs)
• Controller/Search/Rpm.pm (modified) (2 diffs)
• Model/BaseSearch.pm (modified) (3 diffs)

server/trunk/web/lib/Sophie/Base/Result/Deps.pm

@@ -11 +11 @@
 
 __PACKAGE__->add_relationship( RpmFile => 'Sophie::Base::Result::RpmFile',
-                             { pkgid => 'pkgid' });
+                             { 'foreign.pkgid' => 'self.pkgid' });
 1;

server/trunk/web/lib/Sophie/Base/Result/Files.pm

@@ -11 +11 @@
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');
 
+__PACKAGE__->add_relationship( RpmFile => 'Sophie::Base::Result::RpmFile',
+                             { 'foreign.pkgid' => 'self.pkgid' });
+
 
 1;

server/trunk/web/lib/Sophie/Base/Result/Rpms.pm

@@ -8 +8 @@
 __PACKAGE__->add_columns(qw/pkgid summary description issrc name evr arch header/);
 __PACKAGE__->set_primary_key(qw/pkgid/);
-__PACKAGE__->has_many(Rpmfile => 'Sophie::Base::Result::RpmFile', 'pkgid');
+__PACKAGE__->has_many(RpmFile => 'Sophie::Base::Result::RpmFile', 'pkgid');
 __PACKAGE__->has_many(Deps => 'Sophie::Base::Result::Deps', 'pkgid');
 __PACKAGE__->has_many(Files => 'Sophie::Base::Result::Files', 'pkgid');

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

@@ -191 +191 @@
     my ($self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
 
-        $c->model('BaseSearch')->best_rpm_filter($searchspec)
-        ->search({}, { select => [], join => [ 'Deps' ]})->search(
+        my $rs = $c->model('Base::Deps')->search(
         {
             -and => [
@@ -199 +198 @@
             ($depsense
                 ? ({-nest => \[
-                    'rpmdepmatch(Deps.flags, Deps.evr, rpmsenseflag(?), ?)',
+                    'rpmdepmatch(flags, me.evr, rpmsenseflag(?), ?)',
                     [ plain_text => $depsense],
                     [ plain_text => $depevr ]
@@ -205 +204 @@
             : ()),
             ($searchspec->{pkgid}
-                ? { 'Deps.pkgid' => $searchspec->{pkgid} }
+                ? { 'pkgid' => $searchspec->{pkgid} }
                 : ()),
             ]
         },
         {
-            '+select' => [ { rpmsenseflag => 'Deps.flags' }, 'Deps.depname',
-                'Deps.evr' ],
+            '+select' => [ { rpmsenseflag => 'flags' }, 'depname',
+                'me.evr' ],
             '+as'     => [ qw(sense name evr) ],
 
         }
     );
+    if (exists($searchspec->{src})) {
+        $rs = $rs->search_related('Rpms',
+            { issrc => $searchspec->{src} ? 1 : 0 }
+        )
+    }
+    return $c->model('BaseSearch')->apply_rpm_filter($rs, $searchspec);
 }
 
@@ -231 +236 @@
     $searchspec ||= {};
 
-    $c->model('BaseSearch')->best_rpm_filter($searchspec)
-        ->search({}, { select => [], join => [ 'Files' ]})->search(
+    my $rs = $c->model('Base::Files')->search(
         {
             -and => [
@@ -242 +246 @@
                 ($searchspec->{content} ? { has_content => 1 } : ()),
                 ($searchspec->{pkgid}
-                    ? { 'Files.pkgid' => { IN => $searchspec->{pkgid} } }
+                    ? { 'pkgid' => { IN => $searchspec->{pkgid} } }
                     : ()),
             ],
@@ -248 +252 @@
         {
             '+select' => [
-                'Files.contents is NOT NULL as has_content',
+                'contents is NOT NULL as has_content',
                 { rpmfilesmode => 'mode' },
-                map { 'Files.' . $_ } $c->model('Base::Files')->result_source->columns,
             ],
-            '+as' => [ qw(has_content perm),
-                $c->model('Base::Files')->result_source->columns ],
-        }
-    );
+            '+as' => [ qw(has_content perm), ]
+        }
+    );
+    if (exists($searchspec->{src})) {
+        $rs = $rs->search_related('Rpms',
+            { issrc => $searchspec->{src} ? 1 : 0 }
+        )
+    }
+    return $c->model('BaseSearch')->apply_rpm_filter($rs, $searchspec);
 }
 

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

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

server/trunk/web/lib/Sophie/Model/BaseSearch.pm

@@ -26 +26 @@
 sub c { $_[0]->{c} }
 
-sub distrib {
-    my ($self, $search) = @_;
+sub apply_rpm_filter {
+    my ($self, $rs, $search) = @_;
 
     # Nothing to filter
-    return if (!(
+    return $rs if (!(
         $search->{distribution} ||
         $search->{release} ||
@@ -37 +37 @@
         $search->{media_group}));
 
-    $self->c->model('Base::Distribution')->search(
-        {
-            $search->{distribution}
-                ? (-or => [
-                    { 'me.name' => $search->{distribution} },
-                    { shortname => $search->{distribution} },
-                ],)
-                : ()
-        },
-        {
-            select => [ qw(name shortname) ],
-        }
-
-    )->search_related('Release',
-        {
-            $search->{release}
-                ? (version => $search->{release})
-                : ()
-        },
-        {
-            select => [ qw(version) ],
-        }
-    )->search_related('Arch',
-        {
-            $search->{arch}
-                ? ('Arch.arch' => $search->{arch})
-                : ()
-        },
-        {
-            select => [ qw(arch) ],
-        }
-    )->search_related('Medias',
+    $rs->search_related('RpmFile')
+    ->search_related('MediasPaths')
+    ->search_related('Medias',
         {
             ($search->{media} ? (label => $search->{media}) : ()),
@@ -78 +49 @@
             select => [ qw(label group_label) ],
         }
+    )->search_related('Arch',
+        {
+            $search->{arch}
+            ? ('Arch.arch' => $search->{arch})
+            : ()
+        },
+        {
+            select => [ qw(arch) ],
+        }
+
+    )->search_related('Release',
+        {
+            $search->{release}
+            ? (version => $search->{release})
+            : ()
+        },
+        {
+            select => [ qw(version) ],
+        }
+    )->search_related('Distribution')->search(
+        {
+            $search->{distribution}
+            ? (-or => [
+                    { 'Distribution.name' => $search->{distribution} },
+                    { shortname => $search->{distribution} },
+                ],)
+            : ()
+        },
+        {
+            select => [ qw(name shortname) ],
+        }
     );
-}
-
-sub rpmfiles {
-    my ($self, $search) = @_;
-
-    my $rs_dist = $self->distrib($search);
-
-    $rs_dist
-        ? $rs_dist->search_related('MediasPaths')
-          ->search_related('RpmFiles')
-        : $self->c->model('Base::RpmFiles')
-}
-
-sub best_rpm_filter {
-    my ($self, $search) = @_;
-
-    my $rs_dist = $self->distrib($search);
-    return exists($search->{src})
-        ? ($rs_dist
-            ? $rs_dist->search_related('MediasPaths')
-              ->search_related('RpmFiles')
-              ->search_related('Rpms', { issrc => $search->{src} ? 1 : 0 })
-            : $self->c->model('Base::Rpms',  { issrc => $search->{src} ? 1 : 0 }))
-        : ($rs_dist
-            ? $rs_dist->search_related('MediasPaths')
-              ->search_related('RpmFiles')
-            : $self->c->model('Base::RpmFile'))
 }