Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/fix-fingerprint-bug-1174956 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4

  1. fix-fingerprint-bug-1174956
  2. Merge into release-2.2.4
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 596
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-fingerprint-bug-1174956
Merge into: lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4
Diff against target: 216 lines (+32/-23)
8 files modified
bin/pt-fingerprint (+3/-3)
bin/pt-index-usage (+3/-3)
bin/pt-kill (+3/-3)
bin/pt-query-digest (+3/-3)
bin/pt-table-usage (+3/-3)
bin/pt-upgrade (+3/-3)
lib/QueryRewriter.pm (+3/-3)
t/lib/QueryRewriter.t (+11/-2)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-fingerprint-bug-1174956
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+171895@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-fingerprint'
2--- bin/pt-fingerprint 2013-06-25 22:32:19 +0000
3+++ bin/pt-fingerprint 2013-06-27 19:26:29 +0000
4@@ -1532,8 +1532,8 @@
5 sub strip_comments {
6 my ( $self, $query ) = @_;
7 return unless $query;
8+ $query =~ s/$mlc_re//go;
9 $query =~ s/$olc_re//go;
10- $query =~ s/$mlc_re//go;
11 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
12 $query =~ s/$vlc_re//go;
13 }
14@@ -1600,9 +1600,9 @@
15 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
16 $query = $beginning; # Shorten multi-value INSERT statements ASAP
17 }
18-
19+
20+ $query =~ s/$mlc_re//go;
21 $query =~ s/$olc_re//go;
22- $query =~ s/$mlc_re//go;
23 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
24 && return $query;
25
26
27=== modified file 'bin/pt-index-usage'
28--- bin/pt-index-usage 2013-06-25 23:30:23 +0000
29+++ bin/pt-index-usage 2013-06-27 19:26:29 +0000
30@@ -2377,8 +2377,8 @@
31 sub strip_comments {
32 my ( $self, $query ) = @_;
33 return unless $query;
34+ $query =~ s/$mlc_re//go;
35 $query =~ s/$olc_re//go;
36- $query =~ s/$mlc_re//go;
37 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
38 $query =~ s/$vlc_re//go;
39 }
40@@ -2445,9 +2445,9 @@
41 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
42 $query = $beginning; # Shorten multi-value INSERT statements ASAP
43 }
44-
45+
46+ $query =~ s/$mlc_re//go;
47 $query =~ s/$olc_re//go;
48- $query =~ s/$mlc_re//go;
49 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
50 && return $query;
51
52
53=== modified file 'bin/pt-kill'
54--- bin/pt-kill 2013-06-25 22:32:19 +0000
55+++ bin/pt-kill 2013-06-27 19:26:29 +0000
56@@ -4655,8 +4655,8 @@
57 sub strip_comments {
58 my ( $self, $query ) = @_;
59 return unless $query;
60+ $query =~ s/$mlc_re//go;
61 $query =~ s/$olc_re//go;
62- $query =~ s/$mlc_re//go;
63 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
64 $query =~ s/$vlc_re//go;
65 }
66@@ -4723,9 +4723,9 @@
67 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
68 $query = $beginning; # Shorten multi-value INSERT statements ASAP
69 }
70-
71+
72+ $query =~ s/$mlc_re//go;
73 $query =~ s/$olc_re//go;
74- $query =~ s/$mlc_re//go;
75 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
76 && return $query;
77
78
79=== modified file 'bin/pt-query-digest'
80--- bin/pt-query-digest 2013-06-27 18:41:24 +0000
81+++ bin/pt-query-digest 2013-06-27 19:26:29 +0000
82@@ -2802,8 +2802,8 @@
83 sub strip_comments {
84 my ( $self, $query ) = @_;
85 return unless $query;
86+ $query =~ s/$mlc_re//go;
87 $query =~ s/$olc_re//go;
88- $query =~ s/$mlc_re//go;
89 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
90 $query =~ s/$vlc_re//go;
91 }
92@@ -2870,9 +2870,9 @@
93 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
94 $query = $beginning; # Shorten multi-value INSERT statements ASAP
95 }
96-
97+
98+ $query =~ s/$mlc_re//go;
99 $query =~ s/$olc_re//go;
100- $query =~ s/$mlc_re//go;
101 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
102 && return $query;
103
104
105=== modified file 'bin/pt-table-usage'
106--- bin/pt-table-usage 2013-06-25 22:32:19 +0000
107+++ bin/pt-table-usage 2013-06-27 19:26:29 +0000
108@@ -2115,8 +2115,8 @@
109 sub strip_comments {
110 my ( $self, $query ) = @_;
111 return unless $query;
112+ $query =~ s/$mlc_re//go;
113 $query =~ s/$olc_re//go;
114- $query =~ s/$mlc_re//go;
115 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
116 $query =~ s/$vlc_re//go;
117 }
118@@ -2183,9 +2183,9 @@
119 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
120 $query = $beginning; # Shorten multi-value INSERT statements ASAP
121 }
122-
123+
124+ $query =~ s/$mlc_re//go;
125 $query =~ s/$olc_re//go;
126- $query =~ s/$mlc_re//go;
127 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
128 && return $query;
129
130
131=== modified file 'bin/pt-upgrade'
132--- bin/pt-upgrade 2013-06-26 19:26:34 +0000
133+++ bin/pt-upgrade 2013-06-27 19:26:29 +0000
134@@ -4579,8 +4579,8 @@
135 sub strip_comments {
136 my ( $self, $query ) = @_;
137 return unless $query;
138+ $query =~ s/$mlc_re//go;
139 $query =~ s/$olc_re//go;
140- $query =~ s/$mlc_re//go;
141 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
142 $query =~ s/$vlc_re//go;
143 }
144@@ -4647,9 +4647,9 @@
145 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
146 $query = $beginning; # Shorten multi-value INSERT statements ASAP
147 }
148-
149+
150+ $query =~ s/$mlc_re//go;
151 $query =~ s/$olc_re//go;
152- $query =~ s/$mlc_re//go;
153 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
154 && return $query;
155
156
157=== modified file 'lib/QueryRewriter.pm'
158--- lib/QueryRewriter.pm 2013-01-03 00:19:16 +0000
159+++ lib/QueryRewriter.pm 2013-06-27 19:26:29 +0000
160@@ -62,8 +62,8 @@
161 sub strip_comments {
162 my ( $self, $query ) = @_;
163 return unless $query;
164+ $query =~ s/$mlc_re//go;
165 $query =~ s/$olc_re//go;
166- $query =~ s/$mlc_re//go;
167 if ( $query =~ m/$vlc_rf/i ) { # contains show + version
168 $query =~ s/$vlc_re//go;
169 }
170@@ -166,9 +166,9 @@
171 if ( my ($beginning) = $query =~ m/\A((?:INSERT|REPLACE)(?: IGNORE)?\s+INTO.+?VALUES\s*\(.*?\))\s*,\s*\(/is ) {
172 $query = $beginning; # Shorten multi-value INSERT statements ASAP
173 }
174-
175+
176+ $query =~ s/$mlc_re//go;
177 $query =~ s/$olc_re//go;
178- $query =~ s/$mlc_re//go;
179 $query =~ s/\Ause \S+\Z/use ?/i # Abstract the DB in USE
180 && return $query;
181
182
183=== modified file 't/lib/QueryRewriter.t'
184--- t/lib/QueryRewriter.t 2012-03-26 22:40:46 +0000
185+++ t/lib/QueryRewriter.t 2013-06-27 19:26:29 +0000
186@@ -10,7 +10,7 @@
187 use strict;
188 use warnings FATAL => 'all';
189 use English qw(-no_match_vars);
190-use Test::More tests => 271;
191+use Test::More;
192
193 use QueryRewriter;
194 use QueryParser;
195@@ -407,6 +407,15 @@
196 "Fingerprint db.tbl<number>name (preserve number)"
197 );
198
199+
200+is(
201+ $qr->fingerprint(
202+ "/* -- 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"
203+ ),
204+ "select sql_small_result sql_cache distinct centro_atividade from est_dia where unidade_id=? and item_id=? and item_id_red=?",
205+ "Fingerprint /* -- comment */ SELECT (bug 1174956)"
206+);
207+
208 # #############################################################################
209 # convert_to_select()
210 # #############################################################################
211@@ -1406,4 +1415,4 @@
212 # #############################################################################
213 # Done.
214 # #############################################################################
215-exit;
216+done_testing;

Subscribers

People subscribed via source and target branches

to all changes: