3435 Christopher Powers 2012-02-13
WL#5767 PERFORMANCE_SCHEMA, statement digest
Modified digest tests to accommodate prepared statements.
Ordered results by digest text.
modified:
mysql-test/suite/perfschema/r/statement_digest.result
mysql-test/suite/perfschema/r/statement_digest_consumers.result
mysql-test/suite/perfschema/r/statement_digest_consumers2.result
mysql-test/suite/perfschema/r/statement_digest_long_query.result
mysql-test/suite/perfschema/t/statement_digest.test
mysql-test/suite/perfschema/t/statement_digest_consumers.test
mysql-test/suite/perfschema/t/statement_digest_consumers2.test
mysql-test/suite/perfschema/t/statement_digest_long_query.test
3434 Mayank Prasad 2012-02-13
WL#5767 : Performance Schema, Statements Digest.
Details:
- Fix for failing valgrind test cases.
modified:
storage/perfschema/pfs.cc
=== modified file 'mysql-test/suite/perfschema/r/statement_digest.result'
--- a/mysql-test/suite/perfschema/r/statement_digest.result 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest.result 2012-02-13 19:28:22 +0000
@@ -59,28 +59,29 @@ CREATE SCHEMA statements_digest_temp;
DROP SCHEMA statements_digest_temp;
CREATE DATABASE statements_digest_temp;
DROP DATABASE statements_digest_temp;
-####################################
-# QUERYING PS STATEMENT DIGEST
-####################################
-SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+###########################################
+# QUERY EVENTS_STATEMENTS_SUMMARY_BY_DIGEST
+###########################################
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+WHERE digest_text NOT LIKE "%events_statements_summary_by_digest%"
+ ORDER BY digest_text;
digest digest_text count_star
-bb399912758e2135 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1
-c4cdaf6f814e367d SELECT ? FROM t1 1
-58681943ba1f6965 SELECT ?, ... FROM t1 2
-dd87e085c2c5a2b6 SELECT ? FROM t2 1
-fc7ca6a130fec1a4 SELECT ?, ... FROM t2 2
+49d23ec9aebe975b CREATE SCHEMA statements_digest_temp 2
+d42c9738d3d96889 DROP SCHEMA statements_digest_temp 2
164f41cc7a0b2f31 INSERT INTO t1 VALUES (?) 1
+1cd783ad398f6755 INSERT INTO t1 VALUES (?) /* , ... */ 2
06bd734b89c6f98f INSERT INTO t2 VALUES (?) 1
3a4848d584923fd7 INSERT INTO t3 VALUES (...) 1
+f52370e9b5183696 INSERT INTO t3 VALUES (...) /* , ... */ 1
37c0599e49fd77fe INSERT INTO t4 VALUES (...) 1
e63c7357e9f87f44 INSERT INTO t5 VALUES (...) 1
-1cd783ad398f6755 INSERT INTO t1 VALUES (?) /* , ... */ 2
-f52370e9b5183696 INSERT INTO t3 VALUES (...) /* , ... */ 1
edc61a0866ec47da INSERT INTO t5 VALUES (...) /* , ... */ 1
-06ec53eb6a3e3d4c SELECT ? + ? 3
a68272fa2b30c2e3 SELECT ? 1
-49d23ec9aebe975b CREATE SCHEMA statements_digest_temp 2
-d42c9738d3d96889 DROP SCHEMA statements_digest_temp 2
+06ec53eb6a3e3d4c SELECT ? + ? 3
+c4cdaf6f814e367d SELECT ? FROM t1 1
+dd87e085c2c5a2b6 SELECT ? FROM t2 1
+58681943ba1f6965 SELECT ?, ... FROM t1 2
+fc7ca6a130fec1a4 SELECT ?, ... FROM t2 2
####################################
# CLEANUP
####################################
=== modified file 'mysql-test/suite/perfschema/r/statement_digest_consumers.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result 2012-02-13 19:28:22 +0000
@@ -76,26 +76,29 @@ DROP DATABASE statements_digest_temp;
####################################
# QUERYING PS STATEMENT DIGEST
####################################
-SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
digest digest_text count_star
-bb399912758e2135 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1
-c4cdaf6f814e367d SELECT ? FROM t1 1
-58681943ba1f6965 SELECT ?, ... FROM t1 2
-dd87e085c2c5a2b6 SELECT ? FROM t2 1
-fc7ca6a130fec1a4 SELECT ?, ... FROM t2 2
+49d23ec9aebe975b CREATE SCHEMA statements_digest_temp 2
+d42c9738d3d96889 DROP SCHEMA statements_digest_temp 2
164f41cc7a0b2f31 INSERT INTO t1 VALUES (?) 1
+1cd783ad398f6755 INSERT INTO t1 VALUES (?) /* , ... */ 2
06bd734b89c6f98f INSERT INTO t2 VALUES (?) 1
3a4848d584923fd7 INSERT INTO t3 VALUES (...) 1
+f52370e9b5183696 INSERT INTO t3 VALUES (...) /* , ... */ 1
37c0599e49fd77fe INSERT INTO t4 VALUES (...) 1
e63c7357e9f87f44 INSERT INTO t5 VALUES (...) 1
-1cd783ad398f6755 INSERT INTO t1 VALUES (?) /* , ... */ 2
-f52370e9b5183696 INSERT INTO t3 VALUES (...) /* , ... */ 1
edc61a0866ec47da INSERT INTO t5 VALUES (...) /* , ... */ 1
-06ec53eb6a3e3d4c SELECT ? + ? 3
a68272fa2b30c2e3 SELECT ? 1
-49d23ec9aebe975b CREATE SCHEMA statements_digest_temp 2
-d42c9738d3d96889 DROP SCHEMA statements_digest_temp 2
-SELECT digest, digest_text FROM performance_schema.events_statements_current;
+06ec53eb6a3e3d4c SELECT ? + ? 3
+c4cdaf6f814e367d SELECT ? FROM t1 1
+dd87e085c2c5a2b6 SELECT ? FROM t2 1
+58681943ba1f6965 SELECT ?, ... FROM t1 2
+fc7ca6a130fec1a4 SELECT ?, ... FROM t2 2
+SELECT digest, digest_text FROM performance_schema.events_statements_current
+WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
digest digest_text
####################################
# CLEANUP
=== modified file 'mysql-test/suite/perfschema/r/statement_digest_consumers2.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers2.result 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers2.result 2012-02-13 19:28:22 +0000
@@ -76,11 +76,14 @@ DROP DATABASE statements_digest_temp;
####################################
# QUERYING PS STATEMENT DIGEST
####################################
-SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
digest digest_text count_star
-SELECT digest, digest_text FROM performance_schema.events_statements_current;
+SELECT digest, digest_text FROM performance_schema.events_statements_current
+WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
digest digest_text
-NULL NULL
####################################
# CLEANUP
####################################
=== modified file 'mysql-test/suite/perfschema/r/statement_digest_long_query.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result 2012-02-13 19:28:22 +0000
@@ -6,7 +6,17 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
####################################
# QUERYING PS STATEMENT DIGEST
####################################
-SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
digest digest_text count_star
-c20b2e9f0f1b8a32 TRUNCATE TABLE events_statements_summary_by_digest 1
ba5a568f3d3dcc06 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + !
? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1
+####################################
+# CLEANUP
+####################################
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t5;
+DROP DATABASE IF EXISTS statements_digest;
=== modified file 'mysql-test/suite/perfschema/t/statement_digest.test'
--- a/mysql-test/suite/perfschema/t/statement_digest.test 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest.test 2012-02-13 19:28:22 +0000
@@ -13,10 +13,17 @@ TRUNCATE TABLE performance_schema.events
# Executing queries
--source ../include/digest_execution.inc
---echo ####################################
---echo # QUERYING PS STATEMENT DIGEST
---echo ####################################
-SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+--echo ###########################################
+--echo # QUERY EVENTS_STATEMENTS_SUMMARY_BY_DIGEST
+--echo ###########################################
+#
+# Prepared statements, such as when the ps-protocol option is used, are added
+# to the statement digest array before the statement is executed. Filter
+# events_statements_summary_by_digest to avoid variations in the test results.
+#
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+ WHERE digest_text NOT LIKE "%events_statements_summary_by_digest%"
+ ORDER BY digest_text;
# Cleanup for Digest
--source ../include/digest_cleanup.inc
=== modified file 'mysql-test/suite/perfschema/t/statement_digest_consumers.test'
--- a/mysql-test/suite/perfschema/t/statement_digest_consumers.test 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_consumers.test 2012-02-13 19:28:22 +0000
@@ -28,8 +28,18 @@ TRUNCATE TABLE performance_schema.events
--echo ####################################
--echo # QUERYING PS STATEMENT DIGEST
--echo ####################################
-SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
-SELECT digest, digest_text FROM performance_schema.events_statements_current;
+#
+# Prepared statements, such as when the ps-protocol option is used, are added
+# to the statement digest array before the statement is executed. Filter the
+# perfschema tables to avoid variations in the test results.
+#
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+ WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
+
+SELECT digest, digest_text FROM performance_schema.events_statements_current
+ WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
# Cleanup for Digest
--source ../include/digest_cleanup.inc
=== modified file 'mysql-test/suite/perfschema/t/statement_digest_consumers2.test'
--- a/mysql-test/suite/perfschema/t/statement_digest_consumers2.test 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_consumers2.test 2012-02-13 19:28:22 +0000
@@ -30,8 +30,19 @@ TRUNCATE TABLE performance_schema.events
--echo ####################################
--echo # QUERYING PS STATEMENT DIGEST
--echo ####################################
-SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
-SELECT digest, digest_text FROM performance_schema.events_statements_current;
+#
+# Prepared statements, such as when the ps-protocol option is used, are added
+# to the statement digest array before the statement is executed. Filter the
+# perfschema tables to avoid variations in the test results.
+#
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+ WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
+
+SELECT digest, digest_text FROM performance_schema.events_statements_current
+ WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
+
# Cleanup for Digest
--source ../include/digest_cleanup.inc
=== modified file 'mysql-test/suite/perfschema/t/statement_digest_long_query.test'
--- a/mysql-test/suite/perfschema/t/statement_digest_long_query.test 2012-02-12 21:48:28 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_long_query.test 2012-02-13 19:28:22 +0000
@@ -19,4 +19,15 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
--echo ####################################
--echo # QUERYING PS STATEMENT DIGEST
--echo ####################################
-SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
+#
+# Prepared statements, such as when the ps-protocol option is used, are added
+# to the statement digest array before the statement is executed. Filter the
+# perfschema tables to avoid variations in the test results.
+#
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest
+ WHERE digest_text NOT LIKE "%events_statements%"
+ ORDER BY digest_text;
+
+# Cleanup for Digest
+--source ../include/digest_cleanup.inc
+
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5767 branch (chris.powers:3434 to 3435) WL#5767 | Christopher Powers | 14 Feb |
