Changeset 108

Timestamp:

12/10/10 19:54:46 (13 years ago)

Author:

nanardon

Message:

• use a timeout to not overload SQL server

Location:

server/trunk/web

Files:

• lib/Sophie/Base/Async.pm (added)
• lib/Sophie/Controller/0Explorer.pm (modified) (2 diffs)
• root/templates/html/0explorer/dir.tt (modified) (2 diffs)

server/trunk/web/lib/Sophie/Controller/0Explorer.pm

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
+use DBD::Pg qw(:async);
+use Sophie::Base::Async;
 
 BEGIN {extends 'Catalyst::Controller'; }
@@ -31 +33 @@
             $c->session->{__explorer}, 1 ]);
     my %uniq;
-    foreach (
-        $c->model('Base')
-        ->resultset('Files')
-        ->search(
-            {
-                dirname => '/' . ($dir ? "$dir/" : ''),
-                ($rsdist 
-                    ? (pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },)
-                    : ()),
-                ($c->req->param('filename')
-                    ? ( basename => { LIKE => $c->req->param('filename') . '%' } )
-                    : ()),
-            },
-            {
-                #order_by => [ 'basename' ],
-                #group_by => [ 'basename' ], 
-                select => [ 'basename' ],
-            }
-        )->get_column('basename')->all) {
-        $uniq{$_} = 1;
+
+    my $query = Sophie::Base::Async->new(
+        $c->model('Base'),
+        timeout => 10,
+        build => sub { $_[0]
+            ->resultset('Files')
+            ->search(
+                {
+                    dirname => '/' . ($dir ? "$dir/" : ''),
+                    ($rsdist 
+                        ? (pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },)
+                        : ()),
+                    ($c->req->param('filename')
+                        ? ( basename => { LIKE => $c->req->param('filename') . '%' } )
+                        : ()),
+                },
+                {
+                    #order_by => [ 'basename' ],
+                    #group_by => [ 'basename' ], 
+                    select => [ 'basename' ],
+                }
+            )
+            ->get_column('basename')
+        },
+    );
+
+    if(my $sth = $query->wait_result) {
+        while (my $res = $sth->fetchrow_hashref()) {
+            $uniq{$res->{basename}} = 1;
+        }
+    } else {
+        $c->stash->{timeout} = 1;
     }
+
     $c->stash->{xmlrpc} = [ sort keys %uniq ]; 
 }

server/trunk/web/root/templates/html/0explorer/dir.tt

@@ -1 +1 @@
 <!-- $Id -->
 
+[% IF timeout %]
+[% ELSE %]
 [% IF xmlrpc.size %]
 [% FOREACH dir = xmlrpc %]
@@ -9 +11 @@
 No sub directories
 [% END %]
+[% END %]