percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-03-26 02:02:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix-fingerprint-bug-1174956.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-27 12:25:58 -07:00
parent 194ca2462c e6950a1c41
commit 0966b34997
8 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-fingerprint
View File

@@ -1532,8 +1532,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -1600,9 +1600,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

6
bin/pt-index-usage
View File

@@ -2377,8 +2377,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -2445,9 +2445,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

6
bin/pt-kill
View File

@@ -4655,8 +4655,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -4723,9 +4723,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

6
bin/pt-query-digest
View File

@@ -2802,8 +2802,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -2870,9 +2870,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

6
bin/pt-table-usage
View File

@@ -2115,8 +2115,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -2183,9 +2183,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

6
bin/pt-upgrade
View File

@@ -4579,8 +4579,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -4647,9 +4647,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

6
lib/QueryRewriter.pm
View File

@@ -62,8 +62,8 @@ sub new {
sub strip_comments {
my ( $self, $query ) = @_;
return unless $query;
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
if ( $query =~ m/$vlc_rf/i ) { # contains show + version
$query =~ s/$vlc_re//go;
}
@@ -166,9 +166,9 @@ sub fingerprint {
if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
$query = $beginning; # Shorten multi-value INSERT statements ASAP
}
$query =~ s/$olc_re//go;
$query =~ s/$mlc_re//go;
$query =~ s/$olc_re//go;
$query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
&& return $query;

13
t/lib/QueryRewriter.t
View File

@@ -10,7 +10,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More tests => 271;
use Test::More;
use QueryRewriter;
use QueryParser;
@@ -407,6 +407,15 @@ is(
"Fingerprint db.tbl<number>name (preserve number)"
);
is(
$qr->fingerprint(
"/* -- S++ SU ABORTABLE -- spd_user: rspadim */SELECT SQL_SMALL_RESULT SQL_CACHE DISTINCT centro_atividade FROM est_dia WHERE unidade_id=1001 AND item_id=67 AND item_id_red=573"
),
"select sql_small_result sql_cache distinct centro_atividade from est_dia where unidade_id=? and item_id=? and item_id_red=?",
"Fingerprint /* -- comment */ SELECT (bug 1174956)"
);
# #############################################################################
# convert_to_select()
# #############################################################################
@@ -1406,4 +1415,4 @@ is(
# #############################################################################
# Done.
# #############################################################################
exit;
done_testing;