percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-17 01:01:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use host instead of Host.

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-17 09:53:07 -06:00
parent b2fb12853f
commit 28f50bbac5
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/pt-upgrade
View File

@@ -3048,7 +3048,7 @@ sub _calc_metrics {
sub metrics { sub metrics {
my ( $self, %args ) = @_; my ( $self, %args ) = @_;
foreach my $arg ( qw(attrib where) ) { foreach my $arg ( qw(attrib where) ) {
die "I need a $arg argument" unless $args{$arg}; die "I need a $arg argument" unless defined $args{$arg};
} }
my $attrib = $args{attrib}; my $attrib = $args{attrib};
my $where = $args{where}; my $where = $args{where};
@@ -8628,13 +8628,13 @@ package UpgradeReportFormatter;
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG}; use constant PTDEBUG => $ENV{PTDEBUG};
Transformers->import(qw(make_checksum percentage_of shorten micro_t));
use constant LINE_LENGTH => 74; use constant LINE_LENGTH => 74;
use constant MAX_STRING_LENGTH => 10; use constant MAX_STRING_LENGTH => 10;
Transformers->import(qw(make_checksum percentage_of shorten micro_t));
my %formatting_function = ( my %formatting_function = (
ts => sub { ts => sub {
my ( $stats ) = @_; my ( $stats ) = @_;
@@ -8671,6 +8671,12 @@ sub event_report {
$line .= ('_' x (LINE_LENGTH - length($line))); $line .= ('_' x (LINE_LENGTH - length($line)));
push @result, $line; push @result, $line;
my $hostno = 0;
foreach my $host ( @$hosts ) {
$hostno++;
push @result, "# Host$hostno: " . ($host->{name} || '?')
}
my $class = $meta_stats->{classes}->{$where}; my $class = $meta_stats->{classes}->{$where};
push @result, push @result,
'# Found ' . ($class->{differences}->{sum} || 0) '# Found ' . ($class->{differences}->{sum} || 0)
@@ -8687,9 +8693,10 @@ sub event_report {
underline_header => 0, underline_header => 0,
strip_whitespace => 0, strip_whitespace => 0,
); );
$hostno = 0;
$report->set_columns( $report->set_columns(
{ name => '' }, { name => '' },
map { { name => $_->{name}, right_justify => 1 } } @$hosts, map { $hostno++; { name => "host$hostno", right_justify => 1 } } @$hosts,
); );
foreach my $thing ( qw(Errors Warnings) ) { foreach my $thing ( qw(Errors Warnings) ) {
my @vals = $thing; my @vals = $thing;

2
lib/UpgradeReportFormatter.pm
View File

@@ -75,7 +75,7 @@ sub event_report {
my $hostno = 0; my $hostno = 0;
foreach my $host ( @$hosts ) { foreach my $host ( @$hosts ) {
$hostno++; $hostno++;
push @result, "# Host$hostno: " . ($host->{name} || '?') push @result, "# host$hostno: " . ($host->{name} || '?')
} }
# Differences report. This relies on a sampleno attrib in each class # Differences report. This relies on a sampleno attrib in each class

4
t/lib/UpgradeReportFormatter.t
View File

@@ -110,8 +110,8 @@ $meta_events = [
$expected = <<EOF; $expected = <<EOF;
# Query 1: ID 0x82860EDA9A88FCC5 at byte 0 _______________________________ # Query 1: ID 0x82860EDA9A88FCC5 at byte 0 _______________________________
# Host1: host1.domain.com:3306 # host1: host1.domain.com:3306
# Host2: host2.domain.com:3307 # host2: host2.domain.com:3307
# Found 1 differences in 3 samples: # Found 1 differences in 3 samples:
# checksums 0 # checksums 0
# row counts 1 # row counts 1