From e466408c0d4a2e8239fd1c11a67d1951edaeaa09 Mon Sep 17 00:00:00 2001
From: "Brian Fraser fraserb@gmail.com" <>
Date: Fri, 18 Jan 2013 09:47:05 -0300
Subject: [PATCH] QueryReportFormatter: Resolve a hash ordering issue & fix an
 error introduced by the refactoring which was breaking two tests: checking if
 --report-histogram rather than --report-all

---
 bin/pt-query-digest         | 8 ++++----
 lib/QueryReportFormatter.pm | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 4e779928..7d4fa6b3 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -7106,9 +7106,9 @@ sub query_report_values {
       my $review_vals;
       if ( $qv ) {
          $review_vals = $qv->get_review_info($item);
-         next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_histogram};
+         next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_all};
          for my $col ( $qv->review_cols() ) {
-            $item_vals{review_vals}{$col} = $review_vals->{$col};
+            push @{$item_vals{review_vals}}, [$col, $review_vals->{$col}];
          }
       }
 
@@ -7176,8 +7176,8 @@ sub query_report {
 
       if ( $vals->{review_vals} ) {
          $report .= "# Review information\n";
-         foreach my $col ( keys %{$vals->{review_vals}} ) {
-            my $val = $vals->{review_vals}->{$col};
+         foreach my $elem ( @{$vals->{review_vals}} ) {
+            my ($col, $val) = @$elem;
             if ( !$val || $val ne '0000-00-00 00:00:00' ) { # issue 202
                $report .= sprintf "# %13s: %-s\n", $col, ($val ? $val : '');
             }
diff --git a/lib/QueryReportFormatter.pm b/lib/QueryReportFormatter.pm
index afc6fb82..e679fdaa 100644
--- a/lib/QueryReportFormatter.pm
+++ b/lib/QueryReportFormatter.pm
@@ -363,9 +363,9 @@ sub query_report_values {
       my $review_vals;
       if ( $qv ) {
          $review_vals = $qv->get_review_info($item);
-         next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_histogram};
+         next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_all};
          for my $col ( $qv->review_cols() ) {
-            $item_vals{review_vals}{$col} = $review_vals->{$col};
+            push @{$item_vals{review_vals}}, [$col, $review_vals->{$col}];
          }
       }
 
@@ -452,8 +452,8 @@ sub query_report {
          # Print the review information that is already in the table
          # before putting anything new into the table.
          $report .= "# Review information\n";
-         foreach my $col ( keys %{$vals->{review_vals}} ) {
-            my $val = $vals->{review_vals}->{$col};
+         foreach my $elem ( @{$vals->{review_vals}} ) {
+            my ($col, $val) = @$elem;
             if ( !$val || $val ne '0000-00-00 00:00:00' ) { # issue 202
                $report .= sprintf "# %13s: %-s\n", $col, ($val ? $val : '');
             }