transactd 3.4.1 → 3.5.0

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

@@ -56,16 +56,21 @@ private:
     void doDisconnectAll();
     const connection::records& getTableList(const char* dbname, int type) const;
     bool checkGlobalACL(THD* thd, ulong wantAccess) const;
+    const connection::records& readByProtocol(int type, blobBuffer* bb, 
+                                    const char* channel=NULL) const;
 public:
     connManager(unsigned __int64 me) : m_me(me), m_stat(0){};
     virtual ~connManager();
     const connection::records& systemVariables() const;
+    const connection::records& extendedVariables(blobBuffer* bb) const;
     const connection::records& statusVariables() const;
     const connection::records& getRecords(unsigned __int64 conid, int dbid) const;
     const connection::records& definedDatabases() const;
     const connection::records& schemaTables(const char* dbname) const;
     const connection::records& definedTables(const char* dbname, int type) const;
-    const connection::records& readSlaveStatus(blobBuffer* bb) const;
+    const connection::records& readSlaveStatus(const char* channel, blobBuffer* bb) const;
+    const connection::records& slaveHosts(blobBuffer* bb) const;
+    const connection::records& channels() const;
     void disconnect(unsigned __int64 conid);
     void disconnectAll();
     short stat() const {return m_stat;}

data/source/bzs/db/transactd/connectionRecord.h

@@ -129,6 +129,15 @@ struct record
     {
         name[0] = 0x00;
     }
+    void reset()
+    {
+        name[0] = 0x00;
+        conId = 0;
+        id = 0;
+        db = 0;
+        updCount = 0;
+        status = 0;
+    }
     union
     {
         __int64 conId;                      // 8 byte
@@ -143,7 +152,8 @@ struct record
     union
     {
         unsigned int db;
-        unsigned int readCount;             // 4 byte
+        unsigned int readCount;
+        unsigned int port;                  // 4 byte
     };
     union
     {
@@ -188,22 +198,32 @@ struct record
         MultiByteToWideChar(CP_UTF8, 0, (char*)longValue, -1, buf, size);
         return buf;
     }
-    #else
-    inline const char* t_name(char* /*buf*/, int /*size*/) const
+    #endif
+    /*inline const char* t_name(char* buf, int size) const
     {
         return name;
-    }
+    }*/
     const char* value(char* buf, int size) const
     {
         if (type == 0)
         {
             _i64toa_s(longValue, buf, size, 10);
-            return buf;
+
         }else if (type == 1)
+            strcpy_s(buf, size, name);
+        else
+            strcpy_s(buf, size, (char*)longValue);
+        return buf;
+    }
+    const char* value_ptr() const
+    {
+        if (type == 0)
+            return (const char*)&longValue;
+        else if(type == 1)
             return name;
-        return (char*)longValue;
+        return (const char*)longValue;
     }
-    #endif
+
 };                                          // 20 + 68 = 88
 
 #ifdef MYSQL_DYNAMIC_PLUGIN

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

@@ -32,12 +32,14 @@
 #pragma warning(default : 4800)
 
 #include <bzs/db/engine/mysql/mysqlThd.h>
+#include <bzs/db/engine/mysql/ha.h>
 #include "appBuilderImple.h"
 
 /** tcp server type
  */
 #define TCP_CPT_SERVER       1
 #define TCP_TPOOL_SERVER     2
+
 #define PIPE_SHARE_MEM_SIZE  6292480 // 6Mbyte + 1024
 
 using namespace bzs::netsvc::server;
@@ -47,7 +49,7 @@ using namespace bzs::netsvc::server;
 static char* g_listenAddress = NULL;
 static char* g_listenPort = NULL;
 static char* g_hostCheckUserName = NULL;
-static unsigned int g_tcpServerType = TCP_CPT_SERVER;
+unsigned int g_tcpServerType = TCP_CPT_SERVER;
 static unsigned int g_maxTcpConnections = 200;
 static unsigned int g_pool_threads = 20;
 int g_tableNmaeLower = 1; // defined in btrvProtocol.h
