WL#15294 Extending GTID with tags to identify group of transactions - step 7

Step 7. Rename remaining '*sid*' related type names, function names
and variables into '*tsid*'

Change-Id: I0f28272a5b93ce081623436f9a957aba76f9e91b

Author: Karolina Szczepankiewicz

client/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Copyright (c) 2006, 2023, Oracle and/or its affiliates.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
 # as published by the Free Software Foundation.
@@ -228,7 +228,7 @@ SET(MYSQLBINLOG_SOURCES
   mysqlbinlog.cc
   ${CMAKE_SOURCE_DIR}/sql/log_event.cc
   ${CMAKE_SOURCE_DIR}/sql/rpl_utility.cc
-  ${CMAKE_SOURCE_DIR}/sql/rpl_gtid_sid_map.cc
+  ${CMAKE_SOURCE_DIR}/sql/rpl_gtid_tsid_map.cc
   ${CMAKE_SOURCE_DIR}/sql/rpl_gtid_misc.cc
   ${CMAKE_SOURCE_DIR}/sql/rpl_gtid_set.cc
   ${CMAKE_SOURCE_DIR}/sql/rpl_gtid_specification.cc

client/mysqlbinlog.cc

@@ -783,8 +783,8 @@ static MYSQL *mysql_handle = nullptr;
 static char *dirname_for_local_load = nullptr;
 static uint opt_server_id_bits = 0;
 ulong opt_server_id_mask = 0;
-Sid_map *global_sid_map = nullptr;
-Checkable_rwlock *global_sid_lock = nullptr;
+Tsid_map *global_tsid_map = nullptr;
+Checkable_rwlock *global_tsid_lock = nullptr;
 Gtid_set *gtid_set_included = nullptr;
 Gtid_set *gtid_set_excluded = nullptr;
 static uint opt_zstd_compress_level = default_zstd_compression_level;
@@ -2596,8 +2596,8 @@ static void fix_gtid_set(MYSQL_RPL *rpl, uchar *packet_gtid_set) {
     Note: we acquire lock in the dump_remote_log_entries()
     just before mysql_binlog_open() call if GTID used.
   */
-  global_sid_lock->assert_some_rdlock();
-  global_sid_lock->unlock();
+  global_tsid_lock->assert_some_rdlock();
+  global_tsid_lock->unlock();
 }
 
 /*
@@ -2688,7 +2688,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
   if (opt_remote_proto != BINLOG_DUMP_NON_GTID) {
     rpl.flags |= MYSQL_RPL_GTID;
 
-    global_sid_lock->rdlock();
+    global_tsid_lock->rdlock();
     rpl.gtid_set_encoded_size = gtid_set_excluded->get_encoded_length();
     rpl.fix_gtid_set = fix_gtid_set;
     rpl.gtid_set_arg = (void *)gtid_set_excluded;
@@ -3191,13 +3191,13 @@ static int args_post_process(void) {
     }
   }
 
-  global_sid_lock->rdlock();
+  global_tsid_lock->rdlock();
 
   if (opt_include_gtids_str != nullptr) {
     if (gtid_set_included->add_gtid_text(opt_include_gtids_str) !=
         RETURN_STATUS_OK) {
       error("Could not configure --include-gtids '%s'", opt_include_gtids_str);
-      global_sid_lock->unlock();
+      global_tsid_lock->unlock();
       return ERROR_STOP;
     }
   }
@@ -3206,12 +3206,12 @@ static int args_post_process(void) {
     if (gtid_set_excluded->add_gtid_text(opt_exclude_gtids_str) !=
         RETURN_STATUS_OK) {
       error("Could not configure --exclude-gtids '%s'", opt_exclude_gtids_str);
-      global_sid_lock->unlock();
+      global_tsid_lock->unlock();
       return ERROR_STOP;
     }
   }
 
-  global_sid_lock->unlock();
+  global_tsid_lock->unlock();
 
   if (connection_server_id == 0 && stop_never)
     error("Cannot set --server-id=0 when --stop-never is specified.");
@@ -3229,12 +3229,12 @@ static int args_post_process(void) {
    Function is reentrant.
 */
 inline void gtid_client_cleanup() {
-  delete global_sid_lock;
-  delete global_sid_map;
+  delete global_tsid_lock;
+  delete global_tsid_map;
   delete gtid_set_excluded;
   delete gtid_set_included;
-  global_sid_lock = nullptr;
-  global_sid_map = nullptr;
+  global_tsid_lock = nullptr;
+  global_tsid_map = nullptr;
   gtid_set_excluded = nullptr;
   gtid_set_included = nullptr;
 }
@@ -3246,10 +3246,10 @@ inline void gtid_client_cleanup() {
            false if OK
 */
 inline bool gtid_client_init() {
-  const bool res = (!(global_sid_lock = new Checkable_rwlock) ||
-                    !(global_sid_map = new Sid_map(global_sid_lock)) ||
-                    !(gtid_set_excluded = new Gtid_set(global_sid_map)) ||
-                    !(gtid_set_included = new Gtid_set(global_sid_map)));
+  const bool res = (!(global_tsid_lock = new Checkable_rwlock) ||
+                    !(global_tsid_map = new Tsid_map(global_tsid_lock)) ||
+                    !(gtid_set_excluded = new Gtid_set(global_tsid_map)) ||
+                    !(gtid_set_included = new Gtid_set(global_tsid_map)));
   if (res) {
     gtid_client_cleanup();
   }

include/mysql/group_replication_priv.h

@@ -163,9 +163,9 @@ char *encoded_gtid_set_to_string(uchar *encoded_gtid_set, size_t length);
 rpl_gno get_last_executed_gno(rpl_sidno sidno);
 
 /**
-  Return sidno for a given tsid, see Sid_map::add_tsid() for details.
+  Return sidno for a given tsid, see Tsid_map::add_tsid() for details.
 */
-rpl_sidno get_sidno_from_global_sid_map(const mysql::gtid::Tsid &tsid);
+rpl_sidno get_sidno_from_global_tsid_map(const mysql::gtid::Tsid &tsid);
 
 /**
   Set slave thread default options.

libs/mysql/binlog/event/control_events.h

@@ -926,7 +926,7 @@ class Transaction_payload_event : public Binary_log_event {
   @class Gtid_event
   GTID stands for Global Transaction IDentifier
   It is composed of two parts:
-    - SID for Source Identifier, and
+    - TSID for Transaction Source Identifier, and
     - GNO for Group Number.
   The basic idea is to
      -  Associate an identifier, the Global Transaction IDentifier or GTID,

libs/mysql/gtid/gtidset.h

@@ -248,7 +248,7 @@ class Gtid_set {
   using Tsid = mysql::gtid::Tsid;
 
  protected:
-  [[NODISCARD]] virtual bool do_add(const Tsid &uuid,
+  [[NODISCARD]] virtual bool do_add(const Tsid &tsid,
                                     const Gno_interval &interval);
   [[NODISCARD]] virtual bool do_add(const Uuid &uuid, const Tag &tag,
                                     const Gno_interval &interval);

mysql-test/suite/binlog_nogtid/r/binlog_gtid_state_update_deadlock.result

@@ -1,11 +1,11 @@
 include/rpl_init.inc [topology=none]
 CREATE TABLE t1 (a INT);
-SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_before_global_sid_lock SIGNAL before_global_sid_lock WAIT_FOR have_gtid_mode_lock';
-SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_after_global_sid_lock SIGNAL have_global_sid_lock';
+SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_before_global_tsid_lock SIGNAL before_global_tsid_lock WAIT_FOR have_gtid_mode_lock';
+SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_after_global_tsid_lock SIGNAL have_global_tsid_lock';
 SET @@SESSION.GTID_NEXT= 'ANONYMOUS';
 INSERT INTO t1 VALUES (1);
-SET @@SESSION.DEBUG_SYNC = 'now WAIT_FOR before_global_sid_lock';
-SET @@SESSION.DEBUG_SYNC= 'after_log_file_name_initialized SIGNAL have_gtid_mode_lock WAIT_FOR have_global_sid_lock';
+SET @@SESSION.DEBUG_SYNC = 'now WAIT_FOR before_global_tsid_lock';
+SET @@SESSION.DEBUG_SYNC= 'after_log_file_name_initialized SIGNAL have_gtid_mode_lock WAIT_FOR have_global_tsid_lock';
 SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
 SET @@GLOBAL.GTID_MODE = OFF;
 DROP TABLE t1;

mysql-test/suite/binlog_nogtid/t/binlog_gtid_state_update_deadlock.test

@@ -1,7 +1,7 @@
 # ==== Purpose ====
 #
 # Verify that gtid_state->update_gtids_impl does not take
-# global_sid_lock before gtid_mode_lock. It once did, and this could
+# global_tsid_lock before gtid_mode_lock. It once did, and this could
 # lead to a deadlock with a concurrent SET GTID_MODE.
 #
 # Note: if we implement on-the-fly lock order validation with
@@ -10,26 +10,26 @@
 # ==== Implementation ====
 #
 # 1. server_1 starts to execute an INSERT. It pauses before it takes
-#    global_sid_lock in gtid_state->update_gtids_impl (sync point
-#    'update_gtid_state_before_global_sid_lock). It signals to default
-#    that it has reached this point (signal 'before_global_sid_lock').
+#    global_tsid_lock in gtid_state->update_gtids_impl (sync point
+#    'update_gtid_state_before_global_tsid_lock). It signals to default
+#    that it has reached this point (signal 'before_global_tsid_lock').
 #
-# 2. default receives 'before_global_sid_lock'.
+# 2. default receives 'before_global_tsid_lock'.
 #
 # 3. server_1_1 starts to execute SET GTID_MODE. It takes
-#    gtid_mode_lock. Then it pauses before it takes global_sid_lock
+#    gtid_mode_lock. Then it pauses before it takes global_tsid_lock
 #    (sync point 'after_log_file_name_initialized').  At the same time
 #    it signals server_1 to continue (signal 'have_gtid_mode_lock').
 #
-# 4. server_1 unpauses. Then it takes global_sid_lock. Then it signals
-#    to server_1_1 to continue (signal 'have_global_sid_lock' from
-#    sync point 'update_gtid_state_after_global_sid_lock').
+# 4. server_1 unpauses. Then it takes global_tsid_lock. Then it signals
+#    to server_1_1 to continue (signal 'have_global_tsid_lock' from
+#    sync point 'update_gtid_state_after_global_tsid_lock').
 #
-# 5. server_1 continues; it holds global_sid_lock and tries to acquire
+# 5. server_1 continues; it holds global_tsid_lock and tries to acquire
 #    gtid_mode_lock.
 #
 # 6. server_1_1 continues; it holds gtid_mode_lock and tries to acquire
-#    global_sid_lock.
+#    global_tsid_lock.
 
 --source include/big_test.inc
 --source include/have_debug_sync.inc
@@ -42,22 +42,22 @@
 CREATE TABLE t1 (a INT);
 
 --connection server_1
-#  1. wait before global_sid_lock in update_gtids_impl.
-SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_before_global_sid_lock SIGNAL before_global_sid_lock WAIT_FOR have_gtid_mode_lock';
-#  4. once released, take global_sid_lock, signal SET GTID_MODE to continue.
+#  1. wait before global_tsid_lock in update_gtids_impl.
+SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_before_global_tsid_lock SIGNAL before_global_tsid_lock WAIT_FOR have_gtid_mode_lock';
+#  4. once released, take global_tsid_lock, signal SET GTID_MODE to continue.
 #  5. continue into the deadlock.
-SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_after_global_sid_lock SIGNAL have_global_sid_lock';
+SET @@SESSION.DEBUG_SYNC = 'update_gtid_state_after_global_tsid_lock SIGNAL have_global_tsid_lock';
 SET @@SESSION.GTID_NEXT= 'ANONYMOUS';
 send INSERT INTO t1 VALUES (1);
 
-#  2. wait for INSERT to be just before the global_sid_lock.
+#  2. wait for INSERT to be just before the global_tsid_lock.
 --connection default
-SET @@SESSION.DEBUG_SYNC = 'now WAIT_FOR before_global_sid_lock';
+SET @@SESSION.DEBUG_SYNC = 'now WAIT_FOR before_global_tsid_lock';
 
 --connection server_1_1
-#  3. wait when holding gtid_mode_lock, before takeing global_sid_lock.
-#  6. once the INSERT has taken global_sid_lock, unpause and hit the deadlock
-SET @@SESSION.DEBUG_SYNC= 'after_log_file_name_initialized SIGNAL have_gtid_mode_lock WAIT_FOR have_global_sid_lock';
+#  3. wait when holding gtid_mode_lock, before takeing global_tsid_lock.
+#  6. once the INSERT has taken global_tsid_lock, unpause and hit the deadlock
+SET @@SESSION.DEBUG_SYNC= 'after_log_file_name_initialized SIGNAL have_gtid_mode_lock WAIT_FOR have_global_tsid_lock';
 SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
 
 --connection server_1

mysql-test/suite/rpl_gtid/t/rpl_wait_for_executed_gtid_set.test

@@ -67,7 +67,7 @@
 #          UUIDs, where all the GTIDs for one of the UUIDs are already
 #          committed before the function starts.
 #     7.6. The function waits for a UUID which does not already exist
-#          in global_sid_map.
+#          in global_tsid_map.
 #    This should all work in case the GTIDs are committed:
 #     7A. from a client on the same server using GTID_NEXT=AUTOMATIC
 #     7B. from a client on the same server using GTID_NEXT=UUID:NUMBER

mysql-test/suite/rpl_gtid/t/rpl_wait_for_gtid_executed_unknown_uuid.test

@@ -1,6 +1,6 @@
 # WL#7796 - WAIT_FOR_EXECUTED_GTID_SET
 # Test to check for the condition that the given UUID is not already on the
-# global_sid_map.
+# global_tsid_map.
 
 --source include/not_group_replication_plugin.inc
 --source include/master-slave.inc

plugin/group_replication/include/certifier.h

@@ -72,8 +72,8 @@
 */
 class Gtid_set_ref : public Gtid_set {
  public:
-  Gtid_set_ref(Sid_map *sid_map, int64 parallel_applier_sequence_number)
-      : Gtid_set(sid_map),
+  Gtid_set_ref(Tsid_map *tsid_map, int64 parallel_applier_sequence_number)
+      : Gtid_set(tsid_map),
         reference_counter(0),
         parallel_applier_sequence_number(parallel_applier_sequence_number) {}
 
@@ -486,7 +486,7 @@ class Certifier : public Certifier_interface {
     Variable to store the sidno used for transactions which will be logged
     with the group_uuid.
   */
-  rpl_sidno group_gtid_sid_map_group_sidno;
+  rpl_sidno group_gtid_tsid_map_group_sidno;
 
   /**
     The sidno used for view log events as seen by the group sid map
@@ -693,7 +693,7 @@ class Certifier : public Certifier_interface {
     Certification database.
   */
   Certification_info certification_info;
-  Sid_map *certification_info_sid_map;
+  Tsid_map *certification_info_tsid_map;
 
   ulonglong positive_cert;
   ulonglong negative_cert;
@@ -711,7 +711,7 @@ class Certifier : public Certifier_interface {
     Stable set and garbage collector variables.
   */
   Checkable_rwlock *stable_gtid_set_lock;
-  Sid_map *stable_sid_map;
+  Tsid_map *stable_tsid_map;
   Gtid_set *stable_gtid_set;
   Synchronized_queue<Data_packet *> *incoming;
 
@@ -764,7 +764,7 @@ class Certifier : public Certifier_interface {
   /*
     Sid map to store the GTIDs that are executed in the group.
   */
-  Sid_map *group_gtid_sid_map;
+  Tsid_map *group_gtid_tsid_map;
 
   /*
     A Gtid_set containing the already executed for the group.

plugin/group_replication/src/applier.cc

@@ -274,16 +274,16 @@ int Applier_module::apply_view_change_packet(
   const auto garbage_collection_begin = Metrics_handler::get_current_time();
 
   Gtid_set *group_executed_set = nullptr;
-  Sid_map *sid_map = nullptr;
+  Tsid_map *tsid_map = nullptr;
   if (!view_change_packet->group_executed_set.empty()) {
-    sid_map = new Sid_map(nullptr);
-    group_executed_set = new Gtid_set(sid_map, nullptr);
+    tsid_map = new Tsid_map(nullptr);
+    group_executed_set = new Gtid_set(tsid_map, nullptr);
     if (intersect_group_executed_sets(view_change_packet->group_executed_set,
                                       group_executed_set)) {
       LogPluginErr(
           WARNING_LEVEL,
           ER_GRP_RPL_ERROR_GTID_EXECUTION_INFO); /* purecov: inspected */
-      delete sid_map;                            /* purecov: inspected */
+      delete tsid_map;                           /* purecov: inspected */
       delete group_executed_set;                 /* purecov: inspected */
       group_executed_set = nullptr;              /* purecov: inspected */
     }
@@ -296,7 +296,7 @@ int Applier_module::apply_view_change_packet(
       LogPluginErr(WARNING_LEVEL,
                    ER_GRP_RPL_CERTIFICATE_SIZE_ERROR); /* purecov: inspected */
     }
-    delete sid_map;
+    delete tsid_map;
     delete group_executed_set;
   }
 
@@ -1010,13 +1010,13 @@ Certification_handler *Applier_module::get_certification_handler() {
 
 int Applier_module::intersect_group_executed_sets(
     std::vector<std::string> &gtid_sets, Gtid_set *output_set) {
-  Sid_map *sid_map = output_set->get_sid_map();
+  Tsid_map *tsid_map = output_set->get_tsid_map();
 
   std::vector<std::string>::iterator set_iterator;
   for (set_iterator = gtid_sets.begin(); set_iterator != gtid_sets.end();
        set_iterator++) {
-    Gtid_set member_set(sid_map, nullptr);
-    Gtid_set intersection_result(sid_map, nullptr);
+    Gtid_set member_set(tsid_map, nullptr);
+    Gtid_set intersection_result(tsid_map, nullptr);
 
     std::string exec_set_str = (*set_iterator);