transactd 3.4.1 → 3.5.0

data/source/bzs/db/protocol/tdap/client/haNameResolver.h

@@ -0,0 +1,74 @@
+#ifndef BZS_DB_PROTOCOL_TDAP_CLIENT_HANAME_RESOLVER_H
+#define BZS_DB_PROTOCOL_TDAP_CLIENT_HANAME_RESOLVER_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.
+ ================================================================= */
+#include "export.h"
+
+namespace bzs
+{
+namespace db
+{
+namespace protocol
+{
+namespace tdap
+{
+namespace client
+{
+
+/* haNameResolver::start() result code */
+#define THNR_SUCCESS               0
+#define THNR_SLAVE_HOSTS_NOT_FOUND 1
+#define THNR_INVALID_HOSTS         2
+#define THNR_REGISTER_FUNC_ERROR   3
+
+
+#define THNR_OPT_DISABLE_CALL_FAILOVER    1
+#define THNR_OPT_MASTER_CAN_CONCUR_SLAVE  2
+#define THNR_OPT_FO_READONLY_CONTROL      4
+
+class DLLLIB haNameResolver
+{
+private:
+    haNameResolver();
+    haNameResolver(const haNameResolver&);
+    ~haNameResolver();
+    haNameResolver& operator=(const haNameResolver&);
+public:
+
+    /* The slaves and the slaveHostsWithPort can be specified comma separated names. */
+    static int start(const char* master, const char* slaves,
+                   const char* slaveHostsWithPort, short slaveNum,
+                   const char* userName,
+                   const char* password,
+                   int option = 0);
+    static void addPortMap(short mysqlPort, short transactdPort);
+    static void clearPortMap();
+    static void stop();
+    static const char* master();
+    static const char* slave();
+};
+
+} // namespace client
+} // namespace tdap
+} // namespace protocol
+} // namespace db
+} // namespace bzs
+
+#endif // BZS_DB_PROTOCOL_TDAP_CLIENT_HANAME_RESOLVER_H
+

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

@@ -61,6 +61,7 @@ extern EnginsFunc engins;
 unsigned int g_lastTrnTime = 0;
 unsigned int nsdatabase::m_execCodepage = GetACP();
 bool g_checkTablePtr = false;
+bool g_enableAutoReconnect = false;
 
 PACKAGE void registEnginsPtr(EnginsFunc func)
 {
@@ -163,8 +164,13 @@ binlogPos::~binlogPos(){ delete m_impl;}
 
 void binlogPos::setGtid(const char* p)
 {
-    m_impl->buf.reset(new std::string(p));
-    gtid = m_impl->buf->c_str();
+    gtid = gtid_buf;
+    if (p)
+    {
+        m_impl->buf.reset(new std::string(p));
+        gtid = m_impl->buf->c_str();
+    }else
+        gtid_buf[0] = 0x00;
 }
 
 binlogPos& binlogPos::operator=(const binlogPos& r)
@@ -472,9 +478,8 @@ void nsdatabase::createTable(fileSpec* pfs, uint_td len,
     ;
     const char* p = toServerUri(buf2, MAX_PATH, buf, isUseTransactd());
 
-    m_stat =
-        m_btrcallid(TD_CREATETABLE, posblk, pfs, &len, (void*)p,
-                    (uchar_td)strlen(p), (char_td)mode, m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_CREATETABLE, posblk, pfs, &len, (void*)p,
+                    (uchar_td)strlen(p), (char_td)mode);
 }
 
 void nsdatabase::dropTable(const _TCHAR* pFullPath)
@@ -501,9 +506,8 @@ void nsdatabase::dropTable(const _TCHAR* pFullPath)
     char buf2[MAX_PATH] = { 0x00 };
     const char* p = toServerUri(buf2, MAX_PATH, buf, isUseTransactd());
 
-    m_stat =
-        m_btrcallid(TD_CREATETABLE, posblk, NULL, NULL, (void*)p,
-                    (uchar_td)strlen(p) + 1, CR_SUBOP_DROP, m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_CREATETABLE, posblk, NULL, NULL, (void*)p,
+                    (uchar_td)strlen(p) + 1, CR_SUBOP_DROP);
 }
 
 void nsdatabase::swapTablename(const _TCHAR* Name1, const _TCHAR* Name2)
