transactd 3.4.1 → 3.5.0

data/source/bzs/db/engine/mysql/ha.h

@@ -0,0 +1,50 @@
+#ifndef BZS_DB_ENGINE_MYSQL_HA_H
+#define BZS_DB_ENGINE_MYSQL_HA_H
+/*=================================================================
+   Copyright (C) 2016 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+
+const static bool trx_block = false;
+const static bool trx_noblock = true;
+extern bool trx_blocking;
+
+namespace bzs
+{
+namespace db
+{
+namespace engine
+{
+namespace mysql
+{
+
+int initHa();
+bool haLock();
+bool haUnlock();
+bool setRole(int isMaster);
+int  getRole();
+bool setEnableFailover(bool enable);
+bool getEnableFailover();
+bool setTrxBlock(bool v);
+inline bool isTrxBlocking() { return trx_blocking == trx_block;}
+
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
+
+#endif // BZS_DB_ENGINE_MYSQL_HA_H

data/source/bzs/db/engine/mysql/mysqlInternal.h

@@ -75,6 +75,10 @@
 #include "my_global.h"
 #include <math.h>
 #if defined(MYSQL_5_7)
+#ifndef HAVE_REPLICATION
+#define HAVE_REPLICATION
+#endif
+
 // Not use malloc service
 #define MYSQL_SERVICE_MYSQL_ALLOC_INCLUDED
 typedef unsigned int PSI_memory_key;
@@ -229,11 +233,21 @@ inline void cp_restore_globals(THD* thd)
     my_pthread_setspecific_ptr(THR_THD, 0);
     my_pthread_setspecific_ptr(THR_MALLOC, 0);
 }
-
+#if (MYSQL_VERSION_ID < 50600)
 inline void cp_thd_set_read_only(THD* thd, bool v) {}
 
 inline bool cp_thd_get_global_read_only(THD* thd) { return false; }
+#else
+inline void cp_thd_set_read_only(THD* thd, bool v)
+{
+    thd->tx_read_only = (v || thd->variables.tx_read_only);
+}
 
+inline bool cp_thd_get_global_read_only(THD* thd)
+{
+    return (thd->variables.tx_read_only != 0);
+}
+#endif
 inline bool cp_open_table(THD* thd, TABLE_LIST* tables,
                           Open_table_context* ot_act)
 {
@@ -477,7 +491,9 @@ inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet
 }
 
 #define cp_get_executed_gtids get_executed_gtids
+extern MYSQL_PLUGIN_IMPORT my_bool opt_show_slave_auth_info;
 
+#define STATUS_VAR_SCOPE ,SHOW_SCOPE_GLOBAL
 #else //Not MySQL 5.7
 
 #define OPEN_TABLE_FLAG_TYPE MYSQL_OPEN_GET_NEW_TABLE
@@ -619,6 +635,7 @@ inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet
 
 #endif // Not MARIADB_10_1 || MARIADB_10_0
 
+#define STATUS_VAR_SCOPE 
 #endif // Not MySQL 5.7
 
 

data/source/bzs/db/engine/mysql/mysqlProtocol.cpp

@@ -17,11 +17,15 @@
  02111-1307, USA.
  ================================================================= */
 /* MySQL 5.5 and Mariadb are no-rtti */
+#include <my_config.h>
+# include <string>
+
 #ifdef __GNUC__
 # pragma implementation "mysqlInternal.h" 
 #endif
 
 #include "mysqlProtocol.h"
+
 #include <bzs/env/crosscompile.h>
 #include <bzs/db/protocol/tdap/tdapcapi.h>
 #include <bzs/db/IBlobBuffer.h>
@@ -214,12 +218,13 @@ safe_commit_lock::~safe_commit_lock()
 
 
 #ifdef NOTUSE_BINLOG_VAR //Only MySQL 5.6 Windows
