transactd 2.0.1 → 2.1.0

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

@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
-
+#include <my_config.h>
 #include <bzs/netsvc/server/IAppModule.h>
 #include <bzs/db/protocol/ICommandExecuter.h>
 

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

@@ -98,6 +98,7 @@ void connManager::getDatabaseList(const module* mod) const
 const connManager::records& connManager::getRecords(unsigned __int64 conid,
                                                     int dbid) const
 {
+    //Lock module count
     boost::mutex::scoped_lock lck(modulesMutex);
 
     if (conid == 0)
@@ -107,6 +108,7 @@ const connManager::records& connManager::getRecords(unsigned __int64 conid,
         const module* mod = getMod(conid);
         if (mod)
         {
+            //Lock module execute
             boost::try_mutex::scoped_try_lock m(mod->mutex(),
                                                 boost::try_to_lock_t());
             if (m.owns_lock())

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

@@ -16,6 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
+#include <my_config.h>
 #include <bzs/netsvc/server/serverCpt.h>
 #include <bzs/netsvc/server/serverTpool.h>
 #include <bzs/rtl/exception.h>

data/source/bzs/env/compiler.h

@@ -132,6 +132,16 @@
 #endif
 #endif
 
+//memory leak detector
+#ifdef _MSC_VER
+#ifdef _DEBUG
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#endif // _DEBUG
+#endif // _MSC_VER
+
+
 // compiler name
 #if (_MSC_VER == 1600)
 #define COMPILER_VERSTR "vc100"

data/source/bzs/env/mbcswchrLinux.cpp

@@ -19,17 +19,53 @@
 
 #include "mbcswchrLinux.h"
 #include <stdio.h>
+#include <pthread.h>
+#include <bzs/env/crosscompile.h>
+#include <assert.h>
+
+
+#define CVT_COUNT 6
 
 namespace bzs
 {
 namespace env
 {
-cvt mbcscvt("UTF-16LE", MBC_CHARSETNAME);
-cvt wchrcvt(MBC_CHARSETNAME, "UTF-16LE");
-cvt u8mbcvt(MBC_CHARSETNAME, UTF8_CHARSETNAME);
-cvt mbu8cvt(UTF8_CHARSETNAME, MBC_CHARSETNAME);
-cvt u8wccvt("UTF-16LE", UTF8_CHARSETNAME);
-cvt wcu8cvt(UTF8_CHARSETNAME, "UTF-16LE");
+
+tls_key g_tls1=0;
+
+void cleanupTls(void* p)
+{
+    delete [] ((cvt*)p);
+}
+
+void initCvtProcess()
+{
+    int ret = pthread_key_create(&g_tls1, cleanupTls);
+    assert(ret == 0);
+}
+
+void deinitCvtProcess()
+{
+    pthread_key_delete(g_tls1);
+}
+
+cvt& getCvt(int index)
+{
+    cvt* p = (cvt*)pthread_getspecific(g_tls1);
+    if (p == NULL)
+    {
+        p = new cvt[CVT_COUNT];
+        p[0].setCharset("UTF-16LE", MBC_CHARSETNAME);
+        p[1].setCharset(MBC_CHARSETNAME, "UTF-16LE");
+        p[2].setCharset(MBC_CHARSETNAME, UTF8_CHARSETNAME);
+        p[3].setCharset(UTF8_CHARSETNAME, MBC_CHARSETNAME);
+        p[4].setCharset("UTF-16LE", UTF8_CHARSETNAME);
+        p[5].setCharset(UTF8_CHARSETNAME, "UTF-16LE");
+        pthread_setspecific(g_tls1, p);
+    }
+    return p[index];
+}
+
 
 } // namespace env
 } // namespace bzs

data/source/bzs/env/mbcswchrLinux.h

@@ -32,12 +32,40 @@ namespace bzs
 {
 namespace env
 {
-extern cvt u8mbcvt; // utf8 to mbc
-extern cvt mbu8cvt; // mbc to utf8
-extern cvt mbcscvt; // mbc to utf16le
-extern cvt wchrcvt; // utf16le to mbc
-extern cvt u8wccvt; // utf8 to utf16le
-extern cvt wcu8cvt; // utf16le to utf8
+
+void initCvtProcess();
+void deinitCvtProcess();
+cvt& getCvt(int index);
+
+inline cvt& mbcscvt()
+{
+    return getCvt(0);
+}
+
+inline cvt& wchrcvt()
+{
+    return getCvt(1);
+}
+
+inline cvt& u8mbcvt()
+{
+    return getCvt(2);
+}
+
+inline cvt& mbu8cvt()
+{
+    return getCvt(3);
+}
+
+inline cvt& u8wccvt()
+{
+    return getCvt(4);
+}
+
+inline cvt& wcu8cvt()
+{
+    return getCvt(5);
+}
 
 inline int WideCharToMultiByte(unsigned int codepage, unsigned int dwFlags,
                                const char16_t* lpWideCharStr, int cchWideChar,
@@ -46,9 +74,9 @@ inline int WideCharToMultiByte(unsigned int codepage, unsigned int dwFlags,
                                int* lpUsedDefaultChar)
 {
     if (codepage == CP_UTF8)
-        return wcu8cvt.conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar),
+        return wcu8cvt().conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar),
                             lpMultiByteStr, (size_t)cchMultiByte);
-    return wchrcvt.conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar),
+    return wchrcvt().conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar),
                         lpMultiByteStr, (size_t)cchMultiByte);
 }
 
@@ -57,20 +85,20 @@ inline int MultiByteToWideChar(unsigned int codepage, unsigned int dwFlags,
                                char16_t* lpWideCharStr, int cchWideChar)
 {
     if (codepage == CP_UTF8)
-        return u8wccvt.conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr,
+        return u8wccvt().conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr,
                             (size_t)(cchWideChar + cchWideChar));
-    return mbcscvt.conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr,
+    return mbcscvt().conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr,
                         (size_t)(cchWideChar + cchWideChar));
 }
 
 inline int u8tombc(const char* u8, int u8size, char* mbc, int mbcsize)
 {
-    return u8mbcvt.conv(u8, (size_t)u8size, mbc, (size_t)mbcsize);
+    return u8mbcvt().conv(u8, (size_t)u8size, mbc, (size_t)mbcsize);
 }
 
 inline int mbctou8(const char* mbc, int mbcsize, char* u8, int u8size)
 {
-    return mbu8cvt.conv(mbc, (size_t)mbcsize, u8, (size_t)u8size);
+    return mbu8cvt().conv(mbc, (size_t)mbcsize, u8, (size_t)u8size);
 }
 
 } // namespace env

data/source/bzs/example/queryData.cpp

@@ -31,12 +31,12 @@ using namespace bzs::db::protocol::tdap;
 
 #define USER_STRING_TYPE ft_myvarchar
 #define GROUP_STRING_TYPE ft_myvarbinary
-
+#define BLOB_TYPE ft_myblob
 #else
 
 #define USER_STRING_TYPE ft_zstring
 #define GROUP_STRING_TYPE ft_zstring
-
+#define BLOB_TYPE ft_blob
 #endif
 
 const _TCHAR* name_field_str(_TCHAR* buf)
@@ -206,9 +206,18 @@ bool createUserExtTable(dbdef* def)
     fd = def->insertField(tableid, filedIndex);
     fd->setName(_T("comment"));
     fd->type = USER_STRING_TYPE;
-
     fd->setLenByCharnum(60);
 
+    ++filedIndex;
+    fd = def->insertField(tableid, filedIndex);
+    fd->setName(_T("blob"));
+    fd->type = BLOB_TYPE;
+#ifndef USE_PSQL_DATABASE
+    fd->len = 10;
+#else
+    fd->len = 16000;
+#endif
+
     char keyNum = 0;
     keydef* kd = def->insertKey(tableid, keyNum);
     keySegment* seg1 = &kd->segments[0];