@@ -516,9 +520,8 @@ void nsdatabase::swapTablename(const _TCHAR* Name1, const _TCHAR* Name2)
     const char* p2 = toServerUri(buf2, MAX_PATH, Name2, isUseTransactd());
     uint_td len = (uint_td)strlen(p);
 
-    m_stat = m_btrcallid(TD_CREATETABLE, posblk, (void*)p, &len, (void*)p2,
-                         (uchar_td)strlen(p2), CR_SUBOP_SWAPNAME,
-                         m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_CREATETABLE, posblk, (void*)p, &len, (void*)p2,
+                         (uchar_td)strlen(p2), CR_SUBOP_SWAPNAME);
 }
 
 void nsdatabase::rename(const _TCHAR* pFullPath, const _TCHAR* newName)
@@ -554,9 +557,8 @@ void nsdatabase::rename(const _TCHAR* pFullPath, const _TCHAR* newName)
         _tcscpy(buf, newName);
     toServerUri(bufNew, MAX_PATH, newName, isUseTransactd());
 
-    m_stat = m_btrcallid(TD_CREATETABLE, posblk, (void*)p, &len, (void*)bufNew,
-                         (uchar_td)strlen(bufNew), CR_SUBOP_RENAME,
-                         m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_CREATETABLE, posblk, (void*)p, &len, (void*)bufNew,
+                         (uchar_td)strlen(bufNew), CR_SUBOP_RENAME);
 }
 
 void nsdatabase::registerTable(nstable* tb)
@@ -637,10 +639,8 @@ void nsdatabase::reset()
     m_nsimpl->bdfPath[0] = 0x00;
     if (m_btrcallid)
     {
-        m_stat = m_btrcallid(TD_RESET_CLIENT, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->cidPtr);
-        m_stat = m_btrcallid(TD_STOP_ENGINE, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->cidPtr);
+        m_stat = tdap(TD_RESET_CLIENT, NULL, NULL, NULL, NULL, 0, 0);
+        m_stat = tdap(TD_STOP_ENGINE, NULL, NULL, NULL, NULL, 0, 0);
         if (m_stat == ERROR_TD_NOT_CONNECTED)
             m_stat = STATUS_SUCCESS;
     }
@@ -679,17 +679,7 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
     if (m_nsimpl->snapShotCount == 0)
     {
         uint_td datalen = (bias == CONSISTENT_READ_WITH_BINLOG_POS) ? BINLOGPOS_SIZE : 0;
-        m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, bpos, &datalen, NULL, 0, 0,
-                             m_nsimpl->cidPtr);
-#ifdef TEST_RECONNECT
-        if (canRecoverNetError(m_stat))
-        {
-            reconnect();
-            if (m_stat) return;
-            m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, NULL, NULL, NULL,
-                                     0, 0, m_nsimpl->cidPtr);
-        }
-#endif
+        m_stat = tdapEx(TD_BEGIN_SHAPSHOT + bias, NULL, bpos, &datalen, NULL, 0, 0);
         if (m_stat == 0)
         {
             if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
@@ -699,8 +689,7 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
                 else if(bpos->type == REPL_POSTYPE_GTID)
                 {
                     const blobHeader* hd;
-                    short stat = m_btrcallid(TD_GET_BLOB_BUF, NULL, &hd, NULL, NULL, 0, 0,
-                             m_nsimpl->cidPtr);
+                    short stat = tdap(TD_GET_BLOB_BUF, NULL, &hd, NULL, NULL, 0, 0);
                     if (stat == 0)
                     {
                         assert(hd->rows);
@@ -710,19 +699,18 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
                         bpos->type = REPL_POSTYPE_POS;
                 }
             }
-            m_nsimpl->snapShotCount++;
+            ++m_nsimpl->snapShotCount;
         }
     }
     else
-        m_nsimpl->snapShotCount++;
+        ++m_nsimpl->snapShotCount;
 }
 
 void nsdatabase::endSnapshot()
 {
     m_nsimpl->snapShotCount--;
     if (m_nsimpl->snapShotCount == 0)
-        m_stat = m_btrcallid(TD_END_SNAPSHOT, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->cidPtr);
+        m_stat = tdap(TD_END_SNAPSHOT, NULL, NULL, NULL, NULL, 0, 0);
     if (m_nsimpl->snapShotCount < 0)
         m_nsimpl->snapShotCount = 0;
 }
