Bug#20652173 MDL FOR TABLESPACES MUST BE REFLECTED IN P_S

MDL for tablespaces was introduced without the required
updates to the P_S implementation. This bugfix adds the
required P_S changes to map from the new MDL namespace
to an entry in a P_S internal enumeration, mapping to
correct object type name, etc.

A new test case is added to the MDL tablespace test to
verify correct P_S output as well as proper synchronization
with I_S contents.

Author: ssorumgard

mysql-test/r/mdl_tablespace.result

@@ -63,7 +63,7 @@
 #     table related DDL be rejected. Verify that implicit
 #     invalid tablespace names (e.g., present in an .FRM
 #     file from a previous MySQL version) are ignored.
-#
+# 16. Verify correct P_S information.
 ###########################################################
 #
 # Test setup: Create reusable connections:
@@ -787,6 +787,58 @@ DROP TABLE table_like;
 DROP TABLESPACE ts1;
 SET DEBUG_SYNC= 'RESET';
 ###########################################################
+# TC16. Verify correct P_S information.
+#
+#
+# Start executing CREATE TABLESPACE, but wait after
+# getting the MDL X lock on the tablespace name.
+connection con1;
+SET DEBUG_SYNC= 'after_wait_locked_tablespace_name
+  SIGNAL got_lock_con1
+  WAIT_FOR cont_con1';
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1_1.ibd';
+#
+# Start executing ALTER TABLESPACE.
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR got_lock_con1';
+ALTER TABLESPACE ts1 ADD DATAFILE 'ts1_2.ibd';
+#
+# Verify that the ALTER TABLESPACE is waiting for an MDL
+# X lock on the tablespace name (not logged). Then, verify
+# that we are also seeing the correct entries in the P_S MDL
+# and events_waits_current tables. Further, signal con1 to
+# make the CREATE TABLESPACE proceed.
+connection default;
+SELECT object_type, object_name, lock_type, lock_duration, lock_status
+FROM performance_schema.metadata_locks
+WHERE object_type LIKE 'TABLESPACE';
+object_type	object_name	lock_type	lock_duration	lock_status
+TABLESPACE	ts1	EXCLUSIVE	TRANSACTION	GRANTED
+TABLESPACE	ts1	EXCLUSIVE	TRANSACTION	PENDING
+SELECT event_name, object_name, object_type, operation
+FROM performance_schema.events_waits_current
+WHERE object_type LIKE 'TABLESPACE';
+event_name	object_name	object_type	operation
+wait/lock/metadata/sql/mdl	ts1	TABLESPACE	metadata lock
+SET DEBUG_SYNC= 'now SIGNAL cont_con1';
+#
+# Now, the tablespace MDL information will eventually be
+# gone from both I_S and P_S, except it will remain in the
+# P_S event wait history.
+SELECT event_name, object_name, object_type, operation
+FROM performance_schema.events_waits_history
+WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts1';
+event_name	object_name	object_type	operation
+wait/lock/metadata/sql/mdl	ts1	TABLESPACE	metadata lock
+#
+# Reap the connections, reset DEBUG_SYNC and drop objects.
+connection con1;
+connection con2;
+ERROR 42000: The storage engine for the table doesn't support ALTER TABLESPACE
+connection default;
+DROP TABLESPACE ts1;
+SET DEBUG_SYNC= 'RESET';
+###########################################################
 #
 # Test teardown: Disconnect
 #

mysql-test/t/mdl_tablespace.test

@@ -68,7 +68,7 @@
 --echo #     table related DDL be rejected. Verify that implicit
 --echo #     invalid tablespace names (e.g., present in an .FRM
 --echo #     file from a previous MySQL version) are ignored.
---echo #
+--echo # 16. Verify correct P_S information.
 --echo ###########################################################
 --echo #
 --echo # Test setup: Create reusable connections:
@@ -1043,6 +1043,100 @@ DROP TABLESPACE ts1;
 SET DEBUG_SYNC= 'RESET';
 
 
