X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=web_ui.pl;h=36d00de60f24684d46addf01a43ebf3182eb0c81;hb=b7ad83dc3edd53f4023f67440774c636e120cec2;hp=d174c20f8b68e484a59f936f8747c109885d3daa;hpb=11f4fec8111adab52ffb0bd38d56edac01924d6b;p=APKPM.git

diff --git a/web_ui.pl b/web_ui.pl
index d174c20..36d00de 100755
--- a/web_ui.pl
+++ b/web_ui.pl
@@ -8,6 +8,8 @@ use MojoX::Gearman;
 
 use lib 'lib';
 use APKPM::Model;
+use Redis;
+use Encode;
 
 use Data::Dump qw(dump);
 
@@ -54,9 +56,61 @@ sub _render_jsonp {
 
 get '/g/:call/:args' => [ args => qr/.*/ ] => sub {
 	my $self = shift;
-	my $ret = $gearman->req( 'SUBMIT_JOB', $self->param('call'), '', $self->param('args') );
-	warn $self->param('call'), " = ", dump($ret), "\n";
-	die "no result for ", $self->param('call'), ' args: ', $self->param('args') unless defined $ret;
+
+	my $call = $self->param('call');
+	my $args = $self->param('args');
+
+	if ( $call =~ m/^(LDAP|CRM)_search/ ) {
+		my $k = $1 . '.*' . $args . '*';
+		my $redis = Redis->new;
+		if ( my @k = $redis->keys( $k ) ) {
+			my $ret = join(',', map { $redis->get($_) } @k );
+			return _render_jsonp( $self, "[$ret]" );
+		}
+	}
+
+	my $ret = $gearman->req( 'SUBMIT_JOB', $call, '', $args );
+	warn "$call = ", dump($ret), "\n";
+	die "no result for $call args: $args" unless defined $ret;
+	_render_jsonp( $self, $ret );
+};
+
+get '/table/:table' => sub {
+	my $self = shift;
+
+	my $table = $self->param('table');
+	my $username = $self->param('username');
+	my $limit = $self->param('limit') || 1;
+
+	warn "/table/$table $username $limit";
+
+	my $sql = "select * from $table";
+	$sql .= " where username = '$username'" if $username;
+	$sql .= " limit $limit";
+
+	my $ret;
+	if ( $limit == 1 ) {
+		my $redis = Redis->new;
+		my $json = Mojo::JSON->new->decode( $redis->get( "table.$table.$username" ) );
+		warn "redis hit table.$table.$username";
+
+		# generate result as Store_sql does
+
+		my @c = split(/\s+/, $redis->get("pg.$table"));
+		my ($hash_col) = grep { $c[$_] eq 'h' } 0 .. $#c;
+
+		$ret = {
+			columns => \@c,
+			hash_col => $hash_col,
+			rows => [[ map { $json->{$_} } @c ]],
+		};
+		$ret = Mojo::JSON->new->encode($ret);
+	}
+	if ( ! $ret ) {
+		$ret = $gearman->req( 'SUBMIT_JOB', 'Store_sql', '', $sql );
+		warn "gearman $sql";
+	}
+	warn ">>> $ret";
 	_render_jsonp( $self, $ret );
 };
 
@@ -80,35 +134,34 @@ get '/_g/status' => sub {
 };
 
 sub _gearman_redis {
-	my ( $job, $params ) = @_;
+	my ( $job, $params, $timeout ) = @_;
 
 	my $key = $params;
 	$key =~ s/\W+/_/gs;
 	$key =~ s/\s+/_/gs;
 	$key = "sql.$key";
-	warn "# _gearman_redis $key";
+	warn "# _gearman_redis $key [$timeout s]";
 
 	my $redis = Redis->new;
-	my $ret;
+	my $json;
 
-	if ( $ret = $redis->get($key) ) {
+	if ( $json = $redis->get($key) ) {
 		warn "redis hit $key\n";
-		$redis->expire($key => 15); # refresh key timeout
 	} else {
-		$gearman->timeout(15);
-		$ret = $gearman->req( 'SUBMIT_JOB', $job, '', $params );
-		die "no result for $params" unless $ret;
-
-		$redis->set($key => $ret);
-		$redis->expire($key => 15);
+		$gearman->timeout($timeout);
+		$json = $gearman->req( 'SUBMIT_JOB', $job, '', $params );
+		die "no result for $params" unless $json;
 	}
 
-	$ret = Mojo::JSON->new->decode( $ret );
+	my $ret = Mojo::JSON->new->decode( $json );
 
 	if ( ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY' ) {
 		$ret->{error} = 'query run longer than ' . $gearman->timeout . ' s timeout';
 	}
 
+	$redis->set($key => $json);
+	$redis->expire($key => 60); # refresh redis key timeout
+
 	return $ret;
 }
 
@@ -130,15 +183,18 @@ get '/gnuplot' => sub {
 	$sql =~ s/\s+(from|where|order|limit|join)/\n$1/gs;
 	$self->param( sql => $sql );
 
-	my $ret = _gearman_redis( 'Store_sql' => $sql );
+	my $ret = _gearman_redis( 'Store_sql' => $sql, $self->param('timeout') );
 
 	return $self->render('gnuplot', sql => $sql, img => '', gnuplot => $ret->{error} )
 		if exists $ret->{error};
 
 	my $dir = $self->app->home->rel_dir('public');
 
+	my $with = $self->param('with') || 'dots';
+
 	my $name = $sql;
 	$name =~ s/\W+//gs;
+	$name .= $with;
 	$name .= '.png';
 
 warn "# $sql -> $name";
@@ -180,7 +236,6 @@ set xtics nomirror rotate by -90
 	}
 
 	my $plot = 'plot ';
-	my $with = $self->param('with') || 'dots';
 	foreach my $i ( 1 .. $#{ $ret->{rows}->[0] } ) {
 		$gnuplot .= $plot; $plot = ',';
 		$gnuplot .= qq| '-' using 1:2 with $with title "$c[$i]" |;