From 0accdb3bd361a7381d90eec065ba44e6b0a15b61 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 13 Feb 2023 12:44:57 +0300 Subject: [PATCH] PT-1595-percona toolkit docs still reference Maatkit (#591) - Removed Maatkit left overs - Keeped links to Maatkit bugs and wiki - Updated brokn links --- bin/pt-archiver | 2 +- bin/pt-table-sync | 6 +++--- lib/DSNParser.pm | 2 +- lib/SQLParser.pm | 6 +++--- t/pt-slave-delay/auto_restart.t | 3 +-- t/pt-slave-delay/issue_1169.t | 3 +-- t/pt-table-usage/explain_extended.t | 11 ----------- t/pt-table-usage/samples/ee.out | 6 ------ 8 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 t/pt-table-usage/samples/ee.out diff --git a/bin/pt-archiver b/bin/pt-archiver index a217c240..317bf28c 100755 --- a/bin/pt-archiver +++ b/bin/pt-archiver @@ -7380,7 +7380,7 @@ server. Before using this tool, please: =head1 DESCRIPTION pt-archiver is the tool I use to archive tables as described in -L. The goal is a low-impact, forward-only +L. The goal is a low-impact, forward-only job to nibble old data out of the table without impacting OLTP queries much. You can insert the data into another table, which need not be on the same server. You can also write it to a file in a format suitable for LOAD DATA diff --git a/bin/pt-table-sync b/bin/pt-table-sync index 64e4787e..ac3d546e 100755 --- a/bin/pt-table-sync +++ b/bin/pt-table-sync @@ -13101,7 +13101,7 @@ This existing literature mostly addressed how to find the differences between the tables, not how to resolve them once found. I needed a tool that would not only find them efficiently, but would then resolve them. I first began thinking about how to improve the technique further with my article -L, +L, where I discussed a number of problems with the Maxia/Coelho "bottom-up" algorithm. After writing that article, I began to write this tool. I wanted to actually implement their algorithm with some improvements so I was sure I @@ -13119,8 +13119,8 @@ also my own work. Another tool that can synchronize tables is the SQLyog Job Agent from webyog. Thanks to Rohit Nadhani, SJA's author, for the conversations about the general -techniques. There is a comparison of pt-table-sync and SJA at -L +techniques. There is a comparison of pt-table-sync and SJA at +L Thanks to the following people and organizations for helping in many ways: diff --git a/lib/DSNParser.pm b/lib/DSNParser.pm index 88c26906..d2af94e0 100644 --- a/lib/DSNParser.pm +++ b/lib/DSNParser.pm @@ -265,7 +265,7 @@ sub fill_in_dsn { } # Actually opens a connection, then sets some things on the connection so it is -# the way the Maatkit tools will expect. Tools should NEVER open their own +# the way the Percona tools will expect. Tools should NEVER open their own # connection or use $dbh->reconnect, or these things will not take place! sub get_dbh { my ( $self, $cxn_string, $user, $pass, $opts ) = @_; diff --git a/lib/SQLParser.pm b/lib/SQLParser.pm index ba9b69e3..973740d9 100644 --- a/lib/SQLParser.pm +++ b/lib/SQLParser.pm @@ -995,9 +995,9 @@ sub _parse_csv { if ( $args{quoted_values} ) { # If the vals are quoted, then they can contain commas, like: # "hello, world!", 'batman'. If only we could use Text::CSV, - # then I wouldn't write yet another csv parser to handle this, - # but Maatkit doesn't like package dependencies, so here's my - # light implementation of this classic problem. + # then we wouldn't write yet another csv parser to handle this, + # but Percona Toolkit doesn't like package dependencies, so here's + # our light implementation of this classic problem. my $quote_char = ''; VAL: foreach my $val ( split(',', $vals) ) { diff --git a/t/pt-slave-delay/auto_restart.t b/t/pt-slave-delay/auto_restart.t index 1516b455..d8938252 100644 --- a/t/pt-slave-delay/auto_restart.t +++ b/t/pt-slave-delay/auto_restart.t @@ -1,8 +1,7 @@ #!/usr/bin/env perl BEGIN { - die "The PERCONA_TOOLKIT_BRANCH environment variable is not set. See http://code.google. -com/p/maatkit/wiki/Testing" + die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; diff --git a/t/pt-slave-delay/issue_1169.t b/t/pt-slave-delay/issue_1169.t index f823cd4f..108f8dcd 100644 --- a/t/pt-slave-delay/issue_1169.t +++ b/t/pt-slave-delay/issue_1169.t @@ -1,8 +1,7 @@ #!/usr/bin/env perl BEGIN { - die "The PERCONA_TOOLKIT_BRANCH environment variable is not set. See http://code.google. -com/p/maatkit/wiki/Testing" + die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; diff --git a/t/pt-table-usage/explain_extended.t b/t/pt-table-usage/explain_extended.t index 1df29937..6761b359 100644 --- a/t/pt-table-usage/explain_extended.t +++ b/t/pt-table-usage/explain_extended.t @@ -62,17 +62,6 @@ is( "No error if table doesn't exist" ); -# This test fails in Maatkit, too. I guess I never finished writing it? -#ok( -# no_diff( -# sub { pt_table_usage::main(@args, -# '--query', "select count(*), max(lmp), min(lmp) FROM ca.interval_lmp_rt_5min as A INNER JOIN ca.lmp_rt_5min as B ON A.datetime = B.datetime WHERE A.datetime = '2011-12-01 21:05:00'") }, -# "t/pt-table-usage/samples/ee.out", -# stderr => 1, -# ), -# "New EXPLAIN EXTENDED" -#); - # ############################################################################# # Done. # ############################################################################# diff --git a/t/pt-table-usage/samples/ee.out b/t/pt-table-usage/samples/ee.out deleted file mode 100644 index c34679ba..00000000 --- a/t/pt-table-usage/samples/ee.out +++ /dev/null @@ -1,6 +0,0 @@ -Query_id: 0xDC115301537AEE70.1 -SELECT ca.lmp_rt_5min -JOIN ca.interval_lmp_rt_5min -JOIN ca.lmp_rt_5min -WHERE ca.interval_lmp_rt_5min -