percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 903510: pt-tcp-model throws an error in --type=requests mode on empty file

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-07-30 11:52:53 -03:00
parent 2f0812fb33
commit b93856a37d
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/pt-tcp-model
View File

@@ -1832,7 +1832,10 @@ sub parse_event {
if ( $self->{in_prg} ) { if ( $self->{in_prg} ) {
die "Error: no more lines, but in_prg = $self->{in_prg}"; die "Error: no more lines, but in_prg = $self->{in_prg}";
} }
if ( $self->{t_start} < $self->{current_ts} ) { if ( defined $self->{t_start}
&& defined $self->{current_ts}
&& $self->{t_start} < $self->{current_ts} )
{
PTDEBUG && _d("Returning event based on what's been seen"); PTDEBUG && _d("Returning event based on what's been seen");
return $self->make_event($self->{t_start}, $self->{current_ts}); return $self->make_event($self->{t_start}, $self->{current_ts});
} }

5
lib/TCPRequestAggregator.pm
View File

@@ -122,7 +122,10 @@ sub parse_event {
if ( $self->{in_prg} ) { if ( $self->{in_prg} ) {
die "Error: no more lines, but in_prg = $self->{in_prg}"; die "Error: no more lines, but in_prg = $self->{in_prg}";
} }
if ( $self->{t_start} < $self->{current_ts} ) { if ( defined $self->{t_start}
&& defined $self->{current_ts}
&& $self->{t_start} < $self->{current_ts} )
{
PTDEBUG && _d("Returning event based on what's been seen"); PTDEBUG && _d("Returning event based on what's been seen");
return $self->make_event($self->{t_start}, $self->{current_ts}); return $self->make_event($self->{t_start}, $self->{current_ts});
} }

16
t/pt-tcp-model/analyses.t
View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 2; use Test::More;
use PerconaTest; use PerconaTest;
shift @INC; # our unshift (above) shift @INC; # our unshift (above)
@@ -45,7 +45,19 @@ ok(
'Analysis for sorted001.txt (issue 1341)' 'Analysis for sorted001.txt (issue 1341)'
); );
($output) = full_output(
sub { pt_tcp_model::main(@args,
'--type=requests', "$trunk/t/lib/samples/empty.txt"
) }
);
is(
$output,
'',
"--type=requests doesn't die on an empty file",
);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
exit; done_testing;