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

Fix for 885382: Check the cardinality of --embedded-attributes

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-05-30 14:14:13 -03:00
parent f6e265613c
commit ee097f442f
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/pt-query-digest
View File

@@ -11974,6 +11974,18 @@ sub main {
if ( $o->get('apdex-threshold') <= 0 ) {
$o->save_error("Apdex threshold must be a positive decimal value");
}
if ( my $patterns = $o->get('embedded-attributes') ) {
$o->save_error("--embedded-attributes should be passed two "
. "comma-separated patterns, got " . scalar(@$patterns) )
unless scalar(@$patterns) == 2;
for my $re (@$patterns) {
no re 'eval';
eval { qr/$re/ };
if ( $EVAL_ERROR ) {
$o->save_error("--embedded-attributes $EVAL_ERROR")
}
}
}
}
# Set an orderby for each groupby; use the default orderby if there
@@ -12416,8 +12428,8 @@ sub main {
} # get events from log file
if ( my $patterns = $o->get('embedded-attributes') ) {
$misc->{embed} = qr/$patterns->[0]/o;
$misc->{capture} = qr/$patterns->[1]/o;
$misc->{embed} = qr/$patterns->[0]/;
$misc->{capture} = qr/$patterns->[1]/;
PTDEBUG && _d('Patterns for embedded attributes:', $misc->{embed},
$misc->{capture});
}

37
t/pt-query-digest/option_sanity.t
View File

@@ -9,7 +9,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More tests => 2;
use Test::More tests => 6;
use PerconaTest;
@@ -22,7 +22,42 @@ like($output, qr/--review DSN requires a D/, 'Dies if no D part in --review DSN'
$output = `$trunk/bin/pt-query-digest --review h=127.1,P=12345,u=msandbox,p=msandbox,D=test`;
like($output, qr/--review DSN requires a D/, 'Dies if no t part in --review DSN');
# #############################################################################
# https://bugs.launchpad.net/percona-toolkit/+bug/885382
# pt-query-digest --embedded-attributes doesn't check cardinality
# #############################################################################
my $sample = "$trunk/t/lib/samples/slowlogs/";
my @options = qw(
--report-format=query_report
--limit 10
--group-by file
);
$output = `$trunk/bin/pt-query-digest @options --embedded-attributes '-- .*' $sample.slow010.txt`;
like $output,
qr/\Q--embedded-attributes should be passed two comma-separated patterns, got 1/,
'Bug 885382: --embedded-attributes cardinality';
$output = `$trunk/bin/pt-query-digest @options --embedded-attributes '-- .*,(?{1234})' $sample.slow010.txt`;
like $output,
qr/\Q--embedded-attributes Eval-group /,
"Bug 885382: --embedded-attributes rejects invalid patterns early";
$output = `$trunk/bin/pt-query-digest @options --embedded-attributes '-- .*,(?*asdasd' $sample.slow010.txt`;
like $output,
qr/\Q--embedded-attributes Sequence (?*...) not recognized/,
"Bug 885382: --embedded-attributes rejects invalid patterns early";
$output = `$trunk/bin/pt-query-digest @options --embedded-attributes '-- .*,[:alpha:]' $sample.slow010.txt`;
like $output,
qr/\Q--embedded-attributes POSIX syntax [: :] belongs inside character/,
"Bug 885382: --embedded-attributes rejects warning patterns early";;
# #############################################################################
# Done.
# #############################################################################