BUG#32879001 - RENAME P_S TABLE FIELD MEMBER_INCOMING_COMMUNICATION_PROTOCOL

tiagoportelajorge · tiagoportelajorge · commit 8a8893469de1 · 2021-05-20T16:23:00.000+02:00
Rename P_S table field MEMBER_INCOMING_COMMUNICATION_PROTOCOL to Rename P_S
table field MEMBER_COMMUNICATION_STACK since we do not differentiate
between INCOMING and OUTGOING

RB: 26420
diff --git a/mysql-test/suite/group_replication/t/gr_protocol_stack_tables_and_migration.test b/mysql-test/suite/group_replication/t/gr_protocol_stack_tables_and_migration.test
@@ -50,7 +50,7 @@ while ($_rpl_server)
   --let $server_uuid= `SELECT @@server_uuid`
 
   --let $comm_stack_value= `SELECT @@group_replication_communication_stack`
-  --let $incoming_ps_value= `SELECT MEMBER_INCOMING_COMMUNICATION_PROTOCOL FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+  --let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
 
   --let $assert_cond= "$comm_stack_value" = "$incoming_ps_value"
   --let $assert_text= Assert that the configured communication stack is the same as reported in P_S tables
@@ -68,7 +68,7 @@ while ($_rpl_server)
 --source include/stop_group_replication.inc
 
 --let $server_2_uuid= `SELECT @@server_uuid`
---let $incoming_ps_value_server2_stopped= `SELECT MEMBER_INCOMING_COMMUNICATION_PROTOCOL FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_2_uuid"`
+--let $incoming_ps_value_server2_stopped= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_2_uuid"`
 --let $assert_cond= "$communication_stack_save_2" = "$incoming_ps_value_server2_stopped"
 --let $assert_text= Assert that the configured communication stack remains valid with a stopped server
 --source include/assert.inc
@@ -116,7 +116,7 @@ while ($_rpl_server)
   --let $server_uuid= `SELECT @@server_uuid`
 
   --let $comm_stack_value= `SELECT @@group_replication_communication_stack`
-  --let $incoming_ps_value= `SELECT MEMBER_INCOMING_COMMUNICATION_PROTOCOL FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+  --let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
 
   --let $assert_cond= "$comm_stack_value" = "$incoming_ps_value"
   --let $assert_text= Assert that the configured communication stack is the same as reported in P_S tables
@@ -134,7 +134,7 @@ SET GLOBAL group_replication_communication_stack= XCOM;
 --let $server_uuid= `SELECT @@server_uuid`
 
 --let $comm_stack_value= `SELECT @@group_replication_communication_stack`
---let $incoming_ps_value= `SELECT MEMBER_INCOMING_COMMUNICATION_PROTOCOL FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+--let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
 
 --let $assert_cond= "$comm_stack_value" != "$incoming_ps_value"
 --let $assert_text= Assert that the configured communication stack is different then the one reported in P_S tables
@@ -152,7 +152,7 @@ SET GLOBAL group_replication_communication_stack= XCOM;
 --let $server_uuid= `SELECT @@server_uuid`
 
 --let $comm_stack_value= `SELECT @@group_replication_communication_stack`
