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

PT-96 Fixed LOCAL DATA INFILE commands and JSON format

Browse Source
This commit is contained in:
Carlos Salguero
2017-03-10 17:06:20 -03:00
parent 3b6f1c3aff
commit 2b76371a4f
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib/JSONReportFormatter.t
View File

@@ -4,7 +4,7 @@ BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
$ENV{PTTEST_PRETTY_JSON} = 1; $ENV{PTTEST_PRETTY_JSON} = 0;
}; };

3
t/pt-query-digest/json.t
View File

@@ -4,6 +4,7 @@ BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
$ENV{PTTEST_PRETTY_JSON} = 0;
}; };
use strict; use strict;
@@ -16,7 +17,7 @@ require "$trunk/bin/pt-query-digest";
no warnings 'once'; no warnings 'once';
local $JSONReportFormatter::sorted_json = 1; local $JSONReportFormatter::sorted_json = 1;
local $JSONReportFormatter::pretty_json = 1; local $JSONReportFormatter::pretty_json = 0;
my @args = qw(--output json); my @args = qw(--output json);
my $sample = "$trunk/t/lib/samples"; my $sample = "$trunk/t/lib/samples";

2
t/pt-table-checksum/basics.t
View File

@@ -430,7 +430,7 @@ is(
# Test --where. # Test --where.
# ############################################################################# # #############################################################################
$sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql'); $sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t"); $master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
$output = output( $output = output(
sub { $exit_status = pt_table_checksum::main(@args, sub { $exit_status = pt_table_checksum::main(@args,

2
t/pt-table-checksum/chunk_size.t
View File

@@ -111,7 +111,7 @@ unlike(
# on replicas # on replicas
# ############################################################################# # #############################################################################
$sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql'); $sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t"); $master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
$master_dbh->do("SET SQL_LOG_BIN=0"); $master_dbh->do("SET SQL_LOG_BIN=0");
$master_dbh->do("DELETE FROM test.t WHERE id > 100"); $master_dbh->do("DELETE FROM test.t WHERE id > 100");
$master_dbh->do("SET SQL_LOG_BIN=1"); $master_dbh->do("SET SQL_LOG_BIN=1");

2
t/pt-table-checksum/resume.t
View File

@@ -41,7 +41,7 @@ my $output;
sub load_data_infile { sub load_data_infile {
my ($file, $where) = @_; my ($file, $where) = @_;
$master_dbh->do('truncate table percona.checksums'); $master_dbh->do('truncate table percona.checksums');
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums"); $master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
if ( $where ) { if ( $where ) {
PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', $where); PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', $where);
} }