From 46b0c9ab0cf265df62979ebeaa6b2d5e0f96ee12 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Tue, 17 Jul 2012 09:57:08 -0600 Subject: [PATCH] Update output samples with new hostN. --- bin/pt-upgrade | 2 +- .../samples/001/non-selects-rewritten.txt | 120 +++++++++--------- t/pt-upgrade/samples/001/non-selects.txt | 40 +++--- .../samples/001/select-everyone-no-stats.txt | 40 +++--- .../samples/001/select-everyone-rows.txt | 40 +++--- t/pt-upgrade/samples/001/select-everyone.txt | 40 +++--- t/pt-upgrade/samples/001/select-one-rows.txt | 40 +++--- t/pt-upgrade/samples/001/select-one.txt | 40 +++--- t/pt-upgrade/samples/002/report-01.txt | 40 +++--- t/pt-upgrade/samples/003/report001.txt | 40 +++--- 10 files changed, 232 insertions(+), 210 deletions(-) diff --git a/bin/pt-upgrade b/bin/pt-upgrade index 5736a6bd..d7344cd3 100755 --- a/bin/pt-upgrade +++ b/bin/pt-upgrade @@ -8674,7 +8674,7 @@ sub event_report { my $hostno = 0; foreach my $host ( @$hosts ) { $hostno++; - push @result, "# Host$hostno: " . ($host->{name} || '?') + push @result, "# host$hostno: " . ($host->{name} || '?') } my $class = $meta_stats->{classes}->{$where}; diff --git a/t/pt-upgrade/samples/001/non-selects-rewritten.txt b/t/pt-upgrade/samples/001/non-selects-rewritten.txt index 0c9ca899..f43e369c 100644 --- a/t/pt-upgrade/samples/001/non-selects-rewritten.txt +++ b/t/pt-upgrade/samples/001/non-selects-rewritten.txt @@ -1,5 +1,7 @@ # Query 1: ID 0xC11622E1B2607157 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 1 samples: # checksums 0 # column counts 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 7 7 -# min 7 7 -# max 7 7 -# avg 7 7 -# pct_95 7 7 -# stddev 0 0 -# median 7 7 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 7 7 +# min 7 7 +# max 7 7 +# avg 7 7 +# pct_95 7 7 +# stddev 0 0 +# median 7 7 # Converted non-SELECT: # delete from t where id is not null # Fingerprint @@ -34,6 +36,8 @@ select * from t where id is not null # Query 2: ID 0xD7D2F2B7AB4602A4 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 1 samples: # checksums 0 # column counts 0 @@ -42,31 +46,33 @@ select * from t where id is not null # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 2 2 -# min 2 2 -# max 2 2 -# avg 2 2 -# pct_95 2 2 -# stddev 0 0 -# median 2 2 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 2 2 +# min 2 2 +# max 2 2 +# avg 2 2 +# pct_95 2 2 +# stddev 0 0 +# median 2 2 # Fingerprint # select id from test.t where id > ? use `test`; select id from test.t where id > 3 # Query 3: ID 0x37BA5C52702C61C6 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 1 samples: # checksums 0 # column counts 0 @@ -75,25 +81,25 @@ select id from test.t where id > 3 # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 1 1 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 1 1 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 # Converted non-SELECT: # update t set name='changed' where id=0 # Fingerprint diff --git a/t/pt-upgrade/samples/001/non-selects.txt b/t/pt-upgrade/samples/001/non-selects.txt index a59a29b9..46f4abb2 100644 --- a/t/pt-upgrade/samples/001/non-selects.txt +++ b/t/pt-upgrade/samples/001/non-selects.txt @@ -1,5 +1,7 @@ # Query 1: ID 0xD7D2F2B7AB4602A4 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 1 samples: # checksums 0 # column counts 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 2 2 -# min 2 2 -# max 2 2 -# avg 2 2 -# pct_95 2 2 -# stddev 0 0 -# median 2 2 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 2 2 +# min 2 2 +# max 2 2 +# avg 2 2 +# pct_95 2 2 +# stddev 0 0 +# median 2 2 use `test`; select id from test.t where id > 3 diff --git a/t/pt-upgrade/samples/001/select-everyone-no-stats.txt b/t/pt-upgrade/samples/001/select-everyone-no-stats.txt index c59ff4ab..c6861d0a 100644 --- a/t/pt-upgrade/samples/001/select-everyone-no-stats.txt +++ b/t/pt-upgrade/samples/001/select-everyone-no-stats.txt @@ -1,5 +1,7 @@ # Query 1: ID 0x4AF1501167533D97 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 7 samples: # checksums 0 # column counts 0 @@ -8,23 +10,23 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 7 7 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 7 7 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 select id, name, last_login from test.t where id=5 diff --git a/t/pt-upgrade/samples/001/select-everyone-rows.txt b/t/pt-upgrade/samples/001/select-everyone-rows.txt index 6ad6c4b2..8954183b 100644 --- a/t/pt-upgrade/samples/001/select-everyone-rows.txt +++ b/t/pt-upgrade/samples/001/select-everyone-rows.txt @@ -1,5 +1,7 @@ # Query 1: ID 0x4AF1501167533D97 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 7 samples: # column counts 0 # column types 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 7 7 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 7 7 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 select id, name, last_login from test.t where id=5 # Statistics diff --git a/t/pt-upgrade/samples/001/select-everyone.txt b/t/pt-upgrade/samples/001/select-everyone.txt index aff53d71..c2144b40 100644 --- a/t/pt-upgrade/samples/001/select-everyone.txt +++ b/t/pt-upgrade/samples/001/select-everyone.txt @@ -1,5 +1,7 @@ # Query 1: ID 0x4AF1501167533D97 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 7 samples: # checksums 0 # column counts 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 7 7 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 7 7 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 select id, name, last_login from test.t where id=5 # Statistics diff --git a/t/pt-upgrade/samples/001/select-one-rows.txt b/t/pt-upgrade/samples/001/select-one-rows.txt index 7cf32f6b..8d943fcf 100644 --- a/t/pt-upgrade/samples/001/select-one-rows.txt +++ b/t/pt-upgrade/samples/001/select-one-rows.txt @@ -1,5 +1,7 @@ # Query 1: ID 0x4AF1501167533D97 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 1 samples: # column counts 0 # column types 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 1 1 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 1 1 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 use `test`; select id, name, last_login from test.t where id=0 diff --git a/t/pt-upgrade/samples/001/select-one.txt b/t/pt-upgrade/samples/001/select-one.txt index b860fb31..ea1f5878 100644 --- a/t/pt-upgrade/samples/001/select-one.txt +++ b/t/pt-upgrade/samples/001/select-one.txt @@ -1,5 +1,7 @@ # Query 1: ID 0x4AF1501167533D97 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 0 differences in 1 samples: # checksums 0 # column counts 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 1 1 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 1 1 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 use `test`; select id, name, last_login from test.t where id=0 diff --git a/t/pt-upgrade/samples/002/report-01.txt b/t/pt-upgrade/samples/002/report-01.txt index 1a05a895..420fcea6 100644 --- a/t/pt-upgrade/samples/002/report-01.txt +++ b/t/pt-upgrade/samples/002/report-01.txt @@ -1,5 +1,7 @@ # Query 1: ID 0x3C830E3839B916D7 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 1 differences in 1 samples: # column counts 0 # column types 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 4 3 -# min 4 3 -# max 4 3 -# avg 4 3 -# pct_95 4 3 -# stddev 0 0 -# median 4 3 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 4 3 +# min 4 3 +# max 4 3 +# avg 4 3 +# pct_95 4 3 +# stddev 0 0 +# median 4 3 use `test`; select i from t where i is not null diff --git a/t/pt-upgrade/samples/003/report001.txt b/t/pt-upgrade/samples/003/report001.txt index ddbae51e..217d2f60 100644 --- a/t/pt-upgrade/samples/003/report001.txt +++ b/t/pt-upgrade/samples/003/report001.txt @@ -1,5 +1,7 @@ # Query 1: ID 0xC1B1E457814417E4 at byte 0 _______________________________ +# host1: 127.1:12345 +# host2: 127.1:12348 # Found 1 differences in 1 samples: # column counts 0 # column types 0 @@ -8,25 +10,25 @@ # warning counts 0 # warning levels 0 # warnings 0 -# 127.1:12345 127.1:12348 -# Errors 0 0 -# Warnings 0 0 -# Query_time -# sum 0 0 -# min 0 0 -# max 0 0 -# avg 0 0 -# pct_95 0 0 -# stddev 0 0 -# median 0 0 -# row_count -# sum 1 1 -# min 1 1 -# max 1 1 -# avg 1 1 -# pct_95 1 1 -# stddev 0 0 -# median 1 1 +# host1 host2 +# Errors 0 0 +# Warnings 0 0 +# Query_time +# sum 0 0 +# min 0 0 +# max 0 0 +# avg 0 0 +# pct_95 0 0 +# stddev 0 0 +# median 0 0 +# row_count +# sum 1 1 +# min 1 1 +# max 1 1 +# avg 1 1 +# pct_95 1 1 +# stddev 0 0 +# median 1 1 use `test`; SELECT SUM(total) FROM test.t WHERE id > 0