percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-26 23:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename results file results to rows and meta to results. Test more --save-results.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-20 09:20:17 -07:00
parent 92194f1711
commit 144b4794b9
21 changed files with 187 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bin/pt-upgrade
View File

@@ -5932,13 +5932,13 @@ has '_query_fh' => (
required => 0,
);
has '_meta_fh' => (
has '_results_fh' => (
is => 'rw',
isa => 'Maybe[FileHandle]',
required => 0,
);
has '_results_fh' => (
has '_rows_fh' => (
is => 'rw',
isa => 'Maybe[FileHandle]',
required => 0,
@@ -5954,19 +5954,19 @@ sub BUILDARGS {
open my $_query_fh, '>', $query_file
or die "Cannot open $query_file for writing: $OS_ERROR";
my $meta_file = "$dir/meta";
open my $_meta_fh, '>', $meta_file
or die "Cannot open $meta_file for writing: $OS_ERROR";
my $results_file = "$dir/results";
open my $_results_fh, '>', $results_file
or die "Cannot open $results_file for writing: $OS_ERROR";
my $rows_file = "$dir/rows";
open my $_rows_fh, '>', $rows_file
or die "Cannot open $rows_file for writing: $OS_ERROR";
my $self = {
%$args,
_query_fh => $_query_fh,
_meta_fh => $_meta_fh,
_results_fh => $_results_fh,
_rows_fh => $_rows_fh,
};
return $self;
@@ -5982,18 +5982,30 @@ sub save {
print { $self->_query_fh } $event->{arg}, "\n##\n";
if ( my $error = $results->{error} ) {
print { $self->_meta_fh } $error, "\n##\n";
print { $self->_results_fh } '', "\n##\n";
print { $self->_results_fh }
$self->dumper({ error => $error}, 'results'), "\n##\n";
print { $self->_rows_fh } "\n##\n";
}
else {
my $sth = $results->{sth};
my $rows = $sth->fetchall_arrayref();
eval {
$sth->finish;
delete $results->{sth};
};
print { $self->_meta_fh } $self->dumper($results, 'meta'), "\n##\n";
print { $self->_results_fh } $self->dumper($rows, 'results'), "\n##\n";
my $rows;
if ( my $sth = $results->{sth} ) {
if ( $event->{arg} =~ m/(?:^\s*SELECT|(?:\*\/\s*SELECT))/i ) {
$rows = $sth->fetchall_arrayref();
}
eval {
$sth->finish;
};
if ( $EVAL_ERROR ) {
PTDEBUG && _d($EVAL_ERROR);
}
}
print { $self->_rows_fh }
($rows ? $self->dumper($rows, 'rows') : ''), "\n##\n";
delete $results->{error};
delete $results->{sth};
print { $self->_results_fh } $self->dumper($results, 'results'), "\n##\n";
}
return;