Merge lp:~percona-toolkit-dev/percona-toolkit/fix-887638-ptqa-negative-at-byte into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2012-11-13 15:22:01 +0000
+++ bin/pt-query-digest	2012-11-16 00:51:23 +0000
@@ -6721,7 +6721,7 @@
    }
 
    my $line = sprintf(
-      '# %s %d: %s QPS, %sx concurrency, ID 0x%s at byte %d ',
+      '# %s %d: %s QPS, %sx concurrency, ID 0x%s at byte %.f ',
       ($ea->{groupby} eq 'fingerprint' ? 'Query' : 'Item'),
       $args{rank} || 0,
       shorten($qps  || 0, d=>1_000),
 
=== modified file 'lib/QueryReportFormatter.pm'
--- lib/QueryReportFormatter.pm	2012-08-06 14:37:51 +0000
+++ lib/QueryReportFormatter.pm	2012-11-16 00:51:23 +0000
@@ -524,7 +524,7 @@
    # First line like:
    # Query 1: 9 QPS, 0x concurrency, ID 0x7F7D57ACDD8A346E at byte 5 ________
    my $line = sprintf(
-      '# %s %d: %s QPS, %sx concurrency, ID 0x%s at byte %d ',
+      '# %s %d: %s QPS, %sx concurrency, ID 0x%s at byte %.f ',
       ($ea->{groupby} eq 'fingerprint' ? 'Query' : 'Item'),
       $args{rank} || 0,
       shorten($qps  || 0, d=>1_000),
 
=== modified file 't/lib/QueryReportFormatter.t'
--- t/lib/QueryReportFormatter.t	2012-06-12 00:43:05 +0000
+++ t/lib/QueryReportFormatter.t	2012-11-16 00:51:23 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 45;
+use Test::More;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -187,6 +187,38 @@
    'Event report'
 );
 
+{
+   # pt-query-digest prints negative byte offset
+   # https://bugs.launchpad.net/percona-toolkit/+bug/887638
+
+   # printf "%d" can't really handle large values in some systems.
+   # Given a large enough log file, it will start printing
+   # negative values. The workaround is to use %.f instead. I haven't
+   # researched what the recommended solution for this is, but
+   # it's such an uncommon case and that it's not worth the time.
+   # This bug should really only affect 32-bit machines, and even then
+   # only those were the underlaying compiler's printf("%d") coerces the
+   # argument into a signed int.
+   my $item = 'select id from users where name=?';
+   local $ea->results->{samples}->{$item}->{pos_in_log} = 1e+33;
+
+   $result = $qrf->event_report(
+      ea => $ea,
+      # "users" is here to try to cause a failure
+      select => [ qw(Query_time Lock_time Rows_sent Rows_examined ts db user users) ],
+      item    => $item,
+      rank    => 1,
+      orderby => 'Query_time',
+      reason  => 'top',
+   );
+
+   unlike(
+      $result,
+      qr/at byte -/,
+      "Bug 887638: pt-query-digest prints negative byte offset"
+   );
+}
+
 $result = $qrf->chart_distro(
    ea     => $ea,
    attrib => 'Query_time',
@@ -1570,4 +1602,5 @@
    '_d() works'
 );
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
 exit;