---let $incoming_ps_value= `SELECT MEMBER_INCOMING_COMMUNICATION_PROTOCOL FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
+--let $incoming_ps_value= `SELECT MEMBER_COMMUNICATION_STACK FROM performance_schema.replication_group_members WHERE MEMBER_ID="$server_uuid"`
 
 --let $assert_cond= "$comm_stack_value" != "$incoming_ps_value"
 --let $assert_text= Assert that the configured communication stack is different then the one reported in P_S tables
diff --git a/mysql-test/suite/perfschema/r/dd_version_check.result b/mysql-test/suite/perfschema/r/dd_version_check.result
@@ -3,4 +3,4 @@ SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';'
 PS_VERSION=80025
 "Checking the performance schema database structure ..."
 CHECK STATUS
-The tables in the performance_schema were last changed in MySQL 8.0.25
+The tables in the performance_schema were last changed in MySQL 8.0.27
diff --git a/mysql-test/suite/perfschema/r/idx_replication_group_members.result b/mysql-test/suite/perfschema/r/idx_replication_group_members.result
@@ -8,7 +8,7 @@ replication_group_members	CREATE TABLE `replication_group_members` (
   `MEMBER_STATE` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
   `MEMBER_ROLE` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
   `MEMBER_VERSION` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
-  `MEMBER_INCOMING_COMMUNICATION_PROTOCOL` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
+  `MEMBER_COMMUNICATION_STACK` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
 select * from INFORMATION_SCHEMA.STATISTICS
 where TABLE_SCHEMA = "performance_schema"
diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result
@@ -1107,7 +1107,7 @@ def	performance_schema	replication_group_members	MEMBER_PORT	4	NULL	YES	int	NULL
 def	performance_schema	replication_group_members	MEMBER_STATE	5	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_members	MEMBER_ROLE	6	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_members	MEMBER_VERSION	7	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
-def	performance_schema	replication_group_members	MEMBER_INCOMING_COMMUNICATION_PROTOCOL	8	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
+def	performance_schema	replication_group_members	MEMBER_COMMUNICATION_STACK	8	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_member_stats	CHANNEL_NAME	1	NULL	NO	char	64	256	NULL	NULL	NULL	utf8mb4	utf8mb4_0900_ai_ci	char(64)			select,insert,update,references			NULL
 def	performance_schema	replication_group_member_stats	VIEW_ID	2	NULL	NO	char	60	240	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(60)			select,insert,update,references			NULL
 def	performance_schema	replication_group_member_stats	MEMBER_ID	3	NULL	NO	char	36	144	NULL	NULL	NULL	utf8mb4	utf8mb4_bin	char(36)			select,insert,update,references			NULL
diff --git a/mysql-test/suite/perfschema/t/dd_version_check.test b/mysql-test/suite/perfschema/t/dd_version_check.test
@@ -98,8 +98,8 @@ insert into test.pfs_published_schema
         "2db5b001fae56232df1c5fab4be6bbf10d47873a6ad55f36ad9d9be20632e973");
 
 insert into test.pfs_published_schema
- values("MySQL 8.0.25",
-        "a1443d7b93c36a0be0b6fc38e7cd33b28640cec2d2883b359925146fac0885b2");
+ values("MySQL 8.0.27",
+        "bf3d1ffc23620a232e61dbe149b37c477ccc530cbaab8cf38dc74e28a4d2df95");
 
 create table test.pfs_check_table
   (id int NOT NULL AUTO_INCREMENT,
diff --git a/storage/perfschema/pfs_dd_version.h b/storage/perfschema/pfs_dd_version.h
@@ -174,12 +174,12 @@
   performance_schema tables changed in MySQL 8.0.24
   - WL#13446 added performance_schema.keyring_component_status
 
-  80025:
-  performance_schema tables changed in MySQL 8.0.25
+  80027:
+  performance_schema tables changed in MySQL 8.0.27
   - WL#9852 added replication_group_members column
-    MEMBER_INCOMING_COMMUNICATION_PROTOCOL
+    MEMBER_COMMUNICATION_PROTOCOL_STACK
 */
 
-static const uint PFS_DD_VERSION = 80025;
+static const uint PFS_DD_VERSION = 80027;
 
 #endif /* PFS_DD_VERSION_H */
diff --git a/storage/perfschema/table_replication_group_members.cc b/storage/perfschema/table_replication_group_members.cc
@@ -119,16 +119,15 @@ static void set_member_role(void *const context, const char &value,
   memcpy(row->member_role, &value, length);
 }
 
-static void set_member_incoming_communication_protocol(void *const context,
-                                                       const char &value,
-                                                       size_t length) {
+static void set_member_communication_stack(void *const context,
+                                           const char &value, size_t length) {
   struct st_row_group_members *row =
       static_cast<struct st_row_group_members *>(context);
   const size_t max = NAME_LEN;
   length = std::min(length, max);
 
-  row->member_incoming_communication_protocol_length = length;
-  memcpy(row->member_incoming_communication_protocol, &value, length);
+  row->member_communication_stack_length = length;
+  memcpy(row->member_communication_stack, &value, length);
 }
 
 THR_LOCK table_replication_group_members::m_table_lock;
@@ -146,7 +145,7 @@ Plugin_table table_replication_group_members::m_table_def(
     "  MEMBER_STATE CHAR(64) collate utf8mb4_bin not null,\n"
     "  MEMBER_ROLE CHAR(64) collate utf8mb4_bin not null,\n"
     "  MEMBER_VERSION CHAR(64) collate utf8mb4_bin not null,\n"
-    "  MEMBER_INCOMING_COMMUNICATION_PROTOCOL CHAR(64) collate utf8mb4_bin not "
+    "  MEMBER_COMMUNICATION_STACK CHAR(64) collate utf8mb4_bin not "
     "null\n",
     /* Options */
     " ENGINE=PERFORMANCE_SCHEMA",
@@ -221,19 +220,13 @@ int table_replication_group_members::make_row(uint index) {
   m_row.member_state_length = 0;
   m_row.member_version_length = 0;
   m_row.member_role_length = 0;
-  m_row.member_incoming_communication_protocol_length = 0;
+  m_row.member_communication_stack_length = 0;
 
   // Set callbacks on GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS.
   const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS callbacks = {
-      &m_row,
-      &set_channel_name,
-      &set_member_id,
-      &set_member_host,
-      &set_member_port,
-      &set_member_state,
-      &set_member_role,
-      &set_member_version,
-      &set_member_incoming_communication_protocol,
+      &m_row,           &set_channel_name,   &set_member_id,
+      &set_member_host, &set_member_port,    &set_member_state,
+      &set_member_role, &set_member_version, &set_member_communication_stack,
   };
 
   // Query plugin and let callbacks do their job.
@@ -284,9 +277,8 @@ int table_replication_group_members::read_row_values(TABLE *table,
                               m_row.member_version_length);
           break;
         case 7: /** member_incoming_protocol */
-          set_field_char_utf8(
-              f, m_row.member_incoming_communication_protocol,
-              m_row.member_incoming_communication_protocol_length);
+          set_field_char_utf8(f, m_row.member_communication_stack,
+                              m_row.member_communication_stack_length);
           break;
         default:
           assert(false);
diff --git a/storage/perfschema/table_replication_group_members.h b/storage/perfschema/table_replication_group_members.h
@@ -67,8 +67,8 @@ struct st_row_group_members {
   uint member_role_length;
   char member_version[NAME_LEN];
   uint member_version_length;
-  char member_incoming_communication_protocol[NAME_LEN];
-  uint member_incoming_communication_protocol_length;
+  char member_communication_stack[NAME_LEN];
+  uint member_communication_stack_length;
 };
 
 /** Table PERFORMANCE_SCHEMA.replication_group_members. */