-	inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* tmpThd, bzs::db::IblobBuffer* bb)
+    inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* tmpThd, bzs::db::IblobBuffer* bb)
     {
         short result = 0;
         {
             attachThd(tmpThd);
-            copyGrant(tmpThd, currentThd, NULL);
+            if (tmpThd != currentThd)
+                copyGrant(tmpThd, currentThd, NULL);
             masterStatus p(tmpThd, bpos, bb); 
             cp_query_command(tmpThd, "show master status");
             if (tmpThd->is_error())
@@ -232,7 +237,7 @@ safe_commit_lock::~safe_commit_lock()
 #endif
 
 #ifdef USE_BINLOG_GTID //MariaDB 10-
-	inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* /*tmpThd*/, bzs::db::IblobBuffer* /*bb*/)
+    inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* /*tmpThd*/, bzs::db::IblobBuffer* /*bb*/)
     {
         if (mysql_bin_log.is_open())
         {
@@ -266,7 +271,7 @@ safe_commit_lock::~safe_commit_lock()
             if (size > 1024) buf = new char[size];
             gtid_set->to_string(buf);
             bpos->type = REPL_POSTYPE_GTID;
-            bb->addBlob((unsigned int)size, 0, (const unsigned char *)buf);
+            bb->addBlob((unsigned int)size, TD_EXTENDED_VAR_BINLOG_GTID, (const unsigned char *)buf);
             bb->setFieldCount(1);
             if (p != buf) delete[] buf;
         }
@@ -275,7 +280,7 @@ safe_commit_lock::~safe_commit_lock()
     }
 
     // Linux MySQL can access to the mysql_bin_log variable
