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

Add --output json-anon that excludes query examples.

Browse Source
This commit is contained in:
Daniel Nichter
2013-07-01 13:38:34 -07:00
parent 5b45256613
commit 16e57a8fea
6 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-query-digest
View File

@@ -7900,10 +7900,12 @@ override query_report => sub {
distillate => $distill, distillate => $distill,
attribute => $groupby, attribute => $groupby,
query_count => $times_seen, query_count => $times_seen,
$args{anon} ? () : (
example => { example => {
query => substr($sample->{arg}, 0, $self->max_query_length), query => substr($sample->{arg}, 0, $self->max_query_length),
ts => $sample->{ts} ? parse_timestamp($sample->{ts}) : undef, ts => $sample->{ts} ? parse_timestamp($sample->{ts}) : undef,
}, },
),
}; };
my %metrics; my %metrics;
@@ -14155,7 +14157,7 @@ sub print_reports {
$print_header = 1; $print_header = 1;
} }
my $report_class = $o->get('output') =~ m/\Ajson\z/i my $report_class = $o->get('output') =~ m/^json/i
? 'JSONReportFormatter' ? 'JSONReportFormatter'
: 'QueryReportFormatter'; : 'QueryReportFormatter';
my $qrf = $report_class->new( my $qrf = $report_class->new(
@@ -14182,6 +14184,7 @@ sub print_reports {
variations => $o->get('variations'), variations => $o->get('variations'),
group => { map { $_=>1 } qw(rusage date hostname files header) }, group => { map { $_=>1 } qw(rusage date hostname files header) },
resume => $resume, resume => $resume,
anon => $report_class eq 'json-anon',
); );
} }
@@ -15616,6 +15619,7 @@ How to format and print the query analysis results. Accepted values are:
report Standard query analysis report report Standard query analysis report
slowlog MySQL slow log slowlog MySQL slow log
json JSON, on array per query class json JSON, on array per query class
json-anon JSON without example queries
The entire C<report> output can be disabled by specifying C<--no-report> The entire C<report> output can be disabled by specifying C<--no-report>
(see L<"--[no]report">), and its sections can be disabled or rearranged (see L<"--[no]report">), and its sections can be disabled or rearranged

2
lib/JSONReportFormatter.pm
View File

@@ -228,10 +228,12 @@ override query_report => sub {
distillate => $distill, distillate => $distill,
attribute => $groupby, attribute => $groupby,
query_count => $times_seen, query_count => $times_seen,
$args{anon} ? () : (
example => { example => {
query => substr($sample->{arg}, 0, $self->max_query_length), query => substr($sample->{arg}, 0, $self->max_query_length),
ts => $sample->{ts} ? parse_timestamp($sample->{ts}) : undef, ts => $sample->{ts} ? parse_timestamp($sample->{ts}) : undef,
}, },
),
}; };
my %metrics; my %metrics;

4
t/pt-query-digest/json.t
View File

@@ -33,7 +33,8 @@ ok(
ok( ok(
no_diff( no_diff(
sub { pt_query_digest::main(@args, "$sample/slowlogs/slow002.txt") }, sub { pt_query_digest::main(@args, "$sample/slowlogs/slow002.txt") },
"$results/output_json_slow002.txt" "$results/output_json_slow002.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
), ),
'json output for slow002' 'json output for slow002'
) or diag($test_diff); ) or diag($test_diff);
@@ -45,6 +46,7 @@ ok(
sub { pt_query_digest::main(qw(--type tcpdump --limit 10 --watch-server 127.0.0.1:12345), sub { pt_query_digest::main(qw(--type tcpdump --limit 10 --watch-server 127.0.0.1:12345),
@args, "$sample/tcpdump/tcpdump021.txt") }, @args, "$sample/tcpdump/tcpdump021.txt") },
"$results/output_json_tcpdump021.txt", "$results/output_json_tcpdump021.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
), ),
'json output for for tcpdump021', 'json output for for tcpdump021',
) or diag($test_diff); ) or diag($test_diff);

2
t/pt-query-digest/samples/empty_report.txt
View File

@@ -1,2 +0,0 @@
# No events processed.

2
t/pt-query-digest/samples/output_json_slow002.txt
View File

@@ -121,7 +121,7 @@
"global" : { "global" : {
"files" : [ "files" : [
{ {
"name" : "/Users/daniel/p/release-2.2.3/t/lib/samples/slowlogs/slow002.txt", "name" : "TRUNK/t/lib/samples/slowlogs/slow002.txt",
"size" : 3841 "size" : 3841
} }
], ],

2
t/pt-query-digest/samples/output_json_tcpdump021.txt
View File

@@ -187,7 +187,7 @@
"global" : { "global" : {
"files" : [ "files" : [
{ {
"name" : "/Users/daniel/p/release-2.2.3/t/lib/samples/tcpdump/tcpdump021.txt", "name" : "TRUNK/t/lib/samples/tcpdump/tcpdump021.txt",
"size" : 2827 "size" : 2827
} }
], ],