transactd 3.4.1 → 3.5.0

data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h

@@ -69,7 +69,7 @@ class dbExecuter : public engine::mysql::dbManager
     void releaseDatabase(request& req, int op);
     std::string makeSQLcreateTable(const request& req);
     bool connect(request& req);
-    inline bool doCreateTable(request& req);
+    inline void doCreateTable(request& req);
     inline bool doOpenTable(request& req, char* buf, bool reconnect=false);
     inline void doSeekKey(request& req, int op, engine::mysql::rowLockMode* lock);
     inline void doMoveFirst(request& req, engine::mysql::rowLockMode* lock);
@@ -106,6 +106,7 @@ public:
  */
 class connMgrExecuter
 {
+    friend class safeLockReadChannels;
     request& m_req;
     __int64 m_modHandle;
     blobBuffer* m_blobBuffer;
@@ -114,11 +115,15 @@ class connMgrExecuter
     int definedTables(char* buf, size_t& size);
     int definedViews(char* buf, size_t& size);
     int slaveStatus(netsvc::server::netWriter* nw);
+    int channels(char* buf, size_t& size);
+    int slaveHosts(netsvc::server::netWriter* nw);
     int systemVariables(char* buf, size_t& size);
     int statusVariables(char* buf, size_t& size);
+    int extendedVariables(netsvc::server::netWriter* nw);
     int read(char* buf, size_t& size);
     int disconnectOne(char* buf, size_t& size);
     int disconnectAll(char* buf, size_t& size);
+    void execHaCommand();
 public:
     connMgrExecuter(request& req, unsigned __int64 parent, blobBuffer* bb);
     int commandExec(netsvc::server::netWriter* nw);
@@ -145,13 +150,7 @@ public:
 
     bool parse(const char* p, size_t size);
 
-    int execute(netsvc::server::netWriter* nw)
-    {
-        if (m_req.op == TD_STASTISTICS)
-            return connMgrExecuter(m_req, (unsigned __int64)m_dbExec->mod(), 
-                        m_dbExec->m_blobBuffer).commandExec(nw);
-        return m_dbExec->commandExec(m_req, nw);
-    }
+    int execute(netsvc::server::netWriter* nw);
 
     bool isShutDown() { return m_dbExec->isShutDown(); }
 

data/source/bzs/db/protocol/tdap/tdapcapi.h

@@ -46,25 +46,12 @@ struct BOOKMARK
 };
 typedef BOOKMARK bookmark_td;
 
-/** tdap c interface
- */
-#if (defined(__BORLANDC__) && !defined(__clang__))
-typedef short __stdcall (*dllUnloadCallback)();
-#else
-/** @cond INTERNAL */
-/** Callback function on a record was deleted. */
-typedef short(__STDCALL* dllUnloadCallback)();
-/** @endcond */
-#endif
-
+/* tdap c interface */
 #ifdef LIB_TDCLCPP
 extern __declspec(dllimport) short_td
     __stdcall BTRCALLID(ushort_td op, void* posb, void* data, uint_td* datalen,
                         void* keybuf, keylen_td keylen, char_td keyNum,
                         uchar_td* clientID);
