cache gearman calls from web_ui in redis

diff --git a/web_ui.pl b/web_ui.pl
index 76d2132..4fe4b44 100755 (executable)
--- a/web_ui.pl
+++ b/web_ui.pl
@@ -79,6 +79,37 @@ get '/_g/status' => sub {
        _render_jsonp( $self, Mojo::JSON->new->encode({ status => $status }) );
 };
 
        _render_jsonp( $self, Mojo::JSON->new->encode({ status => $status }) );
 };
 

+sub _gearman_redis {
+       my ( $job, $params ) = @_;
+
+       my $key = $params;
+       $key =~ s/\W+/_/gs;
+       $key =~ s/\s+/_/gs;
+       $key = "sql.$key";
+       warn "# _gearman_redis $key";
+
+       my $redis = Redis->new;
+       my $ret;
+
+       if ( $ret = $redis->get($key) ) {
+               warn "redis hit $key\n";
+       } else {
+               $gearman->timeout(15);
+               $ret = $gearman->req( 'SUBMIT_JOB', $job, '', $params );
+               die "no result for $params" unless $ret;
+
+               $ret = Mojo::JSON->new->decode( $ret );
+               if ( ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY' ) {
+                       $ret->{error} = 'query run longer than ' . $gearman->timeout . ' s timeout';
+               } else {
+                       $redis->set($key => $ret);
+                       $redis->expire($key => 15);
+               }
+       }
+
+       return $ret;
+}
+

 get '/gnuplot' => sub {
        my $self = shift;
 
 get '/gnuplot' => sub {
        my $self = shift;
 


@@ -97,14 +128,7 @@ get '/gnuplot' => sub {
        $sql =~ s/\s+(from|where|order|limit|join)/\n$1/gs;
        $self->param( sql => $sql );
 
        $sql =~ s/\s+(from|where|order|limit|join)/\n$1/gs;
        $self->param( sql => $sql );
 

-       $gearman->timeout(15);
-       my $ret = $gearman->req( 'SUBMIT_JOB', 'Store_sql', '', $sql );
-       die "no result for $sql" unless $ret;
-
-       $ret = Mojo::JSON->new->decode( $ret );
-       
-       $ret->{error} = 'query run longer than ' . $gearman->timeout . ' s timeout'
-               if ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY';
+       my $ret = _gearman_redis( 'Store_sql' => $sql );

 
        return $self->render('gnuplot', sql => $sql, img => '', gnuplot => $ret->{error} )
                if exists $ret->{error};
 
        return $self->render('gnuplot', sql => $sql, img => '', gnuplot => $ret->{error} )
                if exists $ret->{error};