BUG#35639371 Replace old terminology in replication queries

In 8.2.0, several SQL queries related to replication are deprecated.

The AdminAPI code that uses those queries must be updated accordingly to use the new syntax:

  - SHOW MASTER STATUS -> SHOW BINARY LOG STATUS
  - RESET MASTER -> RESET BINARY LOGS AND GTIDS
  - PURGE MASTER LOGS -> PURGE BINARY LOGS
  - SHOW MASTER LOGS -> SHOW BINARY LOGS

Additionally, all unit-tests using replication-related queries and
configurations must be updated.

This patch handles those updates, to ensure the following list of
changes are fullfilled:

  - START/STOP SLAVE:   replaced by START/STOP REPLICA
  - SHOW SLAVE STATUS:  replaced by SHOW REPLICA STATUS
  - SHOW SLAVE HOSTS:   replaced by SHOW REPLICAS
  - RESET SLAVE:        replaced by RESET REPLICA
  - CHANGE MASTER:      replaced by CHANGE REPLICATION SOURCE
  - RESET MASTER:       replaced by RESET BINARY LOGS AND GTIDS
  - SHOW MASTER STATUS: replaced by SHOW BINARY LOG STATUS
  - PURGE MASTER LOGS:  replaced by PURGE BINARY LOGS
  - SHOW MASTER LOGS:   replaced by SHOW BINARY LOGS

  - MASTER_AUTO_POSITION:          replaced by SOURCE_AUTO_POSITION
  - MASTER_HOST:                   replaced by SOURCE_HOST
  - MASTER_BIND:                   replaced by SOURCE_BIND
  - MASTER_USER:                   replaced by SOURCE_USER
  - MASTER_PASSWORD:               replaced by SOURCE_PASSWORD
  - MASTER_PORT:                   replaced by SOURCE_PORT
  - MASTER_CONNECT_RETRY:          replaced by SOURCE_CONNECT_RETRY
  - MASTER_RETRY_COUNT:            replaced by SOURCE_RETRY_COUNT
  - MASTER_DELAY:                  replaced by SOURCE_DELAY
  - MASTER_SSL:                    replaced by SOURCE_SSL
  - MASTER_SSL_CA:                 replaced by SOURCE_SSL_CA
  - MASTER_SSL_CAPATH:             replaced by SOURCE_SSL_CAPATH
  - MASTER_SSL_CIPHER:             replaced by SOURCE_SSL_CIPHER
  - MASTER_SSL_CRL:                replaced by SOURCE_SSL_CRL
  - MASTER_SSL_CRLPATH:            replaced by SOURCE_SSL_CRLPATH
  - MASTER_SSL_KEY:                replaced by SOURCE_SSL_KEY
  - MASTER_SSL_VERIFY_SERVER_CERT: replaced by SOURCE_SSL_VERIFY_SERVER_CERT
  - MASTER_TLS_VERSION:            replaced by SOURCE_TLS_VERSION
  - MASTER_TLS_CIPHERSUITES:       replaced by SOURCE_TLS_CIPHERSUITES
  - MASTER_SSL_CERT:               replaced by SOURCE_SSL_CERT
  - MASTER_PUBLIC_KEY_PATH:        replaced by SOURCE_PUBLIC_KEY_PATH
  - GET_MASTER_PUBLIC_KEY:         replaced by GET_SOURCE_PUBLIC_KEY
  - MASTER_HEARTBEAT_PERIOD:       replaced by SOURCE_HEARTBEAT_PERIOD
  - MASTER_COMPRESSION_ALGORITHM:  replaced by SOURCE_COMPRESSION_ALGORITHM
  - MASTER_ZSTD_COMPRESSION_LEVEL: replaced by SOURCE_ZSTD_COMPRESSION_LEVEL
  - MASTER_LOG_FILE:               replaced by SOURCE_LOG_FILE
  - MASTER_LOG_POS:                replaced by SOURCE_LOG_POS
  - MASTER_LOG_POS:                replaced by SOURCE_LOG_POS
  - MASTER_LOG_FILE:               replaced by SOURCE_LOG_FILE

  - DISABLE ON SLAVE: replaced by DISABLE ON REPLICA

Change-Id: I1a312b3784bf4690d8c90fab4731d0b1ec9242d6

Author: miguelaraujo

modules/adminapi/cluster/cluster_impl.cc

