PT-2156 Fix tests for lib, part2 (#650)

* PT-2156 - Fix tests for lib Fixed tests, broken by putting fix for PT-1554 into the library code, mostly by updating checksums. Added AutoCommit option for test lib/QueryReview.t Reset SQL mode to empty to allow TableChunker to work with invalid and zero dates * PT-2156 - Fix tests for lib Adjusted t/lib/SchemaIterator.t to work with version 8.0 * PT-2156 - Fix tests for lib Adjusted b/t/lib/Processlist.t, so it reflects fix for PT-981 * PT-2156 - Fix tests for lib Adjusted t/lib/HTTP/Micro.t, so it works with different order of parameters, returned at v.percona.com/ Adjusted test for empty files in t/lib/bash/collect.t Disabled mysqladmin debug test in t/lib/bash/collect.t, because of PT-2242 * PT-2156 - Fix tests for lib Added LC_NUMERRIC=POSIX into t/lib/bash/report_system_info.sh, so reports in tests are not environment-dependent Updated expected results in t/lib/bash/report_system_info.sh, so they reflect new information, collected by pt-summary * PT-2156 - Fix tests for lib - Improved fix for PT-76, so it handles inline comments - Added test case for PT-76 - Improved fix for PT-1720, so it ignores unrecognizable option only if it comes from the toolkit-wide files and still errors out if wrong option was passed via command line or the tool-specific option file. * PT-2156 - Fix tests for lib - Improved fix for PT-2102, so it finds running instance configuration file using PID and also does not break t/lib/bash/report_mysql_info.t test - Removed unnecessary copy-paste from t/pt-mysql-summary/pt-2102.t test - Adjusted number of collected files in t/lib/bash/collect_mysql_info.sh * PT-2156 - Fix tests for lib - Fix for PT-1543 and MyRocks collection were originally put only into lib/bash/report_mysql_info.shthat broke the logic of collecting data first, then formatting report from this data. This, in its turn, broke test t/lib/bash/report_mysql_info.sh/t/lib/bash/report_mysql_info.t, because CMD_MYSQL is not defined in this library. I rewrote these fixes, so they follow original logic of the tool (pt-mysql-summary) - Added tests for keyring plugin, encrypted tables, and MyRocks for t/lib/bash/report_mysql_info.sh and t/pt-mysql-summary/pt-mysql-summary_encryption.t * PT-2156 - Fix tests for lib - Added FLUSH TABLES to t/lib/bash/collect.sh, so it does not fail opentables tests if run when more than 1000 tables open in the sandbox environment - Changed number of expected sample files to reflect keyring colletion file * PT-2156 - Fix tests for lib - Added skip to some tests in lib that file when run with PXC, because not supported to work with PXC - Adjusted configuration files for PXC, so they allow LOAD DATA/SELECT INTO OUTFILE commands - Adjusted data samples, so they do not depend on auto increment values - Fixed lib tests, failing with PXC * PT-2156 - Fix tests for lib Updated tests for pt-online-schema-change, so they work with PXC and skipped if designed for semi-synchronous replication setup * PT-2156 - Fix tests for lib - Added cluster-specific samples for t/lib/SchemaIterator.t - Removed extra debugging print from t/pt-table-checksum/pt-1728.t * PT-2156 - Fix tests for lib Evgeniy's review on July 20 * Update t/lib/TableSyncer.t Removed comment left after debugging * Update t/pt-mysql-summary/pt-mysql-summary_encryption.t Removed extra debug output * PT-2156 - Fix tests for lib Tabs to spaces
2025-09-10 13:11:32 +00:00 · 2023-08-02 14:50:21 +03:00
parent 156372fb73
commit 9755074cd8
234 changed files with 21507 additions and 1164 deletions
--- a/t/lib/samples/QueryReportFormatter/report001.txt
+++ b/t/lib/samples/QueryReportFormatter/report001.txt
@@ -6,7 +6,7 @@
 # Exec time             1s      1s      1s      1s      1s       0      1s
 # Lock time            1ms     1ms     1ms     1ms     1ms       0     1ms

-# Query 1: 0 QPS, 0x concurrency, ID 0x5796997451B1FA1D at byte 123 ______
+# Query 1: 0 QPS, 0x concurrency, ID 0x1E49D897CED25CB05796997451B1FA1D at byte 123
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2007-10-15 21:43:52
 # Attribute    pct   total     min     max     avg     95%  stddev  median
@@ -34,6 +34,6 @@
 select col from tbl where id=42\G

 # Profile
-# Rank Query ID           Response time Calls R/Call V/M   Item
-# ==== ================== ============= ===== ====== ===== ==========
-#    1 0x5796997451B1FA1D 1.0007 100.0%     1 1.0007  0.00 SELECT tbl
+# Rank Query ID                            Response time Calls R/Call V/M 
+# ==== =================================== ============= ===== ====== ====
+#    1 0x1E49D897CED25CB05796997451B1FA1D  1.0007 100.0%     1 1.0007  0.00 SELECT tbl
--- a/t/lib/samples/QueryReportFormatter/report002.txt
+++ b/t/lib/samples/QueryReportFormatter/report002.txt
@@ -1,5 +1,5 @@

-# Query 1: 0 QPS, 0x concurrency, ID 0x3F79759E7FA2F117 at byte 1106 _____
+# Query 1: 0 QPS, 0x concurrency, ID 0x53704700F9CECAAF3F79759E7FA2F117 at byte 1106
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2009-12-08 09:23:49.637892
 # Attribute    pct   total     min     max     avg     95%  stddev  median
@@ -29,7 +29,7 @@ EXECUTE SELECT i FROM d.t WHERE i="3"\G
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT i FROM d.t WHERE i="3"\G

-# Query 2: 0 QPS, 0x concurrency, ID 0xAA8E9FA785927259 at byte 0 ________
+# Query 2: 0 QPS, 0x concurrency, ID 0xC29D79D8CB57E235AA8E9FA785927259 at byte 0
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2009-12-08 09:23:49.637394
 # Attribute    pct   total     min     max     avg     95%  stddev  median
@@ -60,6 +60,6 @@ PREPARE SELECT i FROM d.t WHERE i=?\G
 SELECT i FROM d.t WHERE i=?\G

 # Prepared statements
-# Rank Query ID           PREP PREP Response EXEC EXEC Response Item
-# ==== ================== ==== ============= ==== ============= ==========
-#    1 0x3F79759E7FA2F117    1  0.0003  0.9%    1  0.0303 99.1% SELECT d.t
+# Rank Query ID                           PREP PREP Response EXEC EXEC Res
+# ==== ================================== ==== ============= ==== ========
+#    1 0x53704700F9CECAAF3F79759E7FA2F117    1  0.0003  0.9%    1  0.0303 99.1% SELECT d.t
--- a/t/lib/samples/QueryReportFormatter/report003.txt
+++ b/t/lib/samples/QueryReportFormatter/report003.txt
@@ -1,10 +1,10 @@

 # Profile
-# Rank Query ID           Response time Calls R/Call V/M   Item
-# ==== ================== ============= ===== ====== ===== ==========
-#    1 0x5796997451B1FA1D 1.0007 100.0%     1 1.0007  0.00 SELECT tbl
+# Rank Query ID                            Response time Calls R/Call V/M 
+# ==== =================================== ============= ===== ====== ====
+#    1 0x1E49D897CED25CB05796997451B1FA1D  1.0007 100.0%     1 1.0007  0.00 SELECT tbl

-# Query 1: 0 QPS, 0x concurrency, ID 0x5796997451B1FA1D at byte 123 ______
+# Query 1: 0 QPS, 0x concurrency, ID 0x1E49D897CED25CB05796997451B1FA1D at byte 123
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2007-10-15 21:43:52
 # Attribute    pct   total     min     max     avg     95%  stddev  median
--- a/t/lib/samples/QueryReportFormatter/report004.txt
+++ b/t/lib/samples/QueryReportFormatter/report004.txt
@@ -1,6 +1,6 @@

 # Profile
-# Rank Query ID           Response time Calls R/Call V/M   Item
-# ==== ================== ============= ===== ====== ===== ==========
-#    1 0xAECF4CA2310AC9E2  1.0303 97.1%     1 1.0303  0.00 UPDATE foo
-# MISC 0xMISC              0.0306  2.9%     2 0.0153   0.0 <2 ITEMS>
+# Rank Query ID                            Response time Calls R/Call V/M 
+# ==== =================================== ============= ===== ====== ====
+#    1 0xBAA47CE27F8878DBAECF4CA2310AC9E2   1.0303 97.1%     1 1.0303  0.00 UPDATE foo
+# MISC 0xMISC                               0.0306  2.9%     2 0.0153   0.0 <2 ITEMS>
--- a/t/lib/samples/QueryReportFormatter/report005.txt
+++ b/t/lib/samples/QueryReportFormatter/report005.txt
@@ -1,5 +1,5 @@

 # Profile
-# Rank Query ID           Response time  Calls R/Call V/M   Item
-# ==== ================== ============== ===== ====== ===== ========
-#    1 0xCB5621E548E5497F 17.5000 100.0%     4 4.3750  2.23 SELECT t
+# Rank Query ID                            Response time  Calls R/Call V/M
+# ==== =================================== ============== ===== ====== ===
+#    1 0x5F47280C0D7DCF5CCB5621E548E5497F  17.5000 100.0%     4 4.3750  2.23 SELECT t
--- a/t/lib/samples/QueryReportFormatter/report007.txt
+++ b/t/lib/samples/QueryReportFormatter/report007.txt
@@ -1,4 +1,4 @@
-# Query 1: 2 QPS, 9.00x concurrency, ID 0x82860EDA9A88FCC5 at byte 1 _____
+# Query 1: 2 QPS, 9.00x concurrency, ID 0x56A78B46A896465882860EDA9A88FCC5 at byte 1
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 5.44
 # Time range: 2007-10-15 21:43:52 to 21:43:53
--- a/t/lib/samples/QueryReportFormatter/report009.txt
+++ b/t/lib/samples/QueryReportFormatter/report009.txt
@@ -1,4 +1,4 @@
-# Query 1: 0 QPS, 0x concurrency, ID 0x5D51E5F01B88B79E at byte 0 ________
+# Query 1: 0 QPS, 0x concurrency, ID 0x7417646A9FE969365D51E5F01B88B79E at byte 0
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2009-04-12 11:00:13.118191
--- a/t/lib/samples/QueryReportFormatter/report010.txt
+++ b/t/lib/samples/QueryReportFormatter/report010.txt
@@ -1,4 +1,4 @@
-# Query 1: 0 QPS, 0x concurrency, ID 0x82860EDA9A88FCC5 at byte 0 ________
+# Query 1: 0 QPS, 0x concurrency, ID 0x56A78B46A896465882860EDA9A88FCC5 at byte 0
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2007-10-15 21:43:52
--- a/t/lib/samples/QueryReportFormatter/report011.txt
+++ b/t/lib/samples/QueryReportFormatter/report011.txt
@@ -1,4 +1,4 @@
-# Query 1: 0.67 QPS, 1x concurrency, ID 0x82860EDA9A88FCC5 at byte 0 _____
+# Query 1: 0.67 QPS, 1x concurrency, ID 0x56A78B46A896465882860EDA9A88FCC5 at byte 0
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.33
 # Time range: 2007-10-15 21:43:52 to 21:43:55
--- a/t/lib/samples/QueryReportFormatter/report012.txt
+++ b/t/lib/samples/QueryReportFormatter/report012.txt
@@ -1,4 +1,4 @@
-# Query 1: 1 QPS, 2x concurrency, ID 0x82860EDA9A88FCC5 at byte 0 ________
+# Query 1: 1 QPS, 2x concurrency, ID 0x56A78B46A896465882860EDA9A88FCC5 at byte 0
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.30
 # Time range: 2007-10-15 21:43:52 to 21:43:55
--- a/t/lib/samples/QueryReportFormatter/report013.txt
+++ b/t/lib/samples/QueryReportFormatter/report013.txt
@@ -1,4 +1,4 @@
-# Item 1: 0 QPS, 0x concurrency, ID 0xEDEF654FCCC4A4D8 at byte 0 _________
+# Item 1: 0 QPS, 0x concurrency, ID 0xACBD18DB4CC2F85CEDEF654FCCC4A4D8 at byte 0
 # Scores: V/M = 0.00
 # Attribute    pct   total     min     max     avg     95%  stddev  median
 # ============ === ======= ======= ======= ======= ======= ======= =======
--- a/t/lib/samples/QueryReportFormatter/report014.txt
+++ b/t/lib/samples/QueryReportFormatter/report014.txt
@@ -1,4 +1,4 @@
-# Item 1: 0 QPS, 0x concurrency, ID 0xEDEF654FCCC4A4D8 at byte 0 _________
+# Item 1: 0 QPS, 0x concurrency, ID 0xACBD18DB4CC2F85CEDEF654FCCC4A4D8 at byte 0
 # Scores: V/M = 0.00
 # Attribute    pct   total     min     max     avg     95%  stddev  median
 # ============ === ======= ======= ======= ======= ======= ======= =======
--- a/t/lib/samples/QueryReportFormatter/report014_no_trim.txt
+++ b/t/lib/samples/QueryReportFormatter/report014_no_trim.txt
@@ -1,4 +1,4 @@
-# Item 1: 0 QPS, 0x concurrency, ID 0xEDEF654FCCC4A4D8 at byte 0 _________
+# Item 1: 0 QPS, 0x concurrency, ID 0xACBD18DB4CC2F85CEDEF654FCCC4A4D8 at byte 0
 # Scores: V/M = 0.00
 # Attribute    pct   total     min     max     avg     95%  stddev  median
 # ============ === ======= ======= ======= ======= ======= ======= =======
--- a/t/lib/samples/QueryReportFormatter/report014_trim_12.txt
+++ b/t/lib/samples/QueryReportFormatter/report014_trim_12.txt
@@ -1,4 +1,4 @@
-# Item 1: 0 QPS, 0x concurrency, ID 0xEDEF654FCCC4A4D8 at byte 0 _________
+# Item 1: 0 QPS, 0x concurrency, ID 0xACBD18DB4CC2F85CEDEF654FCCC4A4D8 at byte 0
 # Scores: V/M = 0.00
 # Attribute    pct   total     min     max     avg     95%  stddev  median
 # ============ === ======= ======= ======= ======= ======= ======= =======
--- a/t/lib/samples/QueryReportFormatter/report015.txt
+++ b/t/lib/samples/QueryReportFormatter/report015.txt
@@ -1,4 +1,4 @@
-# Item 1: 0 QPS, 0x concurrency, ID 0xEDEF654FCCC4A4D8 at byte 0 _________
+# Item 1: 0 QPS, 0x concurrency, ID 0xACBD18DB4CC2F85CEDEF654FCCC4A4D8 at byte 0
 # Scores: V/M = 0.00
 # Attribute    pct   total     min     max     avg     95%  stddev  median
 # ============ === ======= ======= ======= ======= ======= ======= =======
--- a/t/lib/samples/QueryReportFormatter/report016.txt
+++ b/t/lib/samples/QueryReportFormatter/report016.txt
@@ -1,4 +1,4 @@
-# Item 1: 0 QPS, 0x concurrency, ID 0xEDEF654FCCC4A4D8 at byte 0 _________
+# Item 1: 0 QPS, 0x concurrency, ID 0xACBD18DB4CC2F85CEDEF654FCCC4A4D8 at byte 0
 # Scores: V/M = 0.00
 # Attribute    pct   total     min     max     avg     95%  stddev  median
 # ============ === ======= ======= ======= ======= ======= ======= =======
--- a/t/lib/samples/QueryReportFormatter/report024.txt
+++ b/t/lib/samples/QueryReportFormatter/report024.txt
@@ -1,4 +1,4 @@
-# Query 0: 0 QPS, 0x concurrency, ID 0x82860EDA9A88FCC5 at byte 0 ________
+# Query 0: 0 QPS, 0x concurrency, ID 0x56A78B46A896465882860EDA9A88FCC5 at byte 0
 # Scores: V/M = 0.00
 # Time range: all events occurred at 2007-10-15 21:43:52
 # Attribute    pct   total     min     max     avg     95%  stddev  median
--- a/t/lib/samples/QueryReportFormatter/report030.txt
+++ b/t/lib/samples/QueryReportFormatter/report030.txt
@@ -1,5 +1,5 @@

 # Prepared statements
-# Rank Query ID           PREP PREP Response EXEC EXEC Response Item
-# ==== ================== ==== ============= ==== ============= ==========
-#    1 0xAA8E9FA785927259    1 0.0003 100.0%    0  0.0000  0.0% SELECT d.t
+# Rank Query ID                           PREP PREP Response EXEC EXEC Res
+# ==== ================================== ==== ============= ==== ========
+#    1 0xC29D79D8CB57E235AA8E9FA785927259    1 0.0003 100.0%    0  0.0000  0.0% SELECT d.t
--- a/t/lib/samples/QueryReportFormatter/table.sql
+++ b/t/lib/samples/QueryReportFormatter/table.sql
@@ -6,7 +6,7 @@ CREATE TABLE t (
   v varchar(16)
 ) engine=InnoDB;
 insert into qrf.t values
-   (null, 'hello'),
-   (null, ','),
-   (null, 'world'),
-   (null, '!');
+   (1, 'hello'),
+   (2, ','),
+   (3, 'world'),
+   (4, '!');