@@ -56,7 +58,8 @@ char* g_transaction_isolation = NULL;
 char* g_auth_type = NULL;
 unsigned int g_pipeCommSharememSize = PIPE_SHARE_MEM_SIZE;
 unsigned int g_timestamp_always = 1;
-//int g_grant_apply = 0;//skip
+unsigned int g_startup_ha = 0;
+extern unsigned int g_ha;// defined in srvrole.cpp
 
 
 /** tcp server
@@ -101,6 +104,7 @@ static int transactd_plugin_init(void* p)
 {
     try
     {
+        bzs::db::engine::mysql::initHa();
         if (g_tcpServerType == TCP_CPT_SERVER)
         {
             boost::shared_ptr<IAppModuleBuilder> app(new transctionalIF(
@@ -255,6 +259,12 @@ static MYSQL_SYSVAR_STR(transaction_isolation, g_transaction_isolation,
 static MYSQL_SYSVAR_STR(auth_type, g_auth_type,
                         PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC, NULL, NULL,
                         NULL, "none"); //or "mysql_native"
+static MYSQL_SYSVAR_UINT(timestamp_always, g_timestamp_always, PLUGIN_VAR_READONLY, "", 0,
+                        0, 1, 0, 1, 0);
+static MYSQL_SYSVAR_UINT(startup_ha, g_startup_ha,
+                         PLUGIN_VAR_READONLY, "0...7", 0, 0, 0, 0, 7, 0);
+
+
 /*static MYSQL_SYSVAR_INT(grant_apply, g_grant_apply,
                         PLUGIN_VAR_READONLY, "0..1 0:none 1:all", 0, 0, 0, 0, 1, 0);
 */
@@ -275,9 +285,6 @@ static MYSQL_SYSVAR_STR(hs_port, g_hs_listenPort,
 static MYSQL_SYSVAR_INT(use_handlersocket, g_use_hs, PLUGIN_VAR_READONLY, "", 0,
                         0, 0, 0, 1, 0);
 
-static MYSQL_SYSVAR_UINT(timestamp_always, g_timestamp_always, PLUGIN_VAR_READONLY, "", 0,
-                        0, 1, 0, 1, 0);
-
 #endif
 
 /** system valiables struct.
@@ -295,6 +302,7 @@ static struct st_mysql_sys_var* g_systemVariables[] =
     MYSQL_SYSVAR(transaction_isolation),
     MYSQL_SYSVAR(auth_type),
     MYSQL_SYSVAR(timestamp_always),
+    MYSQL_SYSVAR(startup_ha),
 #ifdef PIPE_SERVER
     MYSQL_SYSVAR(pipe_comm_sharemem_size), 
     MYSQL_SYSVAR(max_pipe_connections),
@@ -321,7 +329,8 @@ const char* get_trd_sys_var(int index)
     case TD_VAR_LOCKWAITTIMEOUT:return (const char*)&g_lock_wait_timeout;
     case TD_VAR_ISOLATION:return g_transaction_isolation;
     case TD_VAR_AUTHTYPE:return g_auth_type;
-    case TD_VAR_TIMESTAMPMODE:return (const char*)&g_timestamp_always; 
+    case TD_VAR_TIMESTAMPMODE:return (const char*)&g_timestamp_always;
+    case TD_VAR_STARTUP_HA:return (const char*)&g_startup_ha; 
 #ifdef PIPE_SERVER
     case TD_VAR_PIPESHAREMEMSIZE:return (const char*)&g_pipeCommSharememSize;
     case TD_VAR_MAXPIPECONNECTIONS:return (const char*)&g_maxPipeConnections;
@@ -347,6 +356,7 @@ const unsigned int* get_trd_status_var(int index)
     case TD_SVAR_TCP_WAIT_THREADS:return &cpt::g_waitThread;
     case TD_SVAR_TPOOL_CONNECTIONS:return &tpool::g_connections;
     case TD_SVAR_TPOOL_WAIT_THREADS:return &tpool::server::m_threadPoolSize;
+    case TD_SVAR_HA:return &g_ha;
 #ifdef PIPE_SERVER
     case TD_SVAR_PIPE_CONNECTIONS:return &pipe::g_connections;
     case TD_SVAR_PIPE_WAIT_THREADS:return &pipe::g_waitThread;
@@ -359,16 +369,17 @@ const unsigned int* get_trd_status_var(int index)
 /** show status struct.
  */
 static st_mysql_show_var g_statusVariables[] = {
-    { "trnsctd_tcp_connections", (char*)&cpt::g_connections, SHOW_INT },
-    { "trnsctd_tcp_wait_threads", (char*)&cpt::g_waitThread, SHOW_INT },
-    { "trnsctd_tpool_connections", (char*)&tpool::g_connections, SHOW_INT },
-    { "trnsctd_tpool_threads", (char*)&tpool::server::m_threadPoolSize, SHOW_INT },
+    { "Transactd_tcp_connections", (char*)&cpt::g_connections, SHOW_INT STATUS_VAR_SCOPE },
+    { "Transactd_tcp_wait_threads", (char*)&cpt::g_waitThread, SHOW_INT },
+    { "Transactd_tpool_connections", (char*)&tpool::g_connections, SHOW_INT STATUS_VAR_SCOPE },
+    { "Transactd_tpool_threads", (char*)&tpool::server::m_threadPoolSize, SHOW_INT STATUS_VAR_SCOPE },
+    { "Transactd_ha", (char*)&g_ha, SHOW_INT STATUS_VAR_SCOPE },
 
 #ifdef PIPE_SERVER
-    { "trnsctd_pipe_connections", (char*)&pipe::g_connections, SHOW_INT },
-    { "trnsctd_pipe_wait_threads", (char*)&pipe::g_waitThread, SHOW_INT },
+    { "Transactd_pipe_connections", (char*)&pipe::g_connections, SHOW_INT STATUS_VAR_SCOPE },
+    { "Transactd_pipe_wait_threads", (char*)&pipe::g_waitThread, SHOW_INT STATUS_VAR_SCOPE },
 #endif
-    { "trnsctd_cur_open_databases", (char*)&g_openDatabases, SHOW_INT },
+    { "Transactd_cur_open_databases", (char*)&g_openDatabases, SHOW_INT STATUS_VAR_SCOPE },
     { NULL, NULL, (enum_mysql_show_type)0 }
 };
 

data/source/bzs/env/crosscompile.h

@@ -58,6 +58,7 @@ int gettimeofday(struct timeval*, struct timezone*);
 #endif
 
 #define _strnicmp strncasecmp
+#define _stricmp strcasecmp
 #define _atoi64 atoll
 #define _access access
 #define sprintf_s snprintf
@@ -217,6 +218,7 @@ typedef unsigned __int32 char32_t; // 32bit
 #if defined(__BORLANDC__)
 #define _strupr strupr
 #define _strnicmp strnicmp
+#define _stricmp stricmp
 #endif
 
 #define wcsnicmp16(A, B, C)                                                    \

data/source/bzs/netsvc/client/iconnection.h

@@ -109,6 +109,8 @@ public:
     virtual bool isHandShakable() const = 0;
     virtual const boost::system::error_code& error() const = 0;
     virtual void* versions() = 0;
+    virtual unsigned int userOptions() const = 0;
+    virtual void setUserOptions(unsigned int v) = 0;
 };
 
 #define CONNECTION_FUNCTION_DIRECT_READ 1

data/source/bzs/netsvc/client/tcpClient.cpp

@@ -52,8 +52,11 @@ int connections::netTimeout = 180;
 #define DEFAULT_CONNECT_TIMEOUT "20"
 #define DEFAULT_NET_TIMEOUT "180"
 
+/* redefine tdapapi.h */
+#define HST_OPTION_CLEAR_CACHE 8
 
