MXS-1703 Rearrange functions and methods

Lots of cleanup, but mostly distributing functions/methods to correct files.

server/modules/monitor/mariadbmon/utilities.cc

@@ -14,12 +14,15 @@
 #include "utilities.hh"
 
 #include <inttypes.h>
+#include <limits>
 #include <stdio.h>
 #include <string>
 #include <sstream>
 #include <maxscale/debug.h>
+#include <maxscale/mysql_utils.h>
 
-#include "mariadbmon.hh"
+/** Server id default value */
+const int64_t SERVER_ID_UNKNOWN = -1;
 
 Gtid::Gtid()
     : domain(0)
@@ -110,3 +113,99 @@ int64_t MySqlServerInfo::relay_log_events()
     }
     return -1;
 }
+
+int64_t scan_server_id(const char* id_string)
+{
+    int64_t server_id = SERVER_ID_UNKNOWN;
+    ss_debug(int rv = ) sscanf(id_string, "%" PRId64, &server_id);
+    ss_dassert(rv == 1);
+    // Server id can be 0, which was even the default value until 10.2.1.
+    // KB is a bit hazy on this, but apparently when replicating, the server id should not be 0. Not sure,
+    // so MaxScale allows this.
+#if defined(SS_DEBUG)
+    const int64_t SERVER_ID_MIN = std::numeric_limits<uint32_t>::min();
+    const int64_t SERVER_ID_MAX = std::numeric_limits<uint32_t>::max();
+#endif
+    ss_dassert(server_id >= SERVER_ID_MIN && server_id <= SERVER_ID_MAX);
+    return server_id;
+}
+
+string generate_master_gtid_wait_cmd(const Gtid& gtid, double timeout)
+{
+    std::stringstream query_ss;
+    query_ss << "SELECT MASTER_GTID_WAIT(\"" << gtid.to_string() << "\", " << timeout << ");";
+    return query_ss.str();
+}
+
+bool query_one_row(MXS_MONITORED_SERVER *database, const char* query, unsigned int expected_cols,
+                   StringVector* output)
+{
+    bool rval = false;
+    MYSQL_RES *result;
+    if (mxs_mysql_query(database->con, query) == 0 && (result = mysql_store_result(database->con)) != NULL)
+    {
+        unsigned int columns = mysql_field_count(database->con);
+        if (columns != expected_cols)
+        {
+            mysql_free_result(result);
+            MXS_ERROR("Unexpected result for '%s'. Expected %d columns, got %d. Server version: %s",
+                      query, expected_cols, columns, database->server->version_string);
+        }
+        else
+        {
+            MYSQL_ROW row = mysql_fetch_row(result);
+            if (row)
+            {
+                for (unsigned int i = 0; i < columns; i++)
+                {
+                    output->push_back((row[i] != NULL) ? row[i] : "");
+                }
+                rval = true;
+            }
+            else
+            {
+                MXS_ERROR("Query '%s' returned no rows.", query);
+            }
+            mysql_free_result(result);
+        }
+    }
+    else
+    {
+        mon_report_query_error(database);
+    }
+    return rval;
+}
+
+string get_connection_errors(const ServerVector& servers)
+{
+    // Get errors from all connections, form a string.
+    std::stringstream ss;
+    for (ServerVector::const_iterator iter = servers.begin(); iter != servers.end(); iter++)
+    {
+        const char* error = mysql_error((*iter)->con);
+        ss_dassert(*error); // Every connection should have an error.
+        ss << (*iter)->server->unique_name << ": '" << error << "'";
+        if (iter + 1 != servers.end())
+        {
+            ss << ", ";
+        }
+    }
+    return ss.str();
+}
+
+string monitored_servers_to_string(const ServerVector& array)
+{
+    string rval;
+    size_t array_size = array.size();
+    if (array_size > 0)
+    {
+        const char* separator = "";
+        for (size_t i = 0; i < array_size; i++)
+        {
+            rval += separator;
+            rval += array[i]->server->unique_name;
+            separator = ",";
+        }
+    }
+    return rval;
+}