+--echo ###########################################################
+--echo # TC16. Verify correct P_S information.
+--echo #
+
+--echo #
+--echo # Start executing CREATE TABLESPACE, but wait after
+--echo # getting the MDL X lock on the tablespace name.
+
+--connection con1
+SET DEBUG_SYNC= 'after_wait_locked_tablespace_name
+  SIGNAL got_lock_con1
+  WAIT_FOR cont_con1';
+--send CREATE TABLESPACE ts1 ADD DATAFILE 'ts1_1.ibd'
+
+--echo #
+--echo # Start executing ALTER TABLESPACE.
+
+--connection con2
+SET DEBUG_SYNC= 'now WAIT_FOR got_lock_con1';
+--send ALTER TABLESPACE ts1 ADD DATAFILE 'ts1_2.ibd'
+
+--echo #
+--echo # Verify that the ALTER TABLESPACE is waiting for an MDL
+--echo # X lock on the tablespace name (not logged). Then, verify
+--echo # that we are also seeing the correct entries in the P_S MDL
+--echo # and events_waits_current tables. Further, signal con1 to
+--echo # make the CREATE TABLESPACE proceed.
+
+--connection default
+LET $wait_condition=
+  SELECT COUNT(*) = 1 FROM information_schema.processlist
+    WHERE state LIKE 'Waiting for tablespace metadata lock' AND
+          info LIKE 'ALTER TABLESPACE%';
+--source include/wait_condition.inc
+
+LET $wait_condition=
+  SELECT COUNT(*) = 2 FROM performance_schema.metadata_locks
+    WHERE object_type LIKE 'TABLESPACE';
+--source include/wait_condition.inc
+
+SELECT object_type, object_name, lock_type, lock_duration, lock_status
+  FROM performance_schema.metadata_locks
+  WHERE object_type LIKE 'TABLESPACE';
+
+LET $wait_condition=
+  SELECT COUNT(*) = 1 FROM performance_schema.events_waits_current
+    WHERE object_type LIKE 'TABLESPACE';
+--source include/wait_condition.inc
+
+SELECT event_name, object_name, object_type, operation
+  FROM performance_schema.events_waits_current
+  WHERE object_type LIKE 'TABLESPACE';
+
+SET DEBUG_SYNC= 'now SIGNAL cont_con1';
+
+--echo #
+--echo # Now, the tablespace MDL information will eventually be
+--echo # gone from both I_S and P_S, except it will remain in the
+--echo # P_S event wait history.
+
+LET $wait_condition=
+  SELECT COUNT(*) = 0 FROM information_schema.processlist
+    WHERE state LIKE 'Waiting for tablespace metadata lock' AND
+          info LIKE 'ALTER TABLESPACE%';
+--source include/wait_condition.inc
+
+LET $wait_condition=
+  SELECT COUNT(*) = 0 FROM performance_schema.metadata_locks
+    WHERE object_type LIKE 'TABLESPACE';
+--source include/wait_condition.inc
+
+LET $wait_condition=
+  SELECT COUNT(*) = 1 FROM performance_schema.events_waits_history
+    WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts1';
+--source include/wait_condition.inc
+
+SELECT event_name, object_name, object_type, operation
+  FROM performance_schema.events_waits_history
+  WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts1';
+
+--echo #
+--echo # Reap the connections, reset DEBUG_SYNC and drop objects.
+
+--connection con1
+--reap
+--connection con2
+# InnoDB does not support ALTER TABLESPACE
+--error ER_CHECK_NOT_IMPLEMENTED
+--reap
+--connection default
+DROP TABLESPACE ts1;
+SET DEBUG_SYNC= 'RESET';
+
+
 --echo ###########################################################
 --echo #
 --echo # Test teardown: Disconnect

storage/perfschema/pfs_column_types.h

@@ -210,12 +210,13 @@ enum enum_object_type
   OBJECT_TYPE_GLOBAL= 7,
   OBJECT_TYPE_SCHEMA= 8,
   OBJECT_TYPE_COMMIT= 9,
-  OBJECT_TYPE_USER_LEVEL_LOCK= 10
+  OBJECT_TYPE_USER_LEVEL_LOCK= 10,
+  OBJECT_TYPE_TABLESPACE= 11
 };
 /** Integer, first value of @sa enum_object_type. */
 #define FIRST_OBJECT_TYPE (static_cast<int> (OBJECT_TYPE_EVENT))
 /** Integer, last value of @sa enum_object_type. */
-#define LAST_OBJECT_TYPE (static_cast<int> (OBJECT_TYPE_USER_LEVEL_LOCK))
+#define LAST_OBJECT_TYPE (static_cast<int> (OBJECT_TYPE_TABLESPACE))
 /** Integer, number of values of @sa enum_object_type. */
 #define COUNT_OBJECT_TYPE (LAST_OBJECT_TYPE - FIRST_OBJECT_TYPE + 1)
 

storage/perfschema/table_events_waits.cc

@@ -425,6 +425,12 @@ int table_events_waits_common::make_metadata_lock_object_columns(PFS_events_wait
       m_row.m_object_schema_length= 0;
       m_row.m_object_name_length= mdl->name_length();
       break;
+    case MDL_key::TABLESPACE:
+      m_row.m_object_type= "TABLESPACE";
+      m_row.m_object_type_length= 10;
+      m_row.m_object_schema_length= 0;
+      m_row.m_object_name_length= mdl->name_length();
+      break;
     case MDL_key::NAMESPACE_END:
     default:
       m_row.m_object_type_length= 0;

storage/perfschema/table_helper.cc

@@ -265,6 +265,11 @@ int PFS_object_row::make_row(const MDL_key *mdl)
     m_schema_name_length= 0;
     m_object_name_length= mdl->name_length();
     break;
+  case MDL_key::TABLESPACE:
+    m_object_type= OBJECT_TYPE_TABLESPACE;
+    m_schema_name_length= 0;
+    m_object_name_length= mdl->name_length();
+    break;
   case MDL_key::NAMESPACE_END:
   default:
     m_object_type= NO_OBJECT_TYPE;
@@ -542,6 +547,9 @@ void set_field_object_type(Field *f, enum_object_type object_type)
   case OBJECT_TYPE_USER_LEVEL_LOCK:
     PFS_engine_table::set_field_varchar_utf8(f, "USER LEVEL LOCK", 15);
     break;
+  case OBJECT_TYPE_TABLESPACE:
+    PFS_engine_table::set_field_varchar_utf8(f, "TABLESPACE", 10);
+    break;
   case NO_OBJECT_TYPE:
   default:
     DBUG_ASSERT(false);