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

Add and fix test case for special 'no query' events.

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-10 18:07:36 -07:00
parent fd6eef65c8
commit ec4be9a883
3 changed files with 95 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/SlowLogParser.pm
View File

@@ -235,14 +235,35 @@ sub parse_event {
# this only if we've seen the user/host line.
if ( !$found_arg && $pos == $len ) {
PTDEBUG && _d("Did not find arg, looking for special cases");
local $INPUT_RECORD_SEPARATOR = ";\n";
local $INPUT_RECORD_SEPARATOR = ";\n"; # get next line
if ( defined(my $l = $next_event->()) ) {
chomp $l;
$l =~ s/^\s+//;
PTDEBUG && _d("Found admin statement", $l);
push @properties, 'cmd', 'Admin', 'arg', $l;
push @properties, 'bytes', length($properties[-1]);
$found_arg++;
if ( $l =~ /^\s*[A-Z][a-z_]+: / ) {
PTDEBUG && _d("Found NULL query before", $l);
# https://bugs.launchpad.net/percona-toolkit/+bug/1082599
# This is really pathological but it happens:
# header_for_query_1
# SET timestamp=123;
# use db;
# header_for_query_2
# In this case, "get next line" ^ will actually fetch
# header_for_query_2 and the first line of any arg data,
# so to get the rest of the arg data, we switch back to
# the default input rec. sep.
local $INPUT_RECORD_SEPARATOR = ";\n#";
my $rest_of_event = $next_event->();
push @{$self->{pending}}, $l . $rest_of_event;
push @properties, 'cmd', 'Query', 'arg', '/* No query */';
push @properties, 'bytes', 0;
$found_arg++;
}
else {
chomp $l;
$l =~ s/^\s+//;
PTDEBUG && _d("Found admin statement", $l);
push @properties, 'cmd', 'Admin', 'arg', $l;
push @properties, 'bytes', length($properties[-1]);
$found_arg++;
}
}
else {
# Unrecoverable -- who knows what happened. This is possible,