-	inline short getBinlogPosInternal(THD*, binlogPos* bpos, THD* /*tmpThd*/, bzs::db::IblobBuffer* bb)
+    inline short getBinlogPosInternal(THD*, binlogPos* bpos, THD* /*tmpThd*/, bzs::db::IblobBuffer* bb)
     {
         if (mysql_bin_log.is_open())
         {
@@ -315,13 +320,17 @@ int execSql(THD* thd, const char* sql)
 using namespace bzs::db::transactd;
 class slaveStatus : public dummyProtocol
 {
+protected:
     connection::records& m_records;
     bzs::db::IblobBuffer* m_bb;
     int m_blobfields;
     connection::record& getRec()
     {
         m_records.push_back(connection::record());
-        return m_records[m_records.size() - 1];
+        size_t id = m_records.size() - 1;
+        connection::record& rec = m_records[id];
+        rec.id = (unsigned int)id;
+        return rec;
     }
 public:
     inline slaveStatus(THD *thd_arg, connection::records& recs, bzs::db::IblobBuffer* bb) : 
@@ -329,7 +338,7 @@ public:
     {
         m_records.clear();   
     }
-    ~slaveStatus()
+    virtual ~slaveStatus()
     {
         m_bb->setFieldCount(m_blobfields);
     }
@@ -378,10 +387,214 @@ public:
 #endif
 };
 
-int getSlaveStatus(THD* thd, connection::records& recs, bzs::db::IblobBuffer* bb)
+//----------------------------------------------------------------------
+//  slaveHosts  
+//----------------------------------------------------------------------
+// rec.id = server_id
+// rec.readCount = port
+// rec.name = host
+// opt_show_slave_auth_info
+class slaveInfo
+{
+public:
+    std::string host;
+    std::string user;
+    std::string passwd;
+    std::string uuid;
+    void reset()
+    {
+        host = "";
+        user = "";
+        passwd = "";
+        uuid = "";
+
+    }
+    std::string tabSeparateValue()
+    {
+        return host + "\t" + user + "\t" + passwd + "\t" + uuid;
+    }
+};
+
+
+class slaveHosts : public slaveStatus
+{
+    connection::record m_rec;
+    slaveInfo m_sinfo;
+    int m_strCount;
+public:
+    inline slaveHosts(THD *thd_arg, connection::records& recs, bzs::db::IblobBuffer* bb) :
+        slaveStatus(thd_arg, recs, bb), m_strCount(0){}
+  
+    bool store_longlong(longlong from, bool unsigned_flag)
+    {
+        if (m_rec.id == 0)
+            m_rec.id = (unsigned int)from;
+        else if (m_rec.readCount == 0)
+            m_rec.readCount = (unsigned int)from;
+        return false;
+    }
+    bool store_null()
+    {
+        return false;
+    }
+    bool str_store(const char *from, size_t length)
+    {
+        if (m_strCount == 0)
+            m_sinfo.host = from; 
+#if (defined(MYSQL_5_7))
+        else if (opt_show_slave_auth_info)
+        {
+            if (m_strCount == 1)
+                m_sinfo.user = from;
+            else if (m_strCount == 2)
+                m_sinfo.passwd = from;
+            else if (m_strCount == 3)
+                m_sinfo.uuid = from;
+        }
+#endif
+        else if (m_strCount == 1)
+            m_sinfo.uuid = from;
+
+        ++m_strCount;
+        return false;
+    }
+
+    void addHostInfo()
+    {
+        std::string s = m_sinfo.tabSeparateValue();
+        m_rec.type = 1;
+        if (s.size() >= CON_REC_VALUE_SIZE)
+        {
+            ++m_blobfields;
+            m_rec.type = 2;
+            m_bb->addBlob((unsigned int)s.size() + 1, (unsigned short)m_records.size(),
+                (const unsigned char*)s.c_str());
+        }
+        else
+            strncpy(m_rec.name, s.c_str(), CON_REC_VALUE_SIZE);
+    }
+
+#if (MYSQL_VERSION_ID < 50600 || defined(MARIADB_BASE_VERSION)) // MySQL 5.5 
+    bool store(const char *from, size_t length, CHARSET_INFO *cs)
+    {
+        return str_store(from, length);
+    }
+    bool write()
+    {
+        addHostInfo();
+        m_records.push_back(m_rec);
+        m_rec.reset();
+        m_sinfo.reset();
+        m_strCount = 0;
+        return false;
+    }
+#else
+    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
+    {
+        return str_store(from, length);
+    }
+    bool end_row()
+    {
+        if (m_rec.id)
+        {
+            addHostInfo();
+            m_records.push_back(m_rec);
+        }
+        m_rec.reset();
+        m_sinfo.reset();
+        m_strCount = 0;
+        return false;
+    }
+#endif
+};
+
+
+//----------------------------------------------------------------------
+//  channel  
+//----------------------------------------------------------------------
+#pragma warning(disable : 4800)
+#pragma warning(disable : 4271)
+#pragma warning(disable : 4267)
+#pragma warning(disable : 4244)
+#if (defined(MARIADB_10_0) || defined(MARIADB_10_1))
+#include "sql/slave.h"
+#include "sql/rpl_mi.h"
+
+
+int getChannels(THD* /*thd*/, connection::records& recs)
+{
+    mysql_mutex_assert_owner(&LOCK_active_mi);
+    if (master_info_index)
+    {
+        uint_td size = master_info_index->master_info_hash.records;
+        for (uint_td i = 0;i < size; ++i)
+        {
+            Master_info* mi = (Master_info*)my_hash_element(&master_info_index->master_info_hash, i);
+            if (mi->host[0])
+            {
+                connection::record rec;
+                rec.type = 1;
+                strcpy_s(rec.name, CON_REC_VALUE_SIZE, mi->connection_name.str);
+                recs.push_back(rec);
+            }
+        }
+    }
+    return 0;
+}
+#elif defined(MYSQL_5_7)
+#include "sql/rpl_msr.h" //channel_map
+int getChannels(THD* thd, connection::records& recs)
+{
+    channel_map.rdlock();
+    uint_td size = channel_map.get_num_instances();
+    if (size)
+    {
+        for (mi_map::iterator it = channel_map.begin(); it != channel_map.end(); it++)
+        {
+            Master_info* mi = it->second;
+            if (mi && mi->host[0])
+            {
+                connection::record rec;
+                rec.type = 1;
+                strcpy_s(rec.name, CON_REC_VALUE_SIZE, mi->get_channel());
+                recs.push_back(rec);
+            }
+        }
+    }
+    channel_map.unlock();
+    return 0;
+}
+
+#else
+int getChannels(THD* thd, connection::records& recs)
+{
+    return 0;
+}
+#endif
+#pragma warning(default : 4800)
+#pragma warning(default : 4271)
+#pragma warning(default : 4267)
+#pragma warning(default : 4244)
+//------------------------------------------------------------------------------
+
+int getSlaveStatus(THD* thd, const char* channel, connection::records& recs, bzs::db::IblobBuffer* bb)
 {
     slaveStatus ss(thd, recs, bb);
-    return execSql(thd, "show slave status");
+    char tmp[128];
+#if (defined(MYSQL_5_7))
+    sprintf_s(tmp, 128, "show slave status for channel '%s'", channel);
+#elif (defined(MARIADB_10_1) || defined(MARIADB_10_0))
+    sprintf_s(tmp, 128, "show slave '%s' status", channel);
+#else
+    sprintf_s(tmp, 128, "show slave status");
+#endif
+    return execSql(thd, tmp);
+}
+
+int getSlaveHosts(THD* thd, connection::records& recs, bzs::db::IblobBuffer* bb)
+{
+    slaveHosts ss(thd, recs, bb);
+    return execSql(thd, "show slave hosts");
 }
 
 #pragma GCC diagnostic warning "-Woverloaded-virtual"

data/source/bzs/db/engine/mysql/mysqlProtocol.h

@@ -48,6 +48,11 @@ struct binlogPos
     char type;
     char filename[BINLOGNAME_SIZE];
     char gtid[GTID_SIZE];
+    binlogPos()
+    {
+        filename[0] = 0x00;
+        gtid[0] = 0x00;
+    }
 };
 pragma_pop
 

data/source/bzs/db/protocol/tdap/client/client.cpp

@@ -19,10 +19,11 @@
 #include "client.h"
 #include "sqlBuilder.h"
 #include "stringConverter.h"
-
+#include <errno.h>
 using namespace bzs::db::protocol::tdap::client;
 
-bzs::netsvc::client::connections* m_cons = NULL;
+bnet::connections* m_cons = NULL;
+extern void writeErrorLog(int err, const char* msg);
 
 namespace bzs
 {
@@ -51,6 +52,9 @@ short errorCode(const boost::system::error_code& e)
     {
     case 11004:
     case 11001:
+    case 109:   // destination address required
+    case 2:     //No such file or directory
+    case 1:     //operation not permitted
         ret = ERROR_TD_HOSTNAME_NOT_FOUND;
         break;
     case 10060:
@@ -64,20 +68,21 @@ short errorCode(const boost::system::error_code& e)
     case 111:   //connect: Connection refused
     case 10061:
     case 10053:
+    case 995:   //Win32 WSA_OPERATION_ABORTED 
         ret = ERROR_TD_CONNECTION_FAILURE;
         break;
     case 104:   //write: Connection reset by peer
     case 10054:
-        ret = ERROR_TD_NET_REMOTE_DISCONNECT;
-        break;
     case 232:
-    case 109:
-    case 2:
-    case 1:
-        ret = ERROR_TD_INVALID_CLINETHOST;
+        ret = ERROR_TD_NET_REMOTE_DISCONNECT;
         break;
     default:
+    {
         ret = ERROR_TD_NET_OTHER;
+        char tmp[512];
+        sprintf_s(tmp, 512, "native socket error code %d", e.value());
+        writeErrorLog(ret, tmp);
+    }
     }
     return ret;
 }
@@ -87,9 +92,14 @@ short errorCode(const boost::system::error_code& e)
 
 int client::getServerCharsetIndex()
 {
-    bzs::netsvc::client::connection* c = con();
+    assert(m_preResult == 0);
+    m_preResult = 0;
+    bnet::connection* c = con();
     if (!c)
+    {
+        m_preResult = ERROR_TD_NOT_CONNECTED;
         return -1;
+    }
     int v = c->charsetServer();
     if (v != -1)
         return v;
@@ -117,11 +127,15 @@ int client::getServerCharsetIndex()
         if (req.result == 0 && req.resultLen)
         {
             if (!checkVersion(ver))
+            {
+                m_preResult = SERVER_CLIENT_NOT_COMPATIBLE;
                 return -1;
+            }
             c->setCharsetServer(mysql::charsetIndex(vers.cherserServer));
             return  c->charsetServer();
         }
     }
+    m_preResult = errorCode(con()->error());
     return -1;
 }