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

Merged fix-821703-processlist-null-state

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-07-30 16:48:15 -03:00
parent 2f0812fb33 28894c3f1e
commit ba6253545d
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-kill
View File

@@ -2959,7 +2959,7 @@ sub parse_event {
int($query_start), # START int($query_start), # START
$etime, # ETIME $etime, # ETIME
$time, # FSEEN $time, # FSEEN
{ $curr->[STATE] => 0 }, # PROFILE { ($curr->[STATE] || "") => 0 }, # PROFILE
]; ];
} }
} }
@@ -2973,7 +2973,7 @@ sub parse_event {
int($query_start), # START int($query_start), # START
$etime, # ETIME $etime, # ETIME
$time, # FSEEN $time, # FSEEN
{ $curr->[STATE] => 0 }, # PROFILE { ($curr->[STATE] || "") => 0 }, # PROFILE
]; ];
} }
} }

4
bin/pt-query-digest
View File

@@ -2398,7 +2398,7 @@ sub parse_event {
int($query_start), # START int($query_start), # START
$etime, # ETIME $etime, # ETIME
$time, # FSEEN $time, # FSEEN
{ $curr->[STATE] => 0 }, # PROFILE { ($curr->[STATE] || "") => 0 }, # PROFILE
]; ];
} }
} }
@@ -2412,7 +2412,7 @@ sub parse_event {
int($query_start), # START int($query_start), # START
$etime, # ETIME $etime, # ETIME
$time, # FSEEN $time, # FSEEN
{ $curr->[STATE] => 0 }, # PROFILE { ($curr->[STATE] || "") => 0 }, # PROFILE
]; ];
} }
} }

4
lib/Processlist.pm
View File

@@ -279,7 +279,7 @@ sub parse_event {
int($query_start), # START int($query_start), # START
$etime, # ETIME $etime, # ETIME
$time, # FSEEN $time, # FSEEN
{ $curr->[STATE] => 0 }, # PROFILE { ($curr->[STATE] || "") => 0 }, # PROFILE
]; ];
} }
} }
@@ -294,7 +294,7 @@ sub parse_event {
int($query_start), # START int($query_start), # START
$etime, # ETIME $etime, # ETIME
$time, # FSEEN $time, # FSEEN
{ $curr->[STATE] => 0 }, # PROFILE { ($curr->[STATE] || "") => 0 }, # PROFILE
]; ];
} }
} }

32
t/lib/Processlist.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 => 35; use Test::More;
use Processlist; use Processlist;
use PerconaTest; use PerconaTest;
@@ -862,7 +862,35 @@ eval { $pl->find([$proc], %find_spec) };
ok !$@, ok !$@,
"Bug 923896: NULL Time in processlist doesn't fail for idle_time+Command=Sleep"; "Bug 923896: NULL Time in processlist doesn't fail for idle_time+Command=Sleep";
# #############################################################################
# NULL STATE doesn't generate warnings
# https://bugs.launchpad.net/percona-toolkit/+bug/821703
# #############################################################################
$procs = [
[ [1, 'unauthenticated user', 'localhost', undef, 'Connect', 7,
'some state', 1] ],
[ [1, 'unauthenticated user', 'localhost', undef, 'Connect', 8,
undef, 2] ],
],
eval {
parse_n_times(
2,
code => sub {
return shift @$procs;
},
time => Transformers::unix_timestamp('2001-01-01 00:05:00'),
);
};
is(
$EVAL_ERROR,
'',
"NULL STATE shouldn't cause warnings"
);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
exit; done_testing;