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

Update Compare* modules in pt-upgrade.

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-17 16:51:39 -06:00
parent e797e463c1
commit c78c3bfbab
3 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
bin/pt-upgrade
View File

@@ -9498,8 +9498,10 @@ sub report {
my $query_id_col = { my $query_id_col = {
name => 'Query ID', name => 'Query ID',
}; };
my $hostno = 0;
my @host_cols = map { my @host_cols = map {
my $col = { name => $_->{name} }; $hostno++;
my $col = { name => "host$hostno" };
$col; $col;
} @$hosts; } @$hosts;
@@ -9595,12 +9597,14 @@ sub _report_diff_row_counts {
my $report = new ReportFormatter(); my $report = new ReportFormatter();
$report->set_title('Row count differences'); $report->set_title('Row count differences');
my $hostno = 0;
$report->set_columns( $report->set_columns(
$args{query_id_col}, $args{query_id_col},
map { (map {
my $col = { name => $_->{name}, right_justify => 1 }; $hostno++;
my $col = { name => "host$hostno", right_justify => 1 };
$col; $col;
} @{$args{hosts}}, } @{$args{hosts}}),
); );
my $diff_row_counts = $self->{diffs}->{row_counts}; my $diff_row_counts = $self->{diffs}->{row_counts};
@@ -9836,8 +9840,10 @@ sub report {
my $query_id_col = { my $query_id_col = {
name => 'Query ID', name => 'Query ID',
}; };
my $hostno = 0;
my @host_cols = map { my @host_cols = map {
my $col = { name => $_->{name} }; $hostno++;
my $col = { name => "host$hostno" };
$col; $col;
} @$hosts; } @$hosts;
@@ -9867,12 +9873,14 @@ sub _report_diff_big {
my $report = new ReportFormatter(); my $report = new ReportFormatter();
$report->set_title('Big query time differences'); $report->set_title('Big query time differences');
my $hostno = 0;
$report->set_columns( $report->set_columns(
$args{query_id_col}, $args{query_id_col},
map { (map {
my $col = { name => $_->{name}, right_justify => 1 }; $hostno++;
my $col = { name => "host$hostno", right_justify => 1 };
$col; $col;
} @{$args{hosts}}, } @{$args{hosts}}),
{ name => 'Difference', right_justify => 1 }, { name => 'Difference', right_justify => 1 },
); );
@@ -9902,12 +9910,14 @@ sub _report_diff_in_bucket {
my $report = new ReportFormatter(); my $report = new ReportFormatter();
$report->set_title('Significant query time differences'); $report->set_title('Significant query time differences');
my $hostno = 0;
$report->set_columns( $report->set_columns(
$args{query_id_col}, $args{query_id_col},
map { (map {
my $col = { name => $_->{name}, right_justify => 1 }; $hostno++;
my $col = { name => "host$hostno", right_justify => 1 };
$col; $col;
} @{$args{hosts}}, } @{$args{hosts}}),
{ name => '%Increase', right_justify => 1 }, { name => '%Increase', right_justify => 1 },
{ name => '%Threshold', right_justify => 1 }, { name => '%Threshold', right_justify => 1 },
); );
@@ -10186,8 +10196,10 @@ sub report {
my $query_id_col = { my $query_id_col = {
name => 'Query ID', name => 'Query ID',
}; };
my $hostno = 0;
my @host_cols = map { my @host_cols = map {
my $col = { name => $_->{name} }; $hostno++;
my $col = { name => "host$hostno" };
$col; $col;
} @$hosts; } @$hosts;
@@ -10230,7 +10242,7 @@ sub _report_diff_warnings {
my ($hostno, $code, $message) = @{$diff_warnings->{$item}->{$_}}; my ($hostno, $code, $message) = @{$diff_warnings->{$item}->{$_}};
$report->add_line( $report->add_line(
$get_id->($item) . '-' . $_, $get_id->($item) . '-' . $_,
$args{hosts}->[$hostno]->{name}, $code, $message, "host" . ($hostno + 1), $code, $message,
); );
} sort { $a <=> $b } keys %{$diff_warnings->{$item}}; } sort { $a <=> $b } keys %{$diff_warnings->{$item}};
} }
@@ -10251,13 +10263,15 @@ sub _report_diff_levels {
my $report = new ReportFormatter(extend_right => 1); my $report = new ReportFormatter(extend_right => 1);
$report->set_title('Warning level differences'); $report->set_title('Warning level differences');
my $hostno = 0;
$report->set_columns( $report->set_columns(
$args{query_id_col}, $args{query_id_col},
{ name => 'Code', right_justify => 1 }, { name => 'Code', right_justify => 1 },
map { (map {
my $col = { name => $_->{name}, right_justify => 1 }; $hostno++;
my $col = { name => "host$hostno", right_justify => 1 };
$col; $col;
} @{$args{hosts}}, } @{$args{hosts}}),
{ name => 'Message' }, { name => 'Message' },
); );
@@ -10287,12 +10301,14 @@ sub _report_diff_warning_counts {
my $report = new ReportFormatter(); my $report = new ReportFormatter();
$report->set_title('Warning count differences'); $report->set_title('Warning count differences');
my $hostno = 0;
$report->set_columns( $report->set_columns(
$args{query_id_col}, $args{query_id_col},
map { (map {
my $col = { name => $_->{name}, right_justify => 1 }; $hostno++;
my $col = { name => "host$hostno", right_justify => 1 };
$col; $col;
} @{$args{hosts}}, } @{$args{hosts}}),
); );
my $diff_warning_counts = $self->{diffs}->{warning_counts}; my $diff_warning_counts = $self->{diffs}->{warning_counts};

4
t/pt-upgrade/samples/002/report-01.txt
View File

@@ -36,8 +36,8 @@ select i from t where i is not null
# Row count differences # Row count differences
# Query ID 127.1:12345 127.1:12348 # Query ID host1 host2
# ================== =========== =========== # ================== ===== =====
# 3C830E3839B916D7-1 4 3 # 3C830E3839B916D7-1 4 3
# Statistics # Statistics

4
t/pt-upgrade/samples/003/report001.txt
View File

@@ -36,8 +36,8 @@ SELECT SUM(total) FROM test.t WHERE id > 0
# Column value differences # Column value differences
# Query ID Column 127.1:12345 127.1:12348 # Query ID Column host1 host2
# ================== ========== =========== =========== # ================== ========== ===== =====
# C1B1E457814417E4-1 SUM(total) 14.68 13.68 # C1B1E457814417E4-1 SUM(total) 14.68 13.68
# Statistics # Statistics