@@ -323,6 +332,8 @@ bool insertData(database_ptr db, int maxId)
         tbe->setFV((short)0, i);
         _stprintf_s(tmp, 256, _T("%d comment"), i);
         tbe->setFV(1, tmp);
+        _stprintf_s(tmp, 256, _T("%d blob"), i);
+        tbe->setFV(2, tmp);
         tbe->insert();
         if (tbe->stat() != 0)
             return showTableError(tbe, _T("extention insert"));
@@ -335,6 +346,24 @@ bool insertData(database_ptr db, int maxId)
     return true;
 }
 
+bool checkVersion(database_ptr db)
+{
+    dbdef* def = db->dbDef();
+    if (def)
+    {
+        tabledef* td = def->tableDefs(3);
+        if (td)
+        {
+            if (td->fieldCount == 3)
+            {
+                table_ptr tb = openTable(db, _T("extention"));
+                return (tb->recordCount(false) == 20000);
+            }
+        }
+    }
+    return false;
+}
+
 int prebuiltData(database_ptr db, const connectParams& param, bool foceCreate,
                  int maxId)
 {
@@ -342,7 +371,7 @@ int prebuiltData(database_ptr db, const connectParams& param, bool foceCreate,
     {
         if (db->open(param.uri(), TD_OPEN_NORMAL))
         {
-            if (foceCreate)
+            if (foceCreate || !checkVersion(db))
                 dropDatabase(db);
             else
                 return 0;

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

@@ -0,0 +1,107 @@
+#ifndef BZS_NETSVC_CLINET_ICONNECTION_H
+#define BZS_NETSVC_CLINET_ICONNECTION_H
+/* =================================================================
+ Copyright (C) 2014 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.
+ ================================================================= */
+#ifdef __BCPLUSPLUS__
+#pragma warn -8012
+#endif
+
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/buffer.hpp>
+#include <vector>
+
+#ifdef __BCPLUSPLUS__
+#pragma warn +8012
+#endif
+
+#ifdef _WIN32
+#define USE_PIPE_CLIENT
+#endif
+
+#ifdef USE_PIPE_CLIENT
+#include <boost/asio/windows/stream_handle.hpp>
+using boost::asio::windows::stream_handle;
+typedef stream_handle platform_stream;
+typedef HANDLE platform_descriptor;
+#define PIPE_EOF_ERROR_CODE boost::system::windows_error::broken_pipe
+typedef DWORD thread_id;
+#define threadid GetCurrentThreadId
+#else // NOT USE_PIPE_CLIENT
+typedef pthread_t thread_id;
+#define threadid pthread_self
+#endif // NOT USE_PIPE_CLIENT
+
+namespace bzs
+{
+namespace netsvc
+{
+namespace client
+{
+
+typedef std::vector<boost::asio::const_buffer> buffers;
+
+class connection;
+
+class idirectReadHandler
+{
+
+public:
+    /* Call by connection at first 4byte readed. 
+       size : The rest of the data size.  = TotalSize - 4  
+    */
+    virtual unsigned int onRead(unsigned int size, connection* c) = 0;
+};
+
+/** The connection interface
+ *
+ */
+class connection
+{
+public:
+    virtual ~connection(){};
+    virtual void connect() = 0;
+    virtual void addref() = 0;
+    virtual void release() = 0;
+    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;
+    virtual char* asyncWriteRead(unsigned int writeSize) = 0;
+    //virtual unsigned int datalen() const = 0; // additinal info at segment read
+    //virtual unsigned short rows() const = 0; // additinal info at segment read
+    virtual void setReadBufferSizeIf(size_t size) = 0;
+    virtual void setDirectReadHandler(idirectReadHandler* p) = 0;
+    virtual unsigned int directRead(void* buf, unsigned int size) = 0;
+    virtual void* directReadRemain(unsigned int size) = 0;
+    virtual bool queryFunction(unsigned int v) = 0;
+    virtual int charsetServer() const = 0;
+    virtual void setCharsetServer(int v) = 0;
+};
+
+#define CONNECTION_FUNCTION_DIRECT_READ 1
+
+
+} // namespace client
+} // namespace netsvc
+} // namespace bzs
+
+#endif // BZS_NETSVC_CLINET_ICONNECTION_H

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

@@ -16,7 +16,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
  ================================================================= */
-
 #include "tcpClient.h"
 #include <bzs/env/crosscompile.h>
 #if (!defined(_WIN32))
@@ -26,6 +25,7 @@
 #include <boost/property_tree/ini_parser.hpp>
 #endif
 #endif
+
 #pragma package(smart_init)
 
 using namespace boost;
@@ -41,6 +41,12 @@ namespace client
 
 char connections::port[PORTNUMBUF_SIZE] = { "8610" };
 bool connections::m_usePipedLocal = true;
+#ifdef _WIN32
+short connections::timeout = 3000;
+#else
+short connections::timeout = 3;
+#endif
+
 
 connections::connections(const char* pipeName) : m_pipeName(pipeName)
 {
@@ -57,6 +63,9 @@ connections::connections(const char* pipeName) : m_pipeName(pipeName)
         GetPrivateProfileString("transctd_client", "port", "8610", tmp, 30,
                                 buf);
         strcpy_s(port, PORTNUMBUF_SIZE, tmp);
+        GetPrivateProfileString("transctd_client", "timeout", "3000", tmp, 30,
+                                buf);
+        timeout = atol(tmp);
     }
 #else // NOT _WIN32
 #if (BOOST_VERSION > 104900)
@@ -77,6 +86,11 @@ connections::connections(const char* pipeName) : m_pipeName(pipeName)
             if (p == "")
                 p = "8610";
             strcpy_s(port, PORTNUMBUF_SIZE, p.c_str());
+
+            p = pt.get<std::string>("transctd_client.timeout");
+            timeout = atol(p.c_str())/1000;
+            if (timeout == 0)
+                timeout = 3;
         }
         catch (...)
         {

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

@@ -19,45 +19,18 @@
  02111-1307, USA.
  ================================================================= */
 
-#ifdef __BCPLUSPLUS__
-#pragma warn -8012
-#endif
-#include <boost/asio/buffer.hpp>
-#include <boost/asio/windows/stream_handle.hpp>
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/windows/basic_handle.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/read.hpp>
+#include <bzs/netsvc/client/iconnection.h>
 #include <boost/asio/write.hpp>
-#include <boost/bind.hpp>
-#include <boost/asio/placeholders.hpp>
-
+#include <boost/asio/read.hpp>
 #include <boost/system/system_error.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdio.h>
-
-#ifdef __BCPLUSPLUS__
-#pragma warn +8012
-#endif
 #include <vector>
-using namespace boost;
-using namespace boost::system;
 
-#ifdef _WIN32
-#define USE_PIPE_CLIENT
-#endif
 
-#ifdef USE_PIPE_CLIENT
-using boost::asio::windows::stream_handle;
-typedef stream_handle platform_stream;
-typedef HANDLE platform_descriptor;
-#define PIPE_EOF_ERROR_CODE boost::system::windows_error::broken_pipe
-typedef DWORD thread_id;
-#define threadid GetCurrentThreadId
-#else // NOT USE_PIPE_CLIENT
-typedef pthread_t thread_id;
-#define threadid pthread_self
-#endif // NOT USE_PIPE_CLIENT
+
+using namespace boost;
+using namespace boost::system;
 
 #define READBUF_SIZE 66000
 #define WRITEBUF_SIZE 66000
@@ -65,6 +38,9 @@ typedef pthread_t thread_id;
 #define PORTNUMBUF_SIZE 10
 #define CLIENT_ERROR_CANT_CREATEPIPE 3106
 #define CLIENT_ERROR_SHAREMEM_DENIED 3104
+#define CLIENT_ERROR_CONNECTION_FAILURE 3106
+#define TIMEOUT_MILLISEC 3000
+
 
 namespace bzs
 {
@@ -73,10 +49,6 @@ namespace netsvc
 namespace client
 {
 
-typedef std::vector<boost::asio::const_buffer> buffers;
-
-class connection;
-
 class connections
 {
     std::vector<connection*> m_conns;
@@ -106,33 +78,11 @@ public:
     bool disconnect(connection* c);
 
     static char port[PORTNUMBUF_SIZE];
+    static short timeout;
 
     int connectionCount();
 };
 
-/** The connection interface
- *
- */
-class connection
-{
-public:
-    virtual ~connection(){};
-    virtual void connect() = 0;
-    virtual void addref() = 0;
-    virtual void release() = 0;
-    virtual int refCount() const = 0;
-    virtual bool isConnected() const = 0;
-    virtual const 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;
-    virtual char* asyncWriteRead(unsigned int writeSize) = 0;
-    virtual unsigned int datalen() const = 0; // additinal info at segment read
-    virtual unsigned short rows() const = 0; // additinal info at segment read
-    virtual void setReadBufferSizeIf(size_t size) = 0;
-};
-
 /** Implementation of Part of the connection interface
  */
 class connectionBase : public connection
@@ -142,16 +92,16 @@ protected:
 
     asio::io_service m_ios;
     asio::ip::tcp::endpoint m_ep;
-
-    int m_refCount;
-    thread_id m_tid;
-
     std::vector<char> m_readbuf;
     std::vector<char> m_sendbuf;
-
+    idirectReadHandler* m_reader;
     size_t m_readLen;
+    int m_refCount;
+    thread_id m_tid;
+    int m_charsetServer;
     bool m_connected;
 
+
     void addref() { ++m_refCount; }
 
     void release() { --m_refCount; }
@@ -164,12 +114,19 @@ protected:
 
     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_refCount(0), m_tid(threadid()), m_connected(false)
+        : m_ep(ep), m_reader(NULL), m_refCount(0), m_tid(threadid()), 
+          m_charsetServer(-1), m_connected(false)
     {
     }
 
+    void setDirectReadHandler(idirectReadHandler* p){ m_reader = p; }
+
     char* sendBuffer(size_t size)
     {
         if (size > m_sendbuf.size())
@@ -191,18 +148,18 @@ public:
 template <class T> class connectionImple : public connectionBase
 {
 protected:
-    unsigned int m_datalen;
-    unsigned short m_rows;
+    //unsigned int m_datalen;
+    //unsigned short m_rows;
     T m_socket;
     buffers m_optionalBuffes;
 
-    unsigned int datalen() const { return m_datalen; }
+    //unsigned int datalen() const { return m_datalen; }
 
-    unsigned short rows() const { return m_rows; }
+    //unsigned short rows() const { return m_rows; }
 
     // server send any segment of lower than 0xFFFF data by asyncWrite
     // last 4byte is 0xFFFFFFFF, that is specify end of data
-    void segmentRead()
+    /*void segmentRead()
     {
         bool end = false;
         unsigned short n;
@@ -226,6 +183,31 @@ protected:
                           boost::asio::transfer_all());
         boost::asio::read(m_socket, boost::asio::buffer(&m_rows, 2),
                           boost::asio::transfer_all());
+    }*/
+    bool queryFunction(unsigned int v)
+    {
+        if (v == CONNECTION_FUNCTION_DIRECT_READ)
+            return true;
+        return false;
+    }
+
+    unsigned int directRead(void* buf, unsigned int size)
+    {
+        return (unsigned int)boost::asio::read(m_socket, 
+                                                boost::asio::buffer(buf, size),
+                                                boost::asio::transfer_all());
+    }
+    
+    void* directReadRemain(unsigned int size)
+    {
+        if (size > m_readbuf.size())
+            m_readbuf.resize(size);
+        
+        m_readLen += boost::asio::read(
+            m_socket,
+            boost::asio::buffer(&m_readbuf[0], size),
+            boost::asio::transfer_all());
+        return &m_readbuf[0];
     }
 
     void read()
@@ -234,24 +216,40 @@ protected:
             throw system_error(asio::error::not_connected);
         boost::system::error_code e;
         m_readLen = 0;
-        m_datalen = 0;
-        m_rows = 0;
+        //m_datalen = 0;
+        //m_rows = 0;
         unsigned int n;
-        m_readLen += boost::asio::read(m_socket, boost::asio::buffer(&n, 4),
-                                       boost::asio::transfer_all());
-        if (n == 0xFFFFFFFF)
+
+        //m_readLen += boost::asio::read(m_socket, boost::asio::buffer(&n, 4),
+        //                               boost::asio::transfer_all());
+        /*if (n == 0xFFFFFFFF)
         {
             segmentRead();
             m_readLen += boost::asio::read(m_socket, boost::asio::buffer(&n, 4),
                                            boost::asio::transfer_all());
+        }*/
+        if (m_reader)
+        {
+            m_readLen = boost::asio::read(m_socket, 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));
+            n = *((unsigned int*)(&m_readbuf[0]));
         }
-        if (n > m_readbuf.size())
-            m_readbuf.resize(n);
-        if (m_readLen != n)
+        if (m_readLen < n)
+        {
+            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());
+        }
     }
 
     void write(unsigned int writeSize)
@@ -273,15 +271,16 @@ protected:
 
 public:
     connectionImple(asio::ip::tcp::endpoint& ep)
-        : connectionBase(ep), m_datalen(0), m_socket(m_ios)
+        : connectionBase(ep)/*, m_datalen(0)*/, m_socket(m_ios)
     {
     }
 
     ~connectionImple()
     {
-        m_ios.stop();
+        
         try
         {
+            m_ios.stop();
             m_socket.close();
         }
         catch (...)
@@ -299,7 +298,6 @@ public:
     buffers* optionalBuffers() { return &m_optionalBuffes; }
 };
 
-#define TIMEOUT_SEC 3
 
 /** Implementation of The TCP connection.
  */
@@ -317,7 +315,7 @@ public:
     void setupTimeouts()
     {
 #if defined _WIN32
-        int32_t timeout = TIMEOUT_SEC * 1000;
+        int32_t timeout = connections::timeout;
         setsockopt(m_socket.native(), SOL_SOCKET, SO_RCVTIMEO,
                    (const char*)&timeout, sizeof(timeout));
         setsockopt(m_socket.native(), SOL_SOCKET, SO_SNDTIMEO,
@@ -325,7 +323,7 @@ public:
 #else
         struct timeval timeout;
         timeout.tv_usec = 0;
-        timeout.tv_sec = TIMEOUT_SEC;
+        timeout.tv_sec = connections::timeout;
         setsockopt(m_socket.native(), SOL_SOCKET, SO_RCVTIMEO, &timeout,
                    sizeof(timeout));
         setsockopt(m_socket.native(), SOL_SOCKET, SO_SNDTIMEO, &timeout,
@@ -379,6 +377,13 @@ class pipeConnection : public connectionImple<platform_stream>
     HANDLE m_sendEvent;
     HANDLE m_mapFile;
 
+    bool queryFunction(unsigned int v)
+    {
+        if (v == CONNECTION_FUNCTION_DIRECT_READ)
+            return false;
+        return false;
+    }
+
     char* GetErrorMessage(DWORD ErrorCode)
     {
         LPVOID lpMsgBuf;
@@ -517,10 +522,14 @@ public:
 
     char* asyncWriteRead(unsigned int writeSize)
     {
-        m_datalen = 0;
-        m_rows = 0;
-        SetEvent(m_sendEvent);
-        WaitForSingleObject(m_recvEvent, INFINITE);
+        //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;
     }