transactd 2.1.0 → 2.2.0

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

@@ -54,6 +54,9 @@ unsigned int g_pipeCommSharememSize = 3145728;
 int g_tableNmaeLower = 1; // defined in btrvProtocol.h
 unsigned int g_lock_wait_timeout = 1;
 char* g_transaction_isolation = NULL;
+char* g_auth_type = NULL;
+//int g_grant_apply = 0;//skip
+
 
 /** tcp server
  */
@@ -210,6 +213,7 @@ void shutdownSrv(boost::shared_ptr<iserver>& srv)
  */
 static int transactd_plugin_deinit(void* p)
 {
+	
 #ifdef PIPE_SERVER
     shutdownSrv(srv_p);
 #endif
@@ -245,7 +249,12 @@ static MYSQL_SYSVAR_UINT(lock_wait_timeout, g_lock_wait_timeout,
 static MYSQL_SYSVAR_STR(transaction_isolation, g_transaction_isolation,
                         PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC, NULL, NULL,
                         NULL, "READ-COMMITTED");
-
+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_INT(grant_apply, g_grant_apply,
+                        PLUGIN_VAR_READONLY, "0..1 0:none 1:all", 0, 0, 0, 0, 1, 0);
+*/
 #ifdef PIPE_SERVER
 static MYSQL_SYSVAR_UINT(pipe_comm_sharemem_size, g_pipeCommSharememSize,
                          PLUGIN_VAR_READONLY, "66000..52428800", 0, 0, 3145728,
@@ -266,18 +275,26 @@ static MYSQL_SYSVAR_INT(use_handlersocket, g_use_hs, PLUGIN_VAR_READONLY, "", 0,
 
 /** system valiables struct.
  */
-static struct st_mysql_sys_var* g_systemVariables[] = {
-    MYSQL_SYSVAR(address),                 MYSQL_SYSVAR(port),
-    MYSQL_SYSVAR(max_tcp_connections),     MYSQL_SYSVAR(hostcheck_username),
-    MYSQL_SYSVAR(table_name_lowercase),    MYSQL_SYSVAR(pool_threads),
-    MYSQL_SYSVAR(tcp_server_type),         MYSQL_SYSVAR(lock_wait_timeout),
+static struct st_mysql_sys_var* g_systemVariables[] = 
+{
+    MYSQL_SYSVAR(address),                 
+    MYSQL_SYSVAR(port),
+    MYSQL_SYSVAR(max_tcp_connections),     
+    MYSQL_SYSVAR(hostcheck_username),
+    MYSQL_SYSVAR(table_name_lowercase),    
+    MYSQL_SYSVAR(pool_threads),
+    MYSQL_SYSVAR(tcp_server_type),         
+    MYSQL_SYSVAR(lock_wait_timeout),
     MYSQL_SYSVAR(transaction_isolation),
+    MYSQL_SYSVAR(auth_type),
 #ifdef PIPE_SERVER
-    MYSQL_SYSVAR(pipe_comm_sharemem_size), MYSQL_SYSVAR(max_pipe_connections),
+    MYSQL_SYSVAR(pipe_comm_sharemem_size), 
+    MYSQL_SYSVAR(max_pipe_connections),
     MYSQL_SYSVAR(use_piped_local),
 #endif
 #ifdef USE_HANDLERSOCKET
-    MYSQL_SYSVAR(use_handlersocket),       MYSQL_SYSVAR(hs_port),
+    MYSQL_SYSVAR(use_handlersocket),       
+    MYSQL_SYSVAR(hs_port),
 #endif
     0
 };
@@ -302,12 +319,18 @@ static st_mysql_show_var g_showVariables[] = {
  */
 mysql_declare_plugin(transactd)
 {
-    MYSQL_DAEMON_PLUGIN, &transactd_info,
-        "transactd", // this is plugin name for mysql.
-        "Hisashi Yaguchi at BizStation Corp",
-        "Transactional access demon for mysql", PLUGIN_LICENSE_GPL,
-        transactd_plugin_init, transactd_plugin_deinit, 0x0100, g_showVariables,
-        g_systemVariables, NULL
+    MYSQL_DAEMON_PLUGIN, 
+    &transactd_info,
+    "transactd", // this is plugin name for mysql.
+    "Hisashi Yaguchi at BizStation Corp",
+    "Transactional access demon for mysql",
+    PLUGIN_LICENSE_GPL,
+    transactd_plugin_init,
+    transactd_plugin_deinit, 
+    0x0100, 
+    g_showVariables,
+    g_systemVariables,
+    NULL
 }
 
 mysql_declare_plugin_end;

data/source/bzs/env/crosscompile.h

@@ -94,8 +94,7 @@ char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count);
 #define PSEPARATOR_C '/'
 typedef int HWND;
 #define MAX_PATH 266
-#define MCRTOMM 1000 // for usleep(��sec) to Sleep(msec)
-#define Sleep usleep
+#define Sleep(A) usleep(A*1000)
 #define LoadLibrary(A) dlopen(A, RTLD_LAZY)
 #define LoadLibraryA(A) dlopen(A, RTLD_LAZY)
 #define GetProcAddress(A, B) dlsym(A, B)
@@ -148,7 +147,6 @@ typedef unsigned __int32 char32_t; // 32bit
 #define strlen16 wcslen
 
 /* operating system */
-#define MCRTOMM 1
 #define PSEPARATOR _T("\\")
 #define PSEPARATOR_A "\\"
 #define PSEPARATOR_C '\\'

data/source/bzs/example/queryData.cpp

@@ -376,7 +376,7 @@ int prebuiltData(database_ptr db, const connectParams& param, bool foceCreate,
             else
                 return 0;
         }
-        std::tcout << _T("\nInserting query test data. Please wait ... ")
+        std::tcout << _T("\nInserting query test data. Please wait... ")
                    << std::flush;
         createDatabase(db, param);
         openDatabase(db, param);
@@ -394,7 +394,7 @@ int prebuiltData(database_ptr db, const connectParams& param, bool foceCreate,
     }
     catch (bzs::rtl::exception& e)
     {
-        std::tcout << *bzs::rtl::getMsg(e) << std::endl;
+        std::tcout << _T("\n") << *bzs::rtl::getMsg(e) << std::endl;
         return 1;
     }
 }

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

@@ -81,7 +81,6 @@ public:
     virtual int refCount() const = 0;
     virtual bool isConnected() const = 0;
     virtual const boost::asio::ip::tcp::endpoint& endpoint() const = 0;
-    virtual thread_id tid() const = 0;
     virtual char* sendBuffer(size_t size) = 0;
     virtual unsigned int sendBufferSize() = 0;
     virtual buffers* optionalBuffers() = 0;
@@ -95,6 +94,9 @@ public:
     virtual bool queryFunction(unsigned int v) = 0;
     virtual int charsetServer() const = 0;
     virtual void setCharsetServer(int v) = 0;
+    virtual void write(unsigned int writeSize) = 0;
+    virtual char* read() = 0;
+    virtual bool isHandShakable() const = 0;
 };
 
 #define CONNECTION_FUNCTION_DIRECT_READ 1

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

@@ -65,7 +65,7 @@ connections::connections(const char* pipeName) : m_pipeName(pipeName)
         strcpy_s(port, PORTNUMBUF_SIZE, tmp);
         GetPrivateProfileString("transctd_client", "timeout", "3000", tmp, 30,
                                 buf);
-        timeout = atol(tmp);
+        timeout = (short)atol(tmp);
     }
 #else // NOT _WIN32
 #if (BOOST_VERSION > 104900)
@@ -76,7 +76,6 @@ connections::connections(const char* pipeName) : m_pipeName(pipeName)
     const bool result = fs::exists(path, error);
     if (result && !error)
     {
-
         boost::property_tree::ptree pt;
         try
         {
@@ -116,10 +115,9 @@ connections::~connections()
  */
 connection* connections::getConnection(asio::ip::tcp::endpoint& ep)
 {
-    thread_id tid = threadid();
     for (int i = 0; i < (int)m_conns.size(); i++)
     {
-        if ((m_conns[i]->endpoint() == ep) && (m_conns[i]->tid() == tid))
+        if (m_conns[i]->endpoint() == ep)
             return m_conns[i];
     }
     return NULL;
@@ -155,13 +153,10 @@ connection* connections::getConnection(const std::string& host)
 
 connection* connections::getConnectionPipe()
 {
-
-    thread_id tid = threadid();
     for (int i = 0; i < (int)m_conns.size(); i++)
     {
         pipeConnection* pc = dynamic_cast<pipeConnection*>(m_conns[i]);
-        if (pc && (pc->tid() == tid))
-            return pc;
+        return pc;
     }
     return NULL;
 }
@@ -206,37 +201,89 @@ bool connections::isUseNamedPipe(asio::ip::tcp::endpoint& ep)
     return false;
 }
 
+inline connection* connections::createConnection(asio::ip::tcp::endpoint& ep,
+                                     bool namedPipe)
+{
+#ifdef USE_PIPE_CLIENT
+    if (namedPipe)
+        return new pipeConnection(ep, m_pipeName);
+    else
+#endif
+        return new tcpConnection(ep);
+}
+
+inline connection* connections::doConnect(connection* c)
+{
+    try
+    {
+        c->connect();
+        return c;
+    }
+    catch (bzs::netsvc::client::exception& /*e*/)
+    {
+        delete c;
+        throw;
+    }
+    catch (boost::system::system_error& /*e*/)
+    {
+        delete c;
+        throw;
+    }
+}
+
+inline bool connections::doHandShake(connection* c, handshake f, void* data)
+{
+    bool ret = true;
+    try
+    {
+        // 1.0 - 2.1 namepd pipe is not HandShakable.
+        if (c->isHandShakable())
+        {
+            if (!f)
+                c->read();
+            else 
+                ret = f(c, data);
+            if (!ret)
+                delete c;
+        }
+        return ret;
+    }
+    catch (bzs::netsvc::client::exception& /*e*/)
+    {
+        delete c;
+        throw;
+    }
+    catch (boost::system::system_error& /*e*/)
+    {
+        delete c;
+        throw;
+    }
+}
+
 // The connection of found from connection list of same address is returned.
-connection* connections::connect(const std::string& host, bool newConnection)
+connection* connections::connect(const std::string& host, handshake f, void* data, bool newConnection)
 {
-    mutex::scoped_lock lck(m_mutex);
-    connection* c;
+    bool namedPipe = false;
     boost::system::error_code ec;
+    connection* c;
+    mutex::scoped_lock lck(m_mutex);
     asio::ip::tcp::endpoint ep = endpoint(host, ec);
     if (ec)
         return NULL;
 #ifdef USE_PIPE_CLIENT
-    if (m_usePipedLocal && isUseNamedPipe(ep))
-    {
+    namedPipe =  (m_usePipedLocal && isUseNamedPipe(ep));
+    if (namedPipe)
         c = newConnection ? NULL : getConnectionPipe();
-        if (!c)
-        {
-            c = new pipeConnection(ep, m_pipeName);
-            c->connect();
-            m_conns.push_back(c);
-        }
-    }
     else
 #endif
-    {
-
         c = newConnection ? NULL : getConnection(ep);
-        if (!c)
-        {
-            c = new tcpConnection(ep);
-            c->connect();
-            m_conns.push_back(c);
-        }
+    if (newConnection || !c)
+    {
+        c = createConnection(ep, namedPipe); 
+        c = doConnect(c);
+        if (!c || !doHandShake(c, f, data))
+            return NULL;
+        m_conns.push_back(c);
     }
     c->addref();
     return c;

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

@@ -26,7 +26,10 @@
 #include <boost/thread/mutex.hpp>
 #include <stdio.h>
 #include <vector>
-
+#ifdef LINUX
+#include <pthread.h> 
+#include <signal.h> 
+#endif
 
 
 using namespace boost;
@@ -39,8 +42,7 @@ using namespace boost::system;
 #define CLIENT_ERROR_CANT_CREATEPIPE 3106
 #define CLIENT_ERROR_SHAREMEM_DENIED 3104
 #define CLIENT_ERROR_CONNECTION_FAILURE 3106
-#define TIMEOUT_MILLISEC 3000
-
+#define MAX_DATA_SIZE 10485760 // 10MB
 
 namespace bzs
 {
@@ -49,38 +51,35 @@ namespace netsvc
 namespace client
 {
 
+typedef bool (*handshake)(connection* c, void* data);
 class connections
 {
     std::vector<connection*> m_conns;
     boost::asio::io_service m_ios;
-
     mutex m_mutex;
+    std::string m_pipeName;
+    static bool m_usePipedLocal;
 
     connection* getConnection(asio::ip::tcp::endpoint& ep);
     asio::ip::tcp::endpoint endpoint(const std::string& host,
                                      boost::system::error_code& ec);
-
     bool isUseNamedPipe(asio::ip::tcp::endpoint& ep);
-
-    static bool m_usePipedLocal;
-
-    std::string m_pipeName;
 #ifdef USE_PIPE_CLIENT
     connection* getConnectionPipe();
 #endif
-
+    inline connection* doConnect(connection* c);
+    inline connection* createConnection(asio::ip::tcp::endpoint& ep, bool namedPipe);
+    inline bool doHandShake(connection* c, handshake f, void* data);
 public:
     connections(const char* pipeName);
     ~connections();
-    connection* connect(const std::string& host, bool newConnection = false);
+    connection* connect(const std::string& host, handshake f,
+                        void* data, bool newConnection = false);
     connection* getConnection(const std::string& host);
-
     bool disconnect(connection* c);
-
+    int connectionCount();
     static char port[PORTNUMBUF_SIZE];
     static short timeout;
-
-    int connectionCount();
 };
 
 /** Implementation of Part of the connection interface
@@ -97,10 +96,9 @@ protected:
     idirectReadHandler* m_reader;
     size_t m_readLen;
     int m_refCount;
-    thread_id m_tid;
     int m_charsetServer;
     bool m_connected;
-
+    bool m_isHandShakable;
 
     void addref() { ++m_refCount; }
 
@@ -112,16 +110,14 @@ protected:
 
     const asio::ip::tcp::endpoint& endpoint() const { return m_ep; }
 
-    thread_id tid() const { return m_tid; };
-
     int charsetServer() const { return m_charsetServer; };
 
     void setCharsetServer(int v) { m_charsetServer = v; }
 
 public:
     connectionBase(asio::ip::tcp::endpoint& ep)
-        : m_ep(ep), m_reader(NULL), m_refCount(0), m_tid(threadid()), 
-          m_charsetServer(-1), m_connected(false)
+        : m_ep(ep), m_reader(NULL), m_refCount(0),
+          m_charsetServer(-1), m_connected(false), m_isHandShakable(true)
     {
     }
 
@@ -132,7 +128,7 @@ public:
         if (size > m_sendbuf.size())
             m_sendbuf.resize(size);
         return &m_sendbuf[0];
-    };
+    }
 
     unsigned int sendBufferSize() { return (unsigned int)m_sendbuf.size(); };
 
@@ -141,12 +137,17 @@ public:
         if (m_readbuf.size() < size)
             m_readbuf.resize(size);
     }
+
+    bool isHandShakable() const {return m_isHandShakable;};
 };
 
 /** Implementation of the connection template
  */
 template <class T> class connectionImple : public connectionBase
 {
+#ifdef LINUX
+    sigset_t m_signmask, m_sigomask;
+#endif
 protected:
     //unsigned int m_datalen;
     //unsigned short m_rows;
@@ -210,11 +211,25 @@ protected:
         return &m_readbuf[0];
     }
 
-    void read()
+    template <typename CompletionCondition, typename MutableBufferSequence>
+    size_t doRead(const MutableBufferSequence& buf, CompletionCondition cnd)
+    {
+        boost::system::error_code e;
+#ifdef LINUX
+        pthread_sigmask(SIG_SETMASK, &m_signmask , &m_sigomask); 
+#endif
+        size_t n = boost::asio::read(m_socket, buf, cnd, e);
+#ifdef LINUX
+        pthread_sigmask(SIG_SETMASK, &m_sigomask, NULL); 
+#endif
+        if (e) throw e;
+        return n;    
+    }
+
+    char* read()
     {
         if (!m_connected)
             throw system_error(asio::error::not_connected);
-        boost::system::error_code e;
         m_readLen = 0;
         //m_datalen = 0;
         //m_rows = 0;
@@ -230,26 +245,23 @@ protected:
         }*/
         if (m_reader)
         {
-            m_readLen = boost::asio::read(m_socket, boost::asio::buffer(&n, 4),
-                                       boost::asio::transfer_all());
+            m_readLen = doRead(boost::asio::buffer(&n, 4), boost::asio::transfer_all());
+            
             m_readLen += m_reader->onRead(n - 4, this);
         }else
         {
-            m_readLen = boost::asio::read(m_socket, 
-                                       boost::asio::buffer(&m_readbuf[0],m_readbuf.size()),
-                                       boost::asio::transfer_at_least(4));
+            m_readLen = doRead(boost::asio::buffer(&m_readbuf[0],m_readbuf.size()),
+                    boost::asio::transfer_at_least(4));
             n = *((unsigned int*)(&m_readbuf[0]));
         }
-        if (m_readLen < n)
+        if ((n > m_readLen) && (n < MAX_DATA_SIZE))
         {
             if (n > m_readbuf.size())
                 m_readbuf.resize(n);
-        
-            m_readLen += boost::asio::read(
-                m_socket,
-                boost::asio::buffer(&m_readbuf[m_readLen], n - m_readLen),
-                boost::asio::transfer_all());
+            m_readLen += doRead(boost::asio::buffer(&m_readbuf[m_readLen], n - m_readLen),
+                    boost::asio::transfer_all());
         }
+        return &m_readbuf[0];
     }
 
     void write(unsigned int writeSize)
@@ -273,11 +285,13 @@ public:
     connectionImple(asio::ip::tcp::endpoint& ep)
         : connectionBase(ep)/*, m_datalen(0)*/, m_socket(m_ios)
     {
+#ifdef LINUX
+        sigfillset(&m_signmask);
+#endif
     }
 
     ~connectionImple()
     {
-        
         try
         {
             m_ios.stop();
@@ -291,8 +305,7 @@ public:
     char* asyncWriteRead(unsigned int writeSize)
     {
         write(writeSize);
-        read();
-        return &m_readbuf[0];
+        return read();
     }
 
     buffers* optionalBuffers() { return &m_optionalBuffes; }
@@ -336,8 +349,6 @@ public:
         setupTimeouts();
         m_socket.connect(m_ep);
         m_socket.set_option(boost::asio::ip::tcp::no_delay(true));
-        char tmp[20];
-        m_socket.read_some(boost::asio::buffer(tmp, 10));
         m_connected = true;
     }
 };
@@ -453,6 +464,28 @@ class pipeConnection : public connectionImple<platform_stream>
             throwException("OpenEvent Server", CLIENT_ERROR_SHAREMEM_DENIED);
     }
 
+    void write(unsigned int writeSize)
+    {
+        //m_datalen = 0;
+        //m_rows = 0;
+        BOOL ret = SetEvent(m_sendEvent);
+        if (ret == FALSE)
+            throwException("SetEvent", CLIENT_ERROR_CONNECTION_FAILURE);        
+    }
+
+    char* read()
+    {
+        while (WAIT_TIMEOUT == WaitForSingleObject(m_recvEvent, connections::timeout))
+        {
+            DWORD n = 0;
+            BOOL ret = GetNamedPipeHandleState(m_socket.native(), NULL, &n,
+                                           NULL, NULL, NULL, 0);
+            if(ret == FALSE || n == 0)
+                throwException("PipeConnection", CLIENT_ERROR_CONNECTION_FAILURE);
+        }
+        return m_readbuf_p;
+    }
+
 public:
     pipeConnection(asio::ip::tcp::endpoint& ep, const std::string& pipeName)
         : connectionImple<platform_stream>(ep), m_pipeName(pipeName),
@@ -464,11 +497,22 @@ public:
 
     ~pipeConnection()
     {
-        memset(m_writebuf_p, 0, sizeof(unsigned int));
-
-        SetEvent(m_sendEvent);
-        WaitForSingleObject(m_recvEvent, INFINITE);
-
+        if (m_connected)
+		{
+			if (m_writebuf_p)
+				memset(m_writebuf_p, 0, sizeof(unsigned int));
+			DWORD n = 0;
+			BOOL ret = GetNamedPipeHandleState(m_socket.native(), NULL, &n,
+                                            NULL, NULL, NULL, 0);
+            if(m_sendEvent && ret && n)
+            {
+				SetEvent(m_sendEvent);
+                //Wait for server side close connection
+                while (WAIT_TIMEOUT == 
+                    WaitForSingleObject(m_recvEvent, connections::timeout))
+                    ;
+            }
+		}
         if (m_recvEvent)
             CloseHandle(m_recvEvent);
         if (m_sendEvent)
@@ -504,35 +548,23 @@ public:
         m_socket.assign(fd);
         m_connected = true;
 
-        // send processId;
-
+        // send processId and clientid;
         DWORD processId = GetCurrentProcessId();
         int size = 16;
-        connectionBase::m_readbuf.resize(size);
+        connectionBase::m_readbuf.resize(256);
         char* p = &connectionBase::m_readbuf[0];
         memcpy(p, &size, sizeof(int));
         memcpy(p + 4, &processId, sizeof(DWORD));
         __int64 clientid = (__int64) this;
         memcpy(p + 8, &clientid, sizeof(__int64));
         boost::asio::write(m_socket, boost::asio::buffer(p, size));
+
         boost::asio::read(m_socket, boost::asio::buffer(p, 7));
-        unsigned int* shareMemSize = (unsigned int*)(p + 3);
+        unsigned int* shareMemSize = (unsigned int*)(p+3);
+        m_isHandShakable = (p[0] == 0x00);
         createKernelObjects(*shareMemSize);
     }
 
-    char* asyncWriteRead(unsigned int writeSize)
-    {
-        //m_datalen = 0;
-        //m_rows = 0;
-        BOOL ret = SetEvent(m_sendEvent);
-        if (ret == FALSE)
-            throwException("SetEvent", CLIENT_ERROR_CONNECTION_FAILURE);
-        DWORD r = WaitForSingleObject(m_recvEvent, connections::timeout);
-        if (r == WAIT_TIMEOUT)
-            throwException("SetEvent", CLIENT_ERROR_CONNECTION_FAILURE);
-        return m_readbuf_p;
-    }
-
     char* sendBuffer(size_t size) { return m_writebuf_p; }
 
     unsigned int sendBufferSize() { return m_sendBufferSize; }

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

@@ -45,7 +45,7 @@ class iconnection;
 #define EXECUTE_RESULT_QUIT 1
 #define EXECUTE_RESULT_FORCSE_ASYNC 2
 #define EXECUTE_RESULT_FORCSE_SYNC 3
-
+#define EXECUTE_RESULT_ACCESS_DNIED 4
 typedef std::vector<boost::asio::const_buffer> buffers;
 typedef std::vector<char> vector_buffer;
 
@@ -80,7 +80,7 @@ public:
     virtual size_t onAccept(char* message, size_t bufsize) = 0;
     virtual void reset() = 0;
     virtual bool isShutDown() = 0;
-    virtual bool checkHost(const char* hostCheckname) = 0;
+    virtual bool checkHost(const char* hostCheckname, /*out*/char* hostName, int size) = 0;
     virtual void cleanup() = 0;
     virtual boost::mutex& mutex() const = 0;
 };