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

Improved test. Changed test file location. Added doc example.

Browse Source
This commit is contained in:
Frank Cizmich
2014-11-05 12:41:15 -02:00
parent 1887ae5770
commit 5edb7366f3
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/pt-query-digest
View File

@@ -13185,7 +13185,7 @@ sub main {
if ( $filename && $o->get('type')->[0] eq 'binlog') { if ( $filename && $o->get('type')->[0] eq 'binlog') {
if (is_raw_binlog($filename)) { if (is_raw_binlog($filename)) {
warn "Binlog file $filename must first be converted to text format using mysqlbinlog"; warn "Binlog file $filename must first be converted to text format using mysqlbinlog";
exit 1; return 1;
} }
} }
push @read_files, { name => ($filename || "STDIN"), size => $filesize }; push @read_files, { name => ($filename || "STDIN"), size => $filesize };
@@ -14730,21 +14730,11 @@ sub sanitize_event {
} }
# make an effort to check if file is a raw binlog # make an effort to check if file is a raw binlog
# ( i.e was not converted to text using mysqlbinlog ) # (i.e. was not converted to text using mysqlbinlog)
sub is_raw_binlog { sub is_raw_binlog {
my $filename = shift; my $filename = shift;
my $output; return -B $filename;
eval {
$output = `file $filename`;
};
# if we can't determine file type, let's assume it's ok
if ($EVAL_ERROR || !$output) {
return 0;
}
return $output =~ /MySQL\s*replication/i;
} }
sub _d { sub _d {
@@ -14823,7 +14813,7 @@ server. Before using this tool, please:
pt-query-digest is a sophisticated but easy to use tool for analyzing pt-query-digest is a sophisticated but easy to use tool for analyzing
MySQL queries. It can analyze queries from MySQL slow, general, and binary MySQL queries. It can analyze queries from MySQL slow, general, and binary
logs. ( Binary logs must first be converted to text, see L<"--type"> ). logs. (Binary logs must first be converted to text, see L<"--type">).
It can also use C<SHOW PROCESSLIST> and MySQL protocol data from tcpdump. It can also use C<SHOW PROCESSLIST> and MySQL protocol data from tcpdump.
By default, the tool reports which queries are the slowest, and therefore By default, the tool reports which queries are the slowest, and therefore
the most important to optimize. More complex and custom-tailored reports the most important to optimize. More complex and custom-tailored reports
@@ -16160,7 +16150,13 @@ The type of input to parse. The permitted types are
=item binlog =item binlog
Parse a binary log file that has been converted to text using mysqlbinlog. Parse a binary log file that has first been converted to text using mysqlbinlog.
For example:
mysqlbinlog mysql-bin.000441 > mysql-bin.000441.txt
pt-query-digest --type binlog mysql-bin.000441.txt
=item genlog =item genlog

BIN
t/lib/samples/binlogs/raw_binlog.log Normal file
View File

Binary file not shown.

17
t/pt-query-digest/binlog_analyses.t
View File

@@ -52,11 +52,18 @@ ok(
# Issue 1377888: refuse to parse raw binary log # Issue 1377888: refuse to parse raw binary log
# ############################################################################# # #############################################################################
my $output = `$trunk/bin/pt-query-digest --type binlog '$trunk/t/pt-query-digest/samples/raw_binlog.log' 2>&1`; my $output = output(
ok( sub { pt_query_digest::main(@args, "$trunk/t/lib/samples/binlogs/raw_binlog.log") },
$output =~ /mysqlbinlog/i , stderr => 1
'Refuses to parse raw binlog file.' );
);
like(
$output,
qr/mysqlbinlog/i,
'Refuses to parse raw binlog file'
);
# ############################################################################# # #############################################################################