PT-2151 fix tests for pt-query-digest (#631)

* PT-2151 - Fix tests for pt-query-digest Put fix for PT-1908 into the proper place * PT-2151 - Fix tests for pt-query-digest Put fix for PT-1554 into the proper place * PT-2151 - Fix tests for pt-query-digest Adjusted expected results for the default test t/pt-table-checksum/basics.t, so they do not depend on number of rows in the help tables * PT-2151 - Fix tests for pt-query-digest Added additional check for both replicas into t/pt-online-schema-change/preserve_triggers.t to avoid deadlock when ->ok() is doing CHECKSUM * PT-2151 - Fix tests for pt-query-digest Added delay to t/pt-table-sync/wait.t, so it waits for the child process to start lagging * PT-2151 - Fix tests for pt-query-digest Updated t/pt-query-digest/samples/issue_1196-output-8.0.txt, so it reflects changes in the latest 8.0 * PT-2151 - Fix tests for pt-query-digest Updated queries against query history table, so they don't fail after e2cf183 * PT-2151 - Fix tests for pt-query-digest Fixed PT-813 by comparing query text. Since order itself does not matter, it is not essential to compare by the fingerprint or use any other function that changes the query. * PT-2151 - Fix tests for pt-query-digest Adjusted samples files which now should have consistent order after fix for PT-813 * PT-2151 - Fix tests for pt-query-digest Fixed typo in the SELECT query in the QueryReview package * PT-2151 - Fix tests for pt-query-digest Fix for PT-981 * PT-2151 - Fix tests for pt-query-digest Updated modules for pt-index-usage and fixed tests, because checksum is calculated differently after fix for PT-1554 * PT-2151 - Fix tests for pt-query-digest Updated modules for pt-diskstats, pt-fk-error-logger, pt-heartbeat, pt-online-schema-change, pt-slave-delay, pt-slave-find, pt-table-checksum, pt-table-sync, pt-upgrade * PT-2151 - Fix tests for pt-query-digest Updated lib/IndexUsage.pm, so fix for pt-index-usage is in the correct place
percona · Jun 23, 2023 · 25c9695 · 25c9695
1 parent 8ef28f7
commit 25c9695
Show file tree

Hide file tree

Showing 31 changed files with 446 additions and 438 deletions.
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
@@ -1430,7 +1430,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
@@ -2557,7 +2557,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
@@ -4278,7 +4278,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-index-usage b/bin/pt-index-usage
@@ -3709,7 +3709,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }
@@ -4919,7 +4919,7 @@ sub save_results {
    PTDEBUG && _d("Save query data");
    my $insert_query_sth = $dbh->prepare(
       "INSERT IGNORE INTO `$db`.`queries` (query_id, fingerprint, sample) "
-      . " VALUES (CONV(?, 16, 10), ?, ?)");
+      . " VALUES (?, ?, ?)");
    foreach my $query_id ( keys %{$self->{queries}} ) {
       my $query = $self->{queries}->{$query_id};
       $insert_query_sth->execute(
@@ -4929,7 +4929,7 @@ sub save_results {
    PTDEBUG && _d("Saving index usage data");
    my $insert_index_usage_sth = $dbh->prepare(
       "INSERT INTO `$db`.`index_usage` (query_id, db, tbl, idx, cnt) "
-      . "VALUES (CONV(?, 16, 10), ?, ?, ?, ?) "
+      . "VALUES (?, ?, ?, ?, ?) "
       . "ON DUPLICATE KEY UPDATE cnt = cnt + ?");
    foreach my $query_id ( keys %{$self->{index_usage}} ) {
       foreach my $db ( keys %{$self->{index_usage}->{$query_id}} ) {
@@ -4948,7 +4948,7 @@ sub save_results {
    my $insert_index_alt_sth = $dbh->prepare(
       "INSERT INTO `$db`.`index_alternatives` "
       . "(query_id, db, tbl, idx, alt_idx, cnt) "
-      . "VALUES (CONV(?, 16, 10), ?, ?, ?, ?, ?) "
+      . "VALUES (?, ?, ?, ?, ?, ?) "
       . "ON DUPLICATE KEY UPDATE cnt = cnt + ?");
    foreach my $query_id ( keys %{$self->{alt_index_usage}} ) {
       foreach my $db ( keys %{$self->{alt_index_usage}->{$query_id}} ) {
@@ -7366,7 +7366,7 @@ MAGIC_create_indexes:
 MAGIC_create_queries:
 
   CREATE TABLE IF NOT EXISTS queries (
-    query_id     BIGINT UNSIGNED NOT NULL,
+    query_id     CHAR(32) NOT NULL,
     fingerprint  TEXT NOT NULL,
     sample       TEXT NOT NULL,
     PRIMARY KEY  (query_id)
@@ -7384,7 +7384,7 @@ MAGIC_create_tables:
 MAGIC_create_index_usage:
 
   CREATE TABLE IF NOT EXISTS index_usage (
-    query_id      BIGINT UNSIGNED NOT NULL,
+    query_id      CHAR(32) NOT NULL,
     db            VARCHAR(64) NOT NULL,
     tbl           VARCHAR(64) NOT NULL,
     idx           VARCHAR(64) NOT NULL,
@@ -7395,7 +7395,7 @@ MAGIC_create_index_usage:
 MAGIC_create_index_alternatives:
 
   CREATE TABLE IF NOT EXISTS index_alternatives (
-    query_id      BIGINT UNSIGNED NOT NULL, -- This query used
+    query_id      CHAR(32) NOT NULL,        -- This query used
     db            VARCHAR(64) NOT NULL,     -- this index, but...
     tbl           VARCHAR(64) NOT NULL,     --
     idx           VARCHAR(64) NOT NULL,     --

diff --git a/bin/pt-kill b/bin/pt-kill
@@ -2787,7 +2787,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }
@@ -3501,10 +3501,10 @@ sub parse_event {
             else {
                PTDEBUG && _d('Saving new query, state', $curr->[STATE]);
                push @new_cxn, [
-                  @{$curr}[0..7],           # proc info
-                  int($query_start),        # START
-                  $etime,                   # ETIME
-                  $time,                    # FSEEN
+                  @{$curr}[0..7],                  # proc info
+                  $query_start,                    # START
+                  $etime,                          # ETIME
+                  $time,                           # FSEEN
                   { ($curr->[STATE] || "") => 0 }, # PROFILE
                ];
             }
@@ -3515,10 +3515,10 @@ sub parse_event {
          if ( $curr->[INFO] && defined $curr->[TIME] ) {
             PTDEBUG && _d('Saving query of new cxn, state', $curr->[STATE]);
             push @new_cxn, [
-               @{$curr}[0..7],           # proc info
-               int($query_start),        # START
-               $etime,                   # ETIME
-               $time,                    # FSEEN
+               @{$curr}[0..7],                  # proc info
+               $query_start,                    # START
+               $etime,                          # ETIME
+               $time,                           # FSEEN
                { ($curr->[STATE] || "") => 0 }, # PROFILE
             ];
          }

diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
@@ -6559,7 +6559,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-query-digest b/bin/pt-query-digest
@@ -2703,7 +2703,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }
@@ -3394,10 +3394,10 @@ sub parse_event {
             else {
                PTDEBUG && _d('Saving new query, state', $curr->[STATE]);
                push @new_cxn, [
-                  @{$curr}[0..7],           # proc info
-                  int($query_start),        # START
-                  $etime,                   # ETIME
-                  $time,                    # FSEEN
+                  @{$curr}[0..7],                  # proc info
+                  $query_start,                    # START
+                  $etime,                          # ETIME
+                  $time,                           # FSEEN
                   { ($curr->[STATE] || "") => 0 }, # PROFILE
                ];
             }
@@ -3408,10 +3408,10 @@ sub parse_event {
          if ( $curr->[INFO] && defined $curr->[TIME] ) {
             PTDEBUG && _d('Saving query of new cxn, state', $curr->[STATE]);
             push @new_cxn, [
-               @{$curr}[0..7],           # proc info
-               int($query_start),        # START
-               $etime,                   # ETIME
-               $time,                    # FSEEN
+               @{$curr}[0..7],                  # proc info
+               $query_start,                    # START
+               $etime,                          # ETIME
+               $time,                           # FSEEN
                { ($curr->[STATE] || "") => 0 }, # PROFILE
             ];
          }
@@ -5892,7 +5892,10 @@ sub top_events {
    my ( $self, %args ) = @_;
    my $classes = $self->{result_classes};
    my @sorted = reverse sort { # Sorted list of $groupby values
-      $classes->{$a}->{$args{attrib}}->{$args{orderby}}
+	  ($classes->{$a}->{$args{attrib}}->{$args{orderby}}
+	     == $classes->{$b}->{$args{attrib}}->{$args{orderby}})
+      ? $a cmp $b
+      : $classes->{$a}->{$args{attrib}}->{$args{orderby}}
          <=> $classes->{$b}->{$args{attrib}}->{$args{orderby}}
       } grep {
          defined $classes->{$_}->{$args{attrib}}->{$args{orderby}}
@@ -7386,7 +7389,7 @@ sub profile {
    $report->title('Profile');
    my @cols = (
       { name => 'Rank',          right_justify => 1,             },
-      { name => 'Query ID',                                      },
+      { name => 'Query ID',      width => 35                     },
       { name => 'Response time', right_justify => 1,             },
       { name => 'Calls',         right_justify => 1,             },
       { name => 'R/Call',        right_justify => 1,             },
@@ -9264,7 +9267,7 @@ sub new {
    my $sql = <<"      SQL";
       INSERT INTO $args{db_tbl}
       (checksum, fingerprint, sample, first_seen, last_seen)
-      VALUES(CONV(?, 16, 10), ?, ?, COALESCE(?, $now), COALESCE(?, $now))
+      VALUES(?, ?, ?, COALESCE(?, $now), COALESCE(?, $now))
       ON DUPLICATE KEY UPDATE
          first_seen = IF(
             first_seen IS NULL,
@@ -9281,8 +9284,8 @@ sub new {
    my @review_cols = grep { !$skip_cols{$_} } @{$args{tbl_struct}->{cols}};
    $sql = "SELECT "
         . join(', ', map { $args{quoter}->quote($_) } @review_cols)
-        . ", CONV(checksum, 10, 16) AS checksum_conv FROM $args{db_tbl}"
-        . " WHERE checksum=CONV(?, 16, 10)";
+        . ", checksum AS checksum_conv FROM $args{db_tbl}"
+        . " WHERE checksum=?";
    PTDEBUG && _d('SQL to select from review table:', $sql);
    my $select_sth = $args{dbh}->prepare($sql);
 
@@ -9412,7 +9415,7 @@ sub set_history_options {
    my $sql = "REPLACE INTO $args{table}("
       . join(', ',
          map { Quoter->quote($_) } ('checksum', 'sample', @cols))
-      . ') VALUES (CONV(?, 16, 10), ?'
+      . ') VALUES (?, ?'
       . (@cols ? ', ' : '')  # issue 1265
       . join(', ', map {
          $_ eq 'ts_min' || $_ eq 'ts_max'

diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
@@ -2780,7 +2780,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-slave-find b/bin/pt-slave-find
@@ -3736,7 +3736,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
@@ -8391,7 +8391,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-table-sync b/bin/pt-table-sync
@@ -8431,7 +8431,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/bin/pt-upgrade b/bin/pt-upgrade
@@ -2976,7 +2976,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }

diff --git a/lib/EventAggregator.pm b/lib/EventAggregator.pm
@@ -795,7 +795,10 @@ sub top_events {
    my ( $self, %args ) = @_;
    my $classes = $self->{result_classes};
    my @sorted = reverse sort { # Sorted list of $groupby values
-      $classes->{$a}->{$args{attrib}}->{$args{orderby}}
+	  ($classes->{$a}->{$args{attrib}}->{$args{orderby}}
+	     == $classes->{$b}->{$args{attrib}}->{$args{orderby}})
+      ? $a cmp $b
+      : $classes->{$a}->{$args{attrib}}->{$args{orderby}}
          <=> $classes->{$b}->{$args{attrib}}->{$args{orderby}}
       } grep {
          # Defensive programming

diff --git a/lib/IndexUsage.pm b/lib/IndexUsage.pm
@@ -262,7 +262,7 @@ sub save_results {
    PTDEBUG && _d("Save query data");
    my $insert_query_sth = $dbh->prepare(
       "INSERT IGNORE INTO `$db`.`queries` (query_id, fingerprint, sample) "
-      . " VALUES (CONV(?, 16, 10), ?, ?)");
+      . " VALUES (?, ?, ?)");
    foreach my $query_id ( keys %{$self->{queries}} ) {
       my $query = $self->{queries}->{$query_id};
       $insert_query_sth->execute(
@@ -272,7 +272,7 @@ sub save_results {
    PTDEBUG && _d("Saving index usage data");
    my $insert_index_usage_sth = $dbh->prepare(
       "INSERT INTO `$db`.`index_usage` (query_id, db, tbl, idx, cnt) "
-      . "VALUES (CONV(?, 16, 10), ?, ?, ?, ?) "
+      . "VALUES (?, ?, ?, ?, ?) "
       . "ON DUPLICATE KEY UPDATE cnt = cnt + ?");
    foreach my $query_id ( keys %{$self->{index_usage}} ) {
       foreach my $db ( keys %{$self->{index_usage}->{$query_id}} ) {
@@ -291,7 +291,7 @@ sub save_results {
    my $insert_index_alt_sth = $dbh->prepare(
       "INSERT INTO `$db`.`index_alternatives` "
       . "(query_id, db, tbl, idx, alt_idx, cnt) "
-      . "VALUES (CONV(?, 16, 10), ?, ?, ?, ?, ?) "
+      . "VALUES (?, ?, ?, ?, ?, ?) "
       . "ON DUPLICATE KEY UPDATE cnt = cnt + ?");
    foreach my $query_id ( keys %{$self->{alt_index_usage}} ) {
       foreach my $db ( keys %{$self->{alt_index_usage}->{$query_id}} ) {

diff --git a/lib/Processlist.pm b/lib/Processlist.pm
@@ -302,10 +302,10 @@ sub parse_event {
             else {
                PTDEBUG && _d('Saving new query, state', $curr->[STATE]);
                push @new_cxn, [
-                  @{$curr}[0..7],           # proc info
-                  int($query_start),        # START
-                  $etime,                   # ETIME
-                  $time,                    # FSEEN
+                  @{$curr}[0..7],                  # proc info
+                  $query_start,                    # START
+                  $etime,                          # ETIME
+                  $time,                           # FSEEN
                   { ($curr->[STATE] || "") => 0 }, # PROFILE
                ];
             }
@@ -317,10 +317,10 @@ sub parse_event {
             # But only save the new cxn if it's executing.
             PTDEBUG && _d('Saving query of new cxn, state', $curr->[STATE]);
             push @new_cxn, [
-               @{$curr}[0..7],           # proc info
-               int($query_start),        # START
-               $etime,                   # ETIME
-               $time,                    # FSEEN
+               @{$curr}[0..7],                  # proc info
+               $query_start,                    # START
+               $etime,                          # ETIME
+               $time,                           # FSEEN
                { ($curr->[STATE] || "") => 0 }, # PROFILE
             ];
          }

diff --git a/lib/QueryHistory.pm b/lib/QueryHistory.pm
@@ -98,7 +98,7 @@ sub set_history_options {
    my $sql = "REPLACE INTO $args{table}("
       . join(', ',
          map { Quoter->quote($_) } ('checksum', 'sample', @cols))
-      . ') VALUES (CONV(?, 16, 10), ?'
+      . ') VALUES (?, ?'
       . (@cols ? ', ' : '')  # issue 1265
       . join(', ', map {
          # ts_min and ts_max might be part of the PK, in which case they must

diff --git a/lib/QueryReportFormatter.pm b/lib/QueryReportFormatter.pm
@@ -876,7 +876,7 @@ sub profile {
    $report->title('Profile');
    my @cols = (
       { name => 'Rank',          right_justify => 1,             },
-      { name => 'Query ID',                                      },
+      { name => 'Query ID',      width => 35                     },
       { name => 'Response time', right_justify => 1,             },
       { name => 'Calls',         right_justify => 1,             },
       { name => 'R/Call',        right_justify => 1,             },

diff --git a/lib/QueryReview.pm b/lib/QueryReview.pm
@@ -71,7 +71,7 @@ sub new {
    my $sql = <<"      SQL";
       INSERT INTO $args{db_tbl}
       (checksum, fingerprint, sample, first_seen, last_seen)
-      VALUES(CONV(?, 16, 10), ?, ?, COALESCE(?, $now), COALESCE(?, $now))
+      VALUES(?, ?, ?, COALESCE(?, $now), COALESCE(?, $now))
       ON DUPLICATE KEY UPDATE
          first_seen = IF(
             first_seen IS NULL,
@@ -90,8 +90,8 @@ sub new {
    my @review_cols = grep { !$skip_cols{$_} } @{$args{tbl_struct}->{cols}};
    $sql = "SELECT "
         . join(', ', map { $args{quoter}->quote($_) } @review_cols)
-        . ", CONV(checksum, 10, 16) AS checksum_conv FROM $args{db_tbl}"
-        . " WHERE checksum=CONV(?, 16, 10)";
+        . ", checksum AS checksum_conv FROM $args{db_tbl}"
+        . " WHERE checksum=?";
    PTDEBUG && _d('SQL to select from review table:', $sql);
    my $select_sth = $args{dbh}->prepare($sql);
 

diff --git a/lib/Transformers.pm b/lib/Transformers.pm
@@ -272,7 +272,7 @@ sub any_unix_timestamp {
 # Returns the rightmost 64 bits of an MD5 checksum of the value.
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }