Merge lp:~percona-toolkit-dev/percona-toolkit/pt-kill-should-print-query-fingerprint-hash-after-killing-a-query-1391240 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.13

[Frank Cizmich]

Adds a --fingerprint option to pt-kill
This prints the hash fingerprint after every query kill (or print), equivalent to the one in pt-query-digest.
This is useful for cross-referencing.

Note:
A tiny modification was made in the MasterSlave module fatpacked in pt-kill.
Since most tools are out of sync with that module, I left the delicate task of synching them for later, since the risks outweigh the benefits at this point.

[Daniel Nichter (daniel-nichter)]

This mixes terms: fingerprint is "select c from t where id=?", checksum is 0xA4F90EC8, so --fingerprint is misleading: users will expect the former. Look in pqd docs and see if we call it "query ID" or "query checksum" and then either --query-id or --query-checksum.

Also the line

   my $chksm = uc substr(md5_hex($fp), -16);

duplicates Transformers::make_checksum(). Granted it's just one line though.

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/pt-kill-should-print-query-fingerprint-hash-after-killing-a-query-1391240]

613. By Frank Cizmich on 2015-01-12

used Transformers::make_checksum. Changed option to --query-id

=== modified file 'bin/pt-kill'
--- bin/pt-kill	2014-11-11 13:28:27 +0000
+++ bin/pt-kill	2015-01-12 17:24:08 +0000
@@ -4007,7 +4007,7 @@
       die "You do not have the PROCESS privilege";
    }
 
-   $sql = 'SHOW PROCESSLIST';
+   $sql = 'SHOW FULL PROCESSLIST';
    PTDEBUG && _d($dbh, $sql);
    grep { $_->{command} =~ m/Binlog Dump/i }
    map  { # Lowercase the column names
@@ -6567,6 +6567,7 @@
 use English qw(-no_match_vars);
 use POSIX qw(setsid);
 use List::Util qw(max);
+use Digest::MD5 qw(md5_hex);
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -7101,6 +7102,11 @@
                   $query->{Id}, ($query->{Command} || 'NULL'), $query->{Time},
                   ($query->{Info} || 'NULL');
             }
+            if ( $o->get('query-id') ) {
+                  my $fp = $qr->fingerprint($query->{'Info'});
+                  my $chksm = Transformers::make_checksum($fp);
+                  print "Query ID: 0x$chksm\n";
+            }
             if ( $o->get('execute-command') ) {
                exec_cmd($o->get('execute-command'));
                msg('Executed ' . $o->get('execute-command'));
@@ -7487,6 +7493,7 @@
 
 It is permissible for the code to have side effects (to alter C<$event>).
 
+
 =item --group-by
 
 type: string
@@ -7590,6 +7597,20 @@
 
 Port number to use for connection.
 
+=item --query-id
+
+Prints an ID of the query that was just killed. This is 
+equivalent to the "ID" output of pt-query-digest. This allows 
+cross-referencing the output of both tools.
+
+Example:
+
+   Query ID 0xE9800998ECF8427E
+
+Note that this is a digest (or hash) of the query's "fingerprint", 
+so queries of the same form but with different values will have the same ID.
+See pt-query-digest for more information.
+
 =item --run-time
 
 type: time

=== modified file 't/pt-kill/match.t'
--- t/pt-kill/match.t	2012-06-03 19:14:30 +0000
+++ t/pt-kill/match.t	2015-01-12 17:24:08 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 15;
+use Test::More tests => 16;
 
 use PerconaTest;
 use Sandbox;
@@ -137,6 +137,16 @@
    "--match-all"
 );
 
+# --query-id option 
+$output = output(
+   sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset011.txt", qw(--match-all --print --query-id)); }
+);
+like(
+   $output,
+   qr/0x69962191E64980E6/,
+   '--query-id'
+);
+
 # #############################################################################
 # Live tests.
 # #############################################################################