@@ -4428,7 +4428,10 @@ int64_t Cluster_impl::prepare_clone_recovery(
 
     // RESET MASTER to clear GTID_EXECUTED in case it's diverged, otherwise
     // clone is not executed and GR rejects the instance
-    target_instance.query("RESET MASTER");
+    target_instance.query(shcore::str_format(
+        "RESET %s",
+        mysqlshdk::mysql::get_binary_logs_keyword(target_instance.get_version())
+            .c_str()));
   }
 
   // Make sure the Clone plugin is installed or uninstalled depending on the

modules/adminapi/common/common.cc

@@ -253,7 +253,10 @@ void validate_replication_filters(const mysqlshdk::mysql::IInstance &instance,
                                   Cluster_type cluster_type) {
   // SHOW MASTER STATUS includes info about binlog filters, which filter
   // events from being written to the binlog, at the master
-  auto result = instance.query("SHOW MASTER STATUS");
+  auto result = instance.query(shcore::str_format(
+      "SHOW %s STATUS",
+      mysqlshdk::mysql::get_binary_logs_keyword(instance.get_version(), true)
+          .c_str()));
 
   while (auto row = result->fetch_one()) {
     if (!row->get_string(2, "").empty() || !row->get_string(3, "").empty())

modules/util/dump/schema_dumper.cc

@@ -41,7 +41,6 @@
 #include <array>
 #include <functional>
 #include <map>
-#include <regex>
 #include <unordered_set>
 
 #include "my_sys.h"
@@ -51,8 +50,8 @@
 #include "mysqlshdk/include/shellcore/console.h"
 #include "mysqlshdk/libs/db/session.h"
 #include "mysqlshdk/libs/mysql/instance.h"
+#include "mysqlshdk/libs/mysql/replication.h"
 #include "mysqlshdk/libs/utils/debug.h"
-#include "mysqlshdk/libs/utils/strformat.h"
 #include "mysqlshdk/libs/utils/utils_general.h"
 #include "mysqlshdk/libs/utils/utils_lexing.h"
 #include "mysqlshdk/libs/utils/utils_sqlstring.h"
@@ -3444,8 +3443,10 @@ Instance_cache::Binlog Schema_dumper::binlog(bool quiet) {
   Instance_cache::Binlog binlog;
 
   try {
-    const auto result = m_mysql->query("SHOW MASTER STATUS;");
-
+    const auto result = m_mysql->query(shcore::str_format(
+        "SHOW %s STATUS", mysqlshdk::mysql::get_binary_logs_keyword(
+                              m_mysql->get_server_version(), true)
+                              .c_str()));
     if (const auto row = result->fetch_one()) {
       binlog.file = row->get_string(0);    // File
       binlog.position = row->get_uint(1);  // Position

mysqlshdk/libs/mysql/replication.cc

@@ -608,13 +608,22 @@ bool get_channel_info(const mysqlshdk::mysql::IInstance &instance,
 std::vector<Slave_host> get_slaves(
     const mysqlshdk::mysql::IInstance &instance) {
   std::vector<Slave_host> slaves;
+  std::shared_ptr<mysqlshdk::db::IResult> result;
 
-  auto result = instance.query("SHOW SLAVE HOSTS");
+  if (instance.get_version() < utils::Version(8, 2, 0)) {
+    result = instance.query("SHOW SLAVE HOSTS");
+  } else {
+    result = instance.query("SHOW REPLICAS");
+  }
   while (auto row = result->fetch_one_named()) {
     Slave_host host;
     host.host = row.get_string("Host");
     host.port = row.get_uint("Port");
-    host.uuid = row.get_string("Slave_UUID");
+    if (instance.get_version() < utils::Version(8, 2, 0)) {
+      host.uuid = row.get_string("Slave_UUID");
+    } else {
+      host.uuid = row.get_string("Replica_UUID");
+    }
     slaves.push_back(std::move(host));
   }
 
@@ -1047,6 +1056,15 @@ std::string get_replication_source_keyword(
   }
 }
 
+std::string get_binary_logs_keyword(const mysqlshdk::utils::Version &version,
+                                    bool status) {
+  if (version < mysqlshdk::utils::Version(8, 2, 0)) {
+    return "MASTER";
+  } else {
+    return (status == true ? "BINARY LOG" : "BINARY LOGS AND GTIDS");
+  }
+}
+
 std::tuple<std::string, std::string> get_replication_source_keywords(
     const mysqlshdk::utils::Version &version) {
   if (version < mysqlshdk::utils::Version(8, 0, 23))

mysqlshdk/libs/mysql/replication.h

@@ -476,6 +476,23 @@ std::string get_replica_keyword(const mysqlshdk::utils::Version &version);
 std::string get_replication_source_keyword(
     const mysqlshdk::utils::Version &version, bool command = false);
 
+/**
+ * Get the correct keyword in use for the replication configuration commands:
+ * 'SHOW MASTER LOGS' / 'SHOW MASTER STATUS' / 'PURGE MASTER LOGS'
+ *  regarding the target instance version.
+ *
+ * Useful for the construction of queries or output/error messages.
+ *
+ * @param version Version of the target server.
+ * @param command Boolean value to indicate if the keyword is for status
+ * command: 'SHOW MASTER STATUS'
+ *
+ * @return a string with the right keyword to be used for the replication
+ * configuration command
+ */
+std::string get_binary_logs_keyword(const mysqlshdk::utils::Version &version,
+                                    bool status = false);
+
 /**
  * Get the correct keywords in use for the replication configuration command:
  * 'change replication source/master' regarding the target instance version.

python/plugins/debug/sql_collector.py

@@ -978,6 +978,11 @@ def filter_slave_master_info(row):
             kw_replica = "SLAVE"
             kw_replicas = "SLAVE HOSTS"
 
+        if self.session.version >= 80200:
+            kw_binary_log = "BINARY LOG"
+        else:
+            kw_binary_log = "MASTER"
+
         queries = [
             ("global variables",
              """SELECT g.variable_name name, g.variable_value value /*!80000, i.variable_source source*/
@@ -989,7 +994,7 @@ def filter_slave_master_info(row):
             # replication configuration
             "SHOW BINARY LOGS",
             f"SHOW {kw_replicas}",
-            "SHOW MASTER STATUS",
+            f"SHOW {kw_binary_log} STATUS",
             f"SHOW {kw_replica} STATUS",
             ("replication master_info",
              """SELECT * FROM mysql.slave_master_info ORDER BY Channel_name""",

unittest/scripts/auto/js_adminapi/scripts/cluster_add_replica_instance.js

@@ -500,7 +500,7 @@ shell.options.useWizards=0;
 
 // clean the errant trxs
 session4.runSql("drop schema errant");
-session4.runSql("reset master");
+session4.runSql("RESET " + get_reset_binary_logs_keyword());
 
 // purge binlogs
 var session1 = mysql.getSession(__sandbox_uri1);

unittest/scripts/auto/js_adminapi/scripts/cluster_addinstance.js

@@ -324,8 +324,8 @@ session.runSql("GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%';");
 session.close();
 shell.connect(__sandbox_uri2);
 
-session.runSql("CHANGE MASTER TO MASTER_HOST='" + hostname + "', MASTER_PORT=" + __mysql_sandbox_port1 + ", MASTER_USER='repl', MASTER_PASSWORD='password', MASTER_AUTO_POSITION=1, MASTER_SSL=1");
-session.runSql("START SLAVE");
+session.runSql("change " + get_replication_source_keyword() + " TO " + get_replication_option_keyword() + "_HOST='" + hostname + "', " + get_replication_option_keyword() + "_PORT=" + __mysql_sandbox_port1 + ", " + get_replication_option_keyword() + "_USER='repl', " + get_replication_option_keyword() + "_PASSWORD='password', " + get_replication_option_keyword() + "_AUTO_POSITION=1, " + get_replication_option_keyword() + "_SSL=1");
+session.runSql("START " + get_replica_keyword());
 
 testutil.waitMemberTransactions(__mysql_sandbox_port2, __mysql_sandbox_port1);
 
@@ -336,7 +336,7 @@ c.addInstance(__sandbox_uri2);
 //
 // Even if replication is not running but configured, the warning/error has to
 // be provided as implemented in BUG#29305551
-session.runSql("STOP SLAVE");
+session.runSql("STOP " + get_replica_keyword());
 
 //@ AddInstance async replication error with channels stopped
 c.addInstance(__sandbox_uri2);
@@ -648,7 +648,7 @@ EXPECT_THROWS(function(){
 
 shell.connect(__sandbox_uri2);
 dba.dropMetadataSchema({force:true, clearReadOnly:true});
-session.runSql("RESET MASTER");
+session.runSql("RESET " + get_reset_binary_logs_keyword());
 
 //@<> BUG#31357039 Make sure that a note show when creating the cluster and adding an instance with local address specified {__os_type == 'windows' && !__replaying && !__recording}
 if (testutil.versionCheck(__version, "<", "8.0.21")) {