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

Add Query_time to pqd JSON class example.

Browse Source
This commit is contained in:
Daniel Nichter
2013-10-09 17:54:25 -07:00
parent d4995b565d
commit 57c234c89d
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/pt-query-digest
View File

@@ -7926,6 +7926,7 @@ override query_report => sub {
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,
Query_time => $sample->{Query_time},
}, },
), ),
}; };
@@ -10311,8 +10312,16 @@ use constant PTDEBUG => $ENV{PTDEBUG} || 0;
sub check_recursion_method { sub check_recursion_method {
my ($methods) = @_; my ($methods) = @_;
if ( @$methods != 1 ) { foreach my $method ( @$methods ) {
if ( grep({ !m/processlist|hosts/i } @$methods) die "Invalid recursion method: " . ($method || 'undef') . "\n"
unless $method && $method =~ m/^(?:processlist$|hosts$|none$|cluster|dsn=)/i;
}
if ( @$methods > 1 ) {
if ( grep( { m/none/ } @$methods) && grep( {! m/none/ } @$methods) ) {
die "--recursion-method=none cannot be combined with other methods\n";
}
elsif ( grep({ !m/processlist|hosts/i } @$methods)
&& $methods->[0] !~ /^dsn=/i ) && $methods->[0] !~ /^dsn=/i )
{ {
die "Invalid combination of recursion methods: " die "Invalid combination of recursion methods: "
@@ -10320,11 +10329,8 @@ sub check_recursion_method {
. "Only hosts and processlist may be combined.\n" . "Only hosts and processlist may be combined.\n"
} }
} }
else {
my ($method) = @$methods; return;
die "Invalid recursion method: " . ( $method || 'undef' )
unless $method && $method =~ m/^(?:processlist$|hosts$|none$|dsn=)/i;
}
} }
sub new { sub new {

1
lib/JSONReportFormatter.pm
View File

@@ -232,6 +232,7 @@ override query_report => sub {
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,
Query_time => $sample->{Query_time},
}, },
), ),
}; };

2
t/lib/samples/JSONReportFormatter/report001.json
View File

@@ -5,6 +5,7 @@
"checksum" : "82860EDA9A88FCC5", "checksum" : "82860EDA9A88FCC5",
"distillate" : "SELECT users", "distillate" : "SELECT users",
"example" : { "example" : {
"Query_time" : "8.000652",
"query" : "SELECT id FROM users WHERE name='foo'", "query" : "SELECT id FROM users WHERE name='foo'",
"ts" : "2007-10-15 21:43:52" "ts" : "2007-10-15 21:43:52"
}, },
@@ -84,6 +85,7 @@
"checksum" : "1087A32FED3B7EBB", "checksum" : "1087A32FED3B7EBB",
"distillate" : "INSERT articles", "distillate" : "INSERT articles",
"example" : { "example" : {
"Query_time" : "1.001943",
"query" : "INSERT IGNORE INTO articles (id, body,)VALUES(3558268,'sample text')", "query" : "INSERT IGNORE INTO articles (id, body,)VALUES(3558268,'sample text')",
"ts" : "2007-10-15 21:43:52" "ts" : "2007-10-15 21:43:52"
}, },

1
t/pt-query-digest/samples/json/slow002.txt
View File

@@ -6,6 +6,7 @@
"checksum" : "66825DDC008FFA89", "checksum" : "66825DDC008FFA89",
"distillate" : "UPDATE db?.tuningdetail_?_? db?.gonzo", "distillate" : "UPDATE db?.tuningdetail_?_? db?.gonzo",
"example" : { "example" : {
"Query_time" : "0.726052",
"as_select" : "select n.column1 = a.column1, n.word3 = a.word3 from db2.tuningdetail_21_265507 n\n inner join db1.gonzo a using(gonzo) ", "as_select" : "select n.column1 = a.column1, n.word3 = a.word3 from db2.tuningdetail_21_265507 n\n inner join db1.gonzo a using(gonzo) ",
"query" : "update db2.tuningdetail_21_265507 n\n inner join db1.gonzo a using(gonzo) \n set n.column1 = a.column1, n.word3 = a.word3", "query" : "update db2.tuningdetail_21_265507 n\n inner join db1.gonzo a using(gonzo) \n set n.column1 = a.column1, n.word3 = a.word3",
"ts" : "2007-12-18 11:48:27" "ts" : "2007-12-18 11:48:27"

3
t/pt-query-digest/samples/json/tcpdump021.txt
View File

@@ -6,6 +6,7 @@
"checksum" : "AA8E9FA785927259", "checksum" : "AA8E9FA785927259",
"distillate" : "SELECT d.t", "distillate" : "SELECT d.t",
"example" : { "example" : {
"Query_time" : "0.000286",
"as_select" : "SELECT i FROM d.t WHERE i=?", "as_select" : "SELECT i FROM d.t WHERE i=?",
"query" : "PREPARE SELECT i FROM d.t WHERE i=?", "query" : "PREPARE SELECT i FROM d.t WHERE i=?",
"ts" : "2009-12-08 09:23:49.637394" "ts" : "2009-12-08 09:23:49.637394"
@@ -82,6 +83,7 @@
"checksum" : "3F79759E7FA2F117", "checksum" : "3F79759E7FA2F117",
"distillate" : "SELECT d.t", "distillate" : "SELECT d.t",
"example" : { "example" : {
"Query_time" : "0.000281",
"as_select" : "SELECT i FROM d.t WHERE i=\"3\"", "as_select" : "SELECT i FROM d.t WHERE i=\"3\"",
"query" : "EXECUTE SELECT i FROM d.t WHERE i=\"3\"", "query" : "EXECUTE SELECT i FROM d.t WHERE i=\"3\"",
"ts" : "2009-12-08 09:23:49.637892" "ts" : "2009-12-08 09:23:49.637892"
@@ -158,6 +160,7 @@
"checksum" : "AA353644DE4C4CB4", "checksum" : "AA353644DE4C4CB4",
"distillate" : "ADMIN QUIT", "distillate" : "ADMIN QUIT",
"example" : { "example" : {
"Query_time" : "0.000000",
"query" : "administrator command: Quit", "query" : "administrator command: Quit",
"ts" : "2009-12-08 09:23:49.638381" "ts" : "2009-12-08 09:23:49.638381"
}, },