@@ -732,8 +720,8 @@ void nsdatabase::beginTrn(short BIAS)
     if (!checkAssociate()) return;
     if (m_nsimpl->tranCount == 0)
     {
-        m_stat = m_btrcallid((ushort_td)(BIAS + TD_BEGIN_TRANSACTION), NULL,
-                             NULL, NULL, NULL, 0, 0, m_nsimpl->cidPtr);
+        m_stat = tdapEx((ushort_td)(BIAS + TD_BEGIN_TRANSACTION), NULL,
+                             NULL, NULL, NULL, 0, 0);
         if (m_stat == 0)
             m_nsimpl->tranCount++;
     }
@@ -743,13 +731,10 @@ void nsdatabase::beginTrn(short BIAS)
 
 void nsdatabase::endTrn()
 {
-
     m_nsimpl->tranCount--;
     if (m_nsimpl->tranCount == 0)
     {
-        m_stat = m_btrcallid(TD_END_TRANSACTION, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->cidPtr);
-
+        m_stat = tdap(TD_END_TRANSACTION, NULL, NULL, NULL, NULL, 0, 0);
 #ifdef _WIN32
         g_lastTrnTime = GetTickCount();
 #endif
@@ -760,9 +745,7 @@ void nsdatabase::endTrn()
 
 void nsdatabase::abortTrn()
 {
-    m_stat = m_btrcallid(TD_ABORT_TRANSACTION, NULL, NULL, NULL, NULL, 0, 0,
-                         m_nsimpl->cidPtr);
-
+    m_stat = tdap(TD_ABORT_TRANSACTION, NULL, NULL, NULL, NULL, 0, 0);
     m_nsimpl->tranCount = 0;
 #ifdef _WIN32
     g_lastTrnTime = GetTickCount();
@@ -797,9 +780,7 @@ void nsdatabase::getBtrVersion(btrVersions* Vers, uchar_td* posblk)
         posblk = posblkTmp;
 
     uint_td datalen = sizeof(btrVersions);
-
-    m_stat = m_btrcallid(TD_VERSION, posblk, Vers, &datalen, NULL, 0, 0,
-                         m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_VERSION, posblk, Vers, &datalen, NULL, 0, 0);
     {
         bool remote = false;
         if (uriMode())
@@ -845,8 +826,8 @@ char* nsdatabase::getCreateViewSql(const _TCHAR* name , char* retbuf, uint_td* s
     char Uri[MAX_PATH] = { 0x00 };
     const char* p = nsdatabase::toServerUri(Uri, MAX_PATH, tmp, true);
     keylen_td keylen = (keylen_td)strlen(p) + 1;
-    m_stat = m_btrcallid(TD_GET_SCHEMA, NULL, retbuf, size, (void*)p, keylen,
-                             SC_SUBOP_VIEW_BY_SQL, m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_GET_SCHEMA, NULL, retbuf, size, (void*)p, keylen,
+                             SC_SUBOP_VIEW_BY_SQL);
     if (m_stat != STATUS_SUCCESS)
         retbuf[0] = 0x00;
     return retbuf;
@@ -890,8 +871,7 @@ void nsdatabase::readDatabaseDirectory(_TCHAR* retbuf, uchar_td buflen)
 {
     // keynum is drive name A=1 B=2 C=3 0=default
     char tmp[128];
-    m_stat = m_btrcallid(TD_GETDIRECTORY, NULL, NULL, NULL, tmp, 128, 0,
-                         m_nsimpl->cidPtr);
+    m_stat = tdapEx(TD_GETDIRECTORY, NULL, NULL, NULL, tmp, 128, 0);
     toTCharCopy(retbuf, tmp, buflen);
 }
 
@@ -919,8 +899,8 @@ bool nsdatabase::connect(const _TCHAR* URI, bool newConnection)
     char uri_a[MAX_PATH] = { 0x00 };
     const char* p = toServerUri(uri_a, MAX_PATH, URI, isUseTransactd());
     char_td keyNum = (isUseTransactd() == false) ? 0 : newConnection ? 3 : 0;
-    m_stat = m_btrcallid(TD_CONNECT, NULL, NULL, &datalen, (void*)p,
-                         (keylen_td)(strlen(p) + 1), keyNum, clientID());
+    m_stat = tdap(TD_CONNECT, NULL, NULL, &datalen, (void*)p,
+                         (keylen_td)(strlen(p) + 1), keyNum);
     if (m_stat)
         return false;
     return true;
@@ -936,9 +916,8 @@ bool nsdatabase::disconnect(const _TCHAR* URI)
     uint_td datalen = 0;
 
     //Transactd not use uri.
-    m_stat = m_btrcallid(TD_CONNECT, NULL, NULL, &datalen, (void*)URI,
-                         (keylen_td)(_tcslen(URI) + 1), LG_SUBOP_DISCONNECT,
-                         clientID());
+    m_stat = tdap(TD_CONNECT, NULL, NULL, &datalen, (void*)URI,
+                         (keylen_td)(_tcslen(URI) + 1), LG_SUBOP_DISCONNECT);
     if (m_stat)
         return false;
     return true;
@@ -946,14 +925,12 @@ bool nsdatabase::disconnect(const _TCHAR* URI)
 
 bool nsdatabase::disconnectForReconnectTest()
 {
-    //Transactd only
     if (!isUseTransactd())
         return false;
 
     uint_td datalen = 0;
-    m_stat = m_btrcallid(TD_CONNECT, NULL, NULL, &datalen, NULL,
-                         0, LG_SUBOP_DISCONNECT_EX,
-                         clientID());
+    m_stat = tdap(TD_CONNECT, NULL, NULL, &datalen, NULL,
+                         0, LG_SUBOP_DISCONNECT_EX);
     if (m_stat)
         return false;
     return true;
@@ -970,7 +947,6 @@ void nsdatabase::doReconnect(nstable* tb)
 {
     uint_td datalen = 0;
     char uri_a[MAX_PATH] = { 0x00 };
-    tb->abortBulkInsert();
     datalen = tb->buflen();
     tdap::posblk* pb = (tdap::posblk*)tb->posblk();
     char* databuf = new char[datalen];
@@ -978,8 +954,8 @@ void nsdatabase::doReconnect(nstable* tb)
     memcpy(databuf + 1, &pb->bookmarkLen, pb->bookmarkLen + 1);
     const char* p = toServerUri(uri_a, MAX_PATH, tb->uri(), true);
     short offset = (pb->lock) ? ROW_LOCK_X : 0;
-    m_stat = m_btrcallid(TD_RECONNECT + offset, pb, databuf, &datalen, (void*)p,
-                    (keylen_td)(strlen(p) + 1), tb->mode(), clientID());
+    m_stat = tdap(TD_RECONNECT + offset, pb, databuf, &datalen, (void*)p,
+                    (keylen_td)(strlen(p) + 1), tb->mode());
     delete [] databuf;
 }
 
@@ -1001,17 +977,22 @@ bool nsdatabase::doReopenTables()
     return (m_stat == 0);
 }
 
+/*
+   A single thread can access to the connection ,if it is shared from some engings.
+*/
 bool reconnectSharedConnection(const void* ptr)
 {
+    //Lock engin count
     boost::mutex::scoped_lock lck(g_mutex);
     for (int i = 0; i < MAX_BTRENGIN; ++i)
     {
-        if (engins()[i])
+        nsdatabase* db = engins()[i];
+        if (db)
         {
-            void* p = (*((void**)engins()[i]->m_nsimpl->cidPtr));
+            void* p = (*((void**)db->m_nsimpl->cidPtr));
             if (p == ptr)
             {
-                if (!engins()[i]->doReopenTables())
+                if (!db->doReopenTables())
                     return false;
             }
         }
@@ -1024,18 +1005,48 @@ bool nsdatabase::reconnect()
     //Transactd only
     if (!isUseTransactd())
         return false;
+    if (m_nsimpl->tranCount || m_nsimpl->snapShotCount)
+        return false;
+    //check another databases has transactions
+    {
+        boost::mutex::scoped_lock lck(g_mutex);
+        for (int i = 0; i < MAX_BTRENGIN; ++i)
+        {
+            nsdatabase* db = engins()[i];
+            if (db && (db->m_nsimpl->tranCount || db->m_nsimpl->snapShotCount))
+            {
+                if (db->m_nsimpl->cidPtr == m_nsimpl->cidPtr)
+                    return false; // This is same thread
+            }
+        }
+    }
 
-    m_nsimpl->tranCount = 0;
-    m_nsimpl->snapShotCount = 0;
     uint_td datalen = 0;
     char uri_a[MAX_PATH] = { 0x00 };
     const char* p = toServerUri(uri_a, MAX_PATH, m_nsimpl->bdfPath, true);
-    m_stat = m_btrcallid(TD_CONNECT, NULL, NULL, &datalen, (void*)p,
-                         (keylen_td)(strlen(p) + 1),
-                         LG_SUBOP_RECONNECT, clientID());
+    m_stat = tdap(TD_CONNECT, NULL, NULL, &datalen, (void*)p,
+                         (keylen_td)(strlen(p) + 1), LG_SUBOP_RECONNECT);
     if (m_stat) return false;
     return reconnectSharedConnection((*(void**)m_nsimpl->cidPtr));
+}
 
+short nsdatabase::tdapEx(ushort_td op, void* posb, void* data, uint_td* datalen,
+                        void* keybuf, keylen_td keylen, char_td keyNum)
+{
+    bool loop;
+    short stat;
+    do
+    {
+        loop = false;
+        stat = m_btrcallid(op, posb, data, datalen, keybuf, keylen, keyNum, clientID());
+        if (stat && nsdatabase::enableAutoReconnect() && canRecoverNetError(m_stat))
+        {
+            reconnect();
+            if (stat) break;
+            loop = true;
+        }
+    }while (loop);
+    return stat;
 }
 
 bool nsdatabase::trnsactionFlushWaitStatus()
@@ -1126,6 +1137,26 @@ WIN_TPOOL_SHUTDOWN_PTR nsdatabase::getWinTPoolShutdownFunc()
 
 }
 
+bool nsdatabase::registerHaNameResolver(HANAME_RESOLVER_PTR func)
+{
+    if (hTrsdDLL == NULL)
+        hTrsdDLL = LoadLibraryA(LIB_PREFIX TDCLC_LIBNAME);
+    if (hTrsdDLL)
+    {
+        REGISTER_RESOLVER_PTR regist =  
+            (REGISTER_RESOLVER_PTR)GetProcAddress((HINSTANCE)hTrsdDLL,
+                                        "RegisterHaNameResolver");
+        if (regist)
+        {
+            regist(func);
+            g_enableAutoReconnect = func != NULL;
+            return true;
+        }
+    }
+    return false;
+}
+
+
 } // namespace client
 } // namespace tdap
 } // namespace protocol

data/source/bzs/db/protocol/tdap/client/nsDatabase.h

@@ -41,6 +41,7 @@ namespace tdap
 {
 namespace client
 {
+extern DLLLIB bool g_enableAutoReconnect;
 
 class dbdef;
 class nstable;
@@ -67,8 +68,8 @@ struct DLLLIB binlogPos
 private:
     char gtid_buf[GTID_SIZE];
     struct bpimple* m_impl;
-    void setGtid(const char* p);
 public:
+    void setGtid(const char* p);
     const char* gtid;
     binlogPos();
     binlogPos(const binlogPos& r);
@@ -95,9 +96,18 @@ class DLLLIB nsdatabase
 protected:
     BTRCALLID_PTR m_btrcallid;
     short m_stat;
-
     static const char* toServerUri(char* buf, int buflen, const _TCHAR* src,
                                    bool trd);
+    short tdapEx(ushort_td op, void* posb, void* data, uint_td* datalen,
+                        void* keybuf, keylen_td keylen, char_td keyNum);
+
+    inline short tdap(ushort_td op, void* posb, void* data, uint_td* datalen,
+                            void* keybuf, keylen_td keylen, char_td keyNum)
+    {
+        return m_btrcallid(op, posb, data, datalen, keybuf, keylen, keyNum,
+            clientID());
+    }  
+
     virtual bool setUri(const _TCHAR* uri);
     void reset();
     void resetSnapshot();
@@ -174,13 +184,15 @@ public:
     static bool trnsactionFlushWaitStatus();
     static void setExecCodePage(unsigned int codepage);
     static unsigned int execCodePage();
+    static inline bool enableAutoReconnect(){ return g_enableAutoReconnect;}
+    static inline void setEnableAutoReconnect(bool v){ g_enableAutoReconnect = v;}
+    static bool registerHaNameResolver(HANAME_RESOLVER_PTR func);
     /** @cond INTERNAL */
     void setTestPtrIgnore(bool v);
     bool isTestPtrIgnore() const;
     static WIN_TPOOL_SHUTDOWN_PTR getWinTPoolShutdownFunc();
     static bool testTablePtr(nstable* ptr);
     static void setCheckTablePtr(bool v);
-
     /** @endcond */
 };