-connections::connections(const char* pipeName) : m_pipeName(pipeName),m_resolver(m_ios)
+connections::connections(const char* pipeName) : m_pipeName(pipeName),
+    m_resolver(m_ios), m_haNameResolver(NULL)
 {
 
 #ifdef _WIN32
@@ -159,16 +162,6 @@ asio::ip::tcp::endpoint connections::endpoint(const std::string& host,
     return endpoint;
 }
 
-connection* connections::getConnection(const std::string& host, const char* port)
-{
-    mutex::scoped_lock lck(m_mutex);
-    boost::system::error_code ec;
-    tcp::endpoint ep = endpoint(host, port, ec);
-    if (!ec)
-        return getConnection(ep);
-    return NULL;
-}
-
 #ifdef USE_PIPE_CLIENT
 
 connection* connections::getConnectionPipe(unsigned short port)
@@ -313,10 +306,25 @@ inline bool connections::doHandShake(connection* c, handshake f, void* data)
 #pragma warn -8004
 #endif
 // The connection of found from connection list of same address is returned.
-connection* connections::connect(const std::string& host, const char* port, handshake f, void* data, bool newConnection)
+connection* connections::connect(const std::string& hst, const char* port,
+        handshake f, void* data, bool newConnection, bool clearNRCache)
 {
     bool namedPipe = false;
     connection* c;
+    std::string host = hst;
+    unsigned int opt = clearNRCache ? HST_OPTION_CLEAR_CACHE : 0;
+    char buf[MAX_PATH];
+    if (m_haNameResolver)
+    {
+        m_haNameResolver(hst.c_str(), port, buf, opt);
+        char* p = strchr(buf, ':');
+        if (p)
+        {
+            *p = 0x00;
+            port = p + 1;
+        }
+        host = buf;
+    }
     mutex::scoped_lock lck(m_mutex);
     asio::ip::tcp::endpoint ep = endpoint(host, port, m_e);
     if (m_e)
@@ -330,7 +338,8 @@ connection* connections::connect(const std::string& host, const char* port, hand
         c = newConnection ? NULL : getConnection(ep);
     if (newConnection || !c)
     {
-        c = createConnection(ep, namedPipe); 
+        c = createConnection(ep, namedPipe);
+        c->setUserOptions(opt);
         c = doConnect(c);
         if (!c || !doHandShake(c, f, data))
             return NULL;
@@ -343,14 +352,29 @@ connection* connections::connect(const std::string& host, const char* port, hand
 #pragma warn .8004
 #endif
 
-bool connections::reconnect(connection* c, const std::string& host, const char* port,
+bool connections::reconnect(connection* c, const std::string& hst, const char* port,
                         handshake f, void* data)
 {
     boost::system::error_code ec;
+    std::string host = hst;
+    unsigned int opt = HST_OPTION_CLEAR_CACHE;
+    char buf[MAX_PATH];
+    if (m_haNameResolver)
+    {
+        m_haNameResolver(hst.c_str(), port, buf, opt);
+        char* p = strchr(buf, ':');
+        if (p)
+        {
+            *p = 0x00;
+            port = p + 1;
+        }
+        host = buf;
+    }
     mutex::scoped_lock lck(m_mutex);
     asio::ip::tcp::endpoint ep = endpoint(host, port, ec);
     if (ec)
         return false;
+    c->setUserOptions(opt);
     c->reconnect(ep);
     if (!c || !doHandShake(c, f, data))
         return false;
@@ -362,6 +386,13 @@ int connections::connectionCount()
     return (int)m_conns.size();
 }
 
+void connections::registHaNameResolver(HANAME_RESOLVER_PTR func)
+{
+    mutex::scoped_lock lck(m_mutex);
+    m_haNameResolver = func;    
+}
+
+
 } // namespace client
 } // namespace netsvc
 } // namespace bzs

data/source/bzs/netsvc/client/tcpClient.h

@@ -45,7 +45,7 @@
 #include <pthread.h> 
 #include <signal.h>
 #endif
-
+#include <bzs/env/compiler.h>
 
 using namespace boost;
 using namespace boost::system;
@@ -64,6 +64,16 @@ using namespace boost::system;
 extern bool win_thread_pool_shutdown;
 #endif
 
+/* HA hostname resolver */
+/* @cond INTERNAL */
+#if (defined(__BORLANDC__) && !defined(__clang__))
+typedef const char* __STDCALL (*HANAME_RESOLVER_PTR)(const char* vhost, const char* port, char* retBuf, unsigned int& opt);
+#else
+typedef const char* (__STDCALL* HANAME_RESOLVER_PTR)(const char* vhost, const char* port, char* retBuf, unsigned int& opt);
+#endif
+/* @endcond */
+
+
 namespace bzs
 {
 namespace netsvc
@@ -118,6 +128,7 @@ class connections
     boost::asio::ip::tcp::resolver m_resolver;
     mutex m_mutex;
     boost::system::error_code m_e;
+    HANAME_RESOLVER_PTR m_haNameResolver;
     static bool m_usePipedLocal;
 
     connection* getConnection(asio::ip::tcp::endpoint& ep);
@@ -135,14 +146,15 @@ public:
     connections(const char* pipeName);
     ~connections();
     connection* connect(const std::string& host, const char* port, handshake f,
-                        void* data, bool newConnection = false);
+                        void* data, bool newConnection, bool clearNRCache);
     bool reconnect(connection* c, const std::string& host, const char* port,
                         handshake f, void* data);
 
-    connection* getConnection(const std::string& host, const char* port);
     bool disconnect(connection* c);
     int connectionCount();
     const boost::system::error_code& connectError() const { return m_e; };
+    void registHaNameResolver(HANAME_RESOLVER_PTR func);
+    HANAME_RESOLVER_PTR haNameResolver() const {return m_haNameResolver;}
     static char m_port[PORTNUMBUF_SIZE];
     static int connectTimeout;
     static int netTimeout;
@@ -151,6 +163,7 @@ public:
 /** Implementation of Part of the connection interface
  */
 #define VER_ST_SIZE 12
+
 class connectionBase : public connection
 {
 protected:
@@ -162,6 +175,7 @@ protected:
     size_t m_readLen;
     int m_refCount;
     int m_charsetServer;
+    unsigned int m_options;
     char m_vers[VER_ST_SIZE];
     bool m_connected;
     bool m_isHandShakable;
@@ -203,6 +217,9 @@ public:
     const boost::system::error_code& error() const { return m_e; };
 
     void* versions() {return (void*)m_vers;};
+    unsigned int userOptions() const {return m_options;}
+    void setUserOptions(unsigned int v) { m_options = v;}
+
 };
 
 
@@ -493,10 +510,10 @@ class tcpConnection : public connectionImple<asio::ip::tcp::socket>
 
     void on_connect(const boost::system::error_code& e)
     {
+        m_e = e;
 #ifdef USE_CONNECT_TIMER
         m_timer.cancel();
 #endif
-        m_e = e;
         if (!checkError(e))
             return ;
         s_io.on_connected(); 

data/source/bzs/netsvc/server/IAppModule.h

@@ -46,6 +46,7 @@ class iconnection;
 #define EXECUTE_RESULT_FORCSE_ASYNC 2
 #define EXECUTE_RESULT_FORCSE_SYNC 3
 #define EXECUTE_RESULT_ACCESS_DNIED 4
+#define EXECUTE_RESULT_SEND_QUIT 5
 typedef std::vector<boost::asio::const_buffer> buffers;
 typedef std::vector<char> vector_buffer;
 

data/source/bzs/netsvc/server/serverCpt.cpp

@@ -88,7 +88,7 @@ class connection : public iconnection, private boost::noncopyable
                 int ret = m_module->execute(buf, size, &m_optionalBuffes);
                 if (ret == EXECUTE_RESULT_QUIT)
                     return;
-                else if(ret == EXECUTE_RESULT_ACCESS_DNIED)
+                else if(ret == EXECUTE_RESULT_ACCESS_DNIED || ret == EXECUTE_RESULT_SEND_QUIT)
                 {
                     boost::asio::write(m_socket,  buffer(&m_result[0], size),
                            boost::asio::transfer_all());

data/source/bzs/netsvc/server/serverPipe.cpp

@@ -355,6 +355,8 @@ class connection : public iconnection, private boost::noncopyable
 
                 sentResult = m_comm->send();
                 m_module->cleanup();
+                if(/*ret == EXECUTE_RESULT_ACCESS_DNIED || */ret == EXECUTE_RESULT_SEND_QUIT)
+                    return;
             }
         }
     }