-
-extern __declspec(dllimport) short_td
-    __stdcall CallbackRegist(dllUnloadCallback func);
 #endif
 
 typedef short_td(__STDCALL* BTRCALLID_PTR)(ushort_td, void*, void*, uint_td*,
@@ -73,6 +60,19 @@ typedef short_td(__STDCALL* BTRCALLID_PTR)(ushort_td, void*, void*, uint_td*,
 
 typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 
+/* HA hostname resolver */
+#if (defined(__BORLANDC__) && !defined(__clang__))
+typedef const char* __STDCALL (*HANAME_RESOLVER_PTR)(const char* vhost, const char* port, char* retBuf, unsigned int& opt);
+typedef void __STDCALL (*REGISTER_RESOLVER_PTR)(HANAME_RESOLVER_PTR func);
+
+#else
+/* @cond INTERNAL */
+typedef const char* (__STDCALL* HANAME_RESOLVER_PTR)(const char* vhost, const char* port, char* retBuf, unsigned int& opt);
+typedef void  (__STDCALL* REGISTER_RESOLVER_PTR)(HANAME_RESOLVER_PTR func);
+
+/* @endcond */
+#endif
+
 /** buffer size
  */
 #define POS_BLOCK_SIZE                  128
@@ -202,6 +202,20 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 #define TD_STSTCS_VIEW_LIST             7
 #define TD_STSTCS_SLAVE_STATUS          8
 #define TD_STSTCS_STATUS_VARIABLES      9
+#define TD_STSTCS_SLAVE_HOSTS          10
+#define TD_STSTCS_EXTENDED_VARIABLES   11
+#define TD_STSTCS_SLAVE_CHANNELS       12
+#define TD_STSTCS_SLAVE_CHANNELS_LOCK  13
+#define TD_STSTCS_HA_LOCK              14
+#define TD_STSTCS_HA_UNLOCK            15
+#define TD_STSTCS_HA_SET_ROLEMASTER    16
+#define TD_STSTCS_HA_SET_ROLESLAVE     17
+#define TD_STSTCS_HA_SET_ROLENONE      18
+#define TD_STSTCS_HA_SET_TRXBLOCK      19
+#define TD_STSTCS_HA_SET_TRXNOBLOCK    20
+#define TD_STSTCS_HA_ENABLE_FO         21
+#define TD_STSTCS_HA_DISBLE_FO         22
+
 
 /** connect sub operation
  */
@@ -282,27 +296,27 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 #define ft_mydecimal                    62
 #define ft_nullindicator                255
 
-/* compair types */
-enum eCompType
-{
-    eEqual = 1,
-    eGreater = 2,
-    eLess = 3,
-    eNotEq = 4,
-    eGreaterEq = 5,
-    eLessEq = 6,
+/* compair types */
+enum eCompType
+{
+    eEqual = 1,
+    eGreater = 2,
+    eLess = 3,
+    eNotEq = 4,
+    eGreaterEq = 5,
+    eLessEq = 6,
     eBitAnd = 8,
-    eNotBitAnd = 9,
-    eIsNull = 10,
-    eIsNotNull = 11
+    eNotBitAnd = 9,
+    eIsNull = 10,
+    eIsNotNull = 11
 };
 
-/* filter cobine type */
-enum combineType
-{
-    eCend,
-    eCand,
-    eCor
+/* filter cobine type */
+enum combineType
+{
+    eCend,
+    eCand,
+    eCor
 };
 
 /** extruct row comp bias
@@ -484,13 +498,15 @@ enum combineType
 #define ERROR_TD_NET_TOO_BIGDATA        3802
 #define ERROR_TD_NET_OTHER              3810
 #define ERROR_TD_C_CLIENT_UNKNOWN       3811
+#define ERROR_TD_INVALID_SERVER_ROLE    3812
 #define ERROR_TD_RECONNECTED            3900
 
+#define ERROR_TD_RECONNECTED_OFFSET     1000
 #define MYSQL_ERROR_OFFSET              25000
 
 inline bool canRecoverNetError(short code)
 {
-    return (code >= ERROR_TD_CONNECTION_FAILURE) &&
+    return (code >= ERROR_TD_HOSTNAME_NOT_FOUND) &&
         (code < ERROR_TD_RECONNECTED) &&
         (code != ERROR_TD_NET_TOO_BIGDATA);
 }
@@ -588,6 +604,12 @@ struct handshale_t
 };
 
 #define HST_OPTION_NO_SCRAMBLE 1
+#define HST_OPTION_ROLE_MASTER 2
+#define HST_OPTION_ROLE_SLAVE  4
+#define HST_OPTION_CLEAR_CACHE 8
+
+
+#define CL_OPTION_CHECK_ROLE   1
 
 /* server system variables index */
 #define TD_VER_DB                 0 
@@ -608,7 +630,8 @@ struct handshale_t
 #define TD_VAR_HSLISTENPORT       15
 #define TD_VAR_USEHS              16
 #define TD_VAR_TIMESTAMPMODE      17
-#define TD_VAR_SIZE               18
+#define TD_VAR_STARTUP_HA         18
+#define TD_VAR_SIZE               19
 
 /* server status variables index */
 #define TD_SVAR_TCP_CONNECTIONS     0
@@ -618,14 +641,31 @@ struct handshale_t
 #define TD_SVAR_PIPE_CONNECTIONS    4
 #define TD_SVAR_PIPE_WAIT_THREADS   5
 #define TD_SVAR_OPEN_DBS            6
-#define TD_SVAR_SIZE                7
-/** @endcond */
+#define TD_SVAR_HA                  7
+#define TD_SVAR_SIZE                8
+
+#define HA_ROLE_SLAVE               0
+#define HA_ROLE_MASTER              1
+#define HA_ROLE_NONE                2
+#define HA_RESTORE_ROLE             4
+#define HA_ENABLE_FAILOVER          8
+
+/* server sql variables index */
+#define TD_EXTENDED_VAR_MYSQL_GTID_MODE  0
+#define TD_EXTENDED_VAR_BINLOG_FILE      1
+#define TD_EXTENDED_VAR_BINLOG_POS       2
+#define TD_EXTENDED_VAR_BINLOG_GTID      3
+#define TD_EXTENDED_VAR_SIZE             4
 
+
+#define TD_CLINET_LOGNAME           "transactd_clinet_err.log"
+
+/** @endcond */
 /* In the case of "tdclcppxxx" library of msvc, The ($TargetName) is not changed automatically.
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "4"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "5"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -689,8 +729,8 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "4"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "1"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "5"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -726,7 +766,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 4//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 1//##9 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 5//##8 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/db/transactd/connManager.cpp

@@ -33,8 +33,13 @@ extern const char* get_trd_sys_var(int index);
 extern const unsigned int* get_trd_status_var(int index);
 
 /* implemnts in mysqlProtocol.cpp */
-extern int getSlaveStatus(THD* thd, bzs::db::transactd::connection::records& recs, 
-         bzs::db::IblobBuffer* bb);
+extern int getSlaveStatus(THD* thd, const char* channel, 
+            bzs::db::transactd::connection::records& recs, bzs::db::IblobBuffer* bb);
+extern int getSlaveHosts(THD* thd, bzs::db::transactd::connection::records& recs,
+            bzs::db::IblobBuffer* bb);
+extern int getChannels(THD* thd, bzs::db::transactd::connection::records& recs);
+
+extern short getBinlogPos(THD* thd, binlogPos* bpos, THD* tmpThd, bzs::db::IblobBuffer* bb);
 
 namespace bzs
 {
@@ -47,9 +52,7 @@ using namespace engine::mysql;
 namespace transactd
 {
 
-connManager::~connManager()
-{
-}
+connManager::~connManager(){}
 
 const module* getMod(unsigned __int64 conid)
 {
@@ -223,6 +226,54 @@ const connection::records& connManager::systemVariables() const
     return m_records;
 }
 
+const connection::records& connManager::extendedVariables(blobBuffer* bb) const
+{
+    m_records.clear();
+    boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
+    if (thd == NULL)
+        m_stat = 20001;
+    else if (!checkGlobalACL(thd.get(), SUPER_ACL | REPL_CLIENT_ACL))
+        m_stat = STATUS_ACCESS_DENIED;
+    if (m_stat) return m_records;
+    binlogPos bpos;
+    short ret = getBinlogPos(thd.get(), &bpos, thd.get(), bb);
+    if (ret) return m_records;
+    for (int i = 0; i < TD_EXTENDED_VAR_SIZE; ++i)
+    {
+        m_records.push_back(connection::record());
+        connection::record& rec = m_records[m_records.size() - 1];
+        rec.id = i;
+        rec.type = 1;
+        switch (i)
+        {
+        case TD_EXTENDED_VAR_MYSQL_GTID_MODE:
+        {
+            rec.type = 0;
+#if (defined(MYSQL_5_7))
+            rec.longValue = (long long)get_gtid_mode(GTID_MODE_LOCK_NONE);
+#else
+            rec.longValue = 0;
+#endif
+            break;
+        }
+        case TD_EXTENDED_VAR_BINLOG_FILE:
+            strncpy(rec.name, bpos.filename, CON_REC_VALUE_SIZE);
+            break;
+        case TD_EXTENDED_VAR_BINLOG_POS:
+            rec.longValue = bpos.pos; 
+            rec.type = 0; 
+            break;
+        case TD_EXTENDED_VAR_BINLOG_GTID:
+            if (bpos.type == REPL_POSTYPE_GTID)
+                rec.type = 2; 
+            else
+                strncpy(rec.name, bpos.gtid, CON_REC_VALUE_SIZE);
+            break;
+        }
+    }
+    return m_records;
+}
+
 const connection::records& connManager::statusVariables() const
 {
     m_records.clear();
@@ -241,77 +292,38 @@ const connection::records& connManager::statusVariables() const
     return m_records;
 }
 
-
 const connection::records& connManager::definedDatabases() const
 {
     m_records.clear();
-    try
+    boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
+    if (thd != NULL)
     {
-        boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
-        if (thd != NULL)
-        {
-            cp_security_ctx(thd.get())->skip_grants();
-            readDbList(thd.get(), m_records);
-        }
-    }
-    catch (bzs::rtl::exception& e)
-    {
-        const int* code = getCode(e);
-        if (code)
-            m_stat = *code;
-        else
-        {
-            m_stat = 20000;
-            sql_print_error("%s", boost::diagnostic_information(e).c_str());
-        }
-        printWarningMessage(code, getMsg(e));
-    }
-    catch (...)
-    {
-        m_stat = 20001;
+        cp_security_ctx(thd.get())->skip_grants();
+        readDbList(thd.get(), m_records);
     }
     return m_records;
 }
 
 const connection::records& connManager::getTableList(const char* dbname, int type) const
 {
-    try
-    {    
-        m_records.clear();
-        if (dbname && dbname[0])
+    m_records.clear();
+    if (dbname && dbname[0])
+    {
+        boost::shared_ptr<database> db(new database(dbname, 1));
+        if (db)
         {
-            boost::shared_ptr<database> db(new database(dbname, 1));
-            if (db)
+            std::vector<std::string> tablelist;
+            schemaBuilder::listTable(db.get(), tablelist, type);
+            for (int i = 0; i < (int)tablelist.size(); ++i)
             {
-                std::vector<std::string> tablelist;
-                schemaBuilder::listTable(db.get(), tablelist, type);
-                for (int i = 0; i < (int)tablelist.size(); ++i)
-                {
-                    m_records.push_back(connection::record());
-                    connection::record& rec = m_records[m_records.size() - 1];
-                    strncpy(rec.name, tablelist[i].c_str(), 64);
-                    rec.name[64] = 0x00;
-                    rec.type = (short)type;
-                }
+                m_records.push_back(connection::record());
+                connection::record& rec = m_records[m_records.size() - 1];
+                strncpy(rec.name, tablelist[i].c_str(), 64);
+                rec.name[64] = 0x00;
+                rec.type = 1;
             }
         }
     }
-    catch (bzs::rtl::exception& e)
-    {
-        const int* code = getCode(e);
-        if (code)
-            m_stat = *code;
-        else
-        {
-            m_stat = 20000;
-            sql_print_error("%s", boost::diagnostic_information(e).c_str());
-        }
-        printWarningMessage(code, getMsg(e));
-    }
-    catch (...)
-    {
-        m_stat = 20001;
-    }
     return m_records;
 }
 
@@ -332,44 +344,53 @@ bool connManager::checkGlobalACL(THD* thd, ulong wantAccess) const
         cp_security_ctx(thd)->skip_grants();
     else
         ::setGrant(thd, mod->host(), mod->user(),  NULL);
-  bool ret = (cp_masterAccess(thd) & wantAccess) != 0;
+    bool ret = (cp_masterAccess(thd) & wantAccess) != 0;
     if (!ret)
         m_stat = STATUS_ACCESS_DENIED;
     return ret;
 }
 
-const connection::records& connManager::readSlaveStatus(blobBuffer* bb) const
+const connection::records& connManager::readByProtocol(int type, blobBuffer* bb, 
+                                const char* channel) const
 {
     m_records.clear();
-    try
-    {
-        boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
-        if (thd == NULL) 
-        {
-            m_stat = 20001;
-            return m_records;
-        }
-        if (!checkGlobalACL(thd.get(), SUPER_ACL | REPL_CLIENT_ACL))
-            return m_records;
-
-        m_stat = errorCode(getSlaveStatus(thd.get(), m_records, bb));
-    }
-    catch (bzs::rtl::exception& e)
+    boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
+    if (thd == NULL)
+        m_stat = 20001;
+    else if (!checkGlobalACL(thd.get(), SUPER_ACL | REPL_CLIENT_ACL))
+        m_stat = STATUS_ACCESS_DENIED; 
+    else
     {
-        const int* code = getCode(e);
-        if (code)
-            m_stat = *code;
+        int ret;
+        if (type == TD_STSTCS_SLAVE_STATUS)
+            ret = getSlaveStatus(thd.get(), channel, m_records, bb);
         else
-        {
-            m_stat = 20000;
-            sql_print_error("%s", boost::diagnostic_information(e).c_str());
-        }
-        printWarningMessage(code, getMsg(e));
+            ret = getSlaveHosts(thd.get(), m_records, bb);
+        m_stat = errorCode(ret);
     }
-    catch (...)
-    {
+    return m_records;
+}
+
+const connection::records& connManager::readSlaveStatus(const char* channel, blobBuffer* bb) const
+{
+    return readByProtocol(TD_STSTCS_SLAVE_STATUS, bb, channel);
+}
+
+const connection::records& connManager::slaveHosts(blobBuffer* bb) const
+{
+    return readByProtocol(TD_STSTCS_SLAVE_HOSTS, bb);
+}
+
+const connection::records& connManager::channels() const
+{
+    m_records.clear();
+    boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
+    if (thd == NULL)
         m_stat = 20001;
-    }
+    else if (!checkGlobalACL(thd.get(), REPL_CLIENT_ACL))
+        m_stat = STATUS_ACCESS_DENIED; 
+    else
+        m_stat = errorCode(getChannels(thd.get(), m_records));
     return m_records;
 }
 
@@ -381,13 +402,17 @@ void connManager::doDisconnect(unsigned __int64 conid)
         igetDatabases* dbm =
             dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
         const databases& dbs = dbm->dbs();
-        if (dbs.size())
+        for (size_t i = 0; i < dbs.size(); ++i)
         {
-            if (dbs[0]->checkAcl(SHUTDOWN_ACL))
-                mod->disconnect();
-            else
-                m_stat = STATUS_ACCESS_DENIED; 
+            if (dbs[i])
+            {
+                if (!dbs[i]->checkAcl(SHUTDOWN_ACL))
+                    m_stat = STATUS_ACCESS_DENIED;
+                break;
+            }
         }
+        if (m_stat == 0)
+            mod->disconnect();
     }
 }