transactd 2.4.5 → 3.0.0

data/source/bzs/env/compiler.h

@@ -20,201 +20,214 @@
 =================================================================*/
 // function type
 #if (__BCPLUSPLUS__)
-#if (defined(__APPLE__) || defined(__clang__))
-#define __THREAD __declspec(thread)
-#define __STDCALL
-#else
-#define __THREAD __thread
-#define __STDCALL __stdcall
-#endif
-#else
-#define __THREAD __declspec(thread)
-#if (_MSC_VER || __MINGW32__)
-#define __STDCALL __stdcall
-#else
-#define __STDCALL
-#endif
+#   if (defined(__APPLE__) || defined(__clang__))
+#       define __THREAD __declspec(thread)
+#       define __STDCALL
+#   else
+#       define __THREAD __thread
+#       define __STDCALL __stdcall
+#   endif
+#else
+#   define __THREAD __declspec(thread)
+#   if (_MSC_VER || __MINGW32__)
+#       define __STDCALL __stdcall
+#   else
+#       define __STDCALL
+#   endif
 #endif
 
 // operating system
 #ifdef _WIN32
-#ifdef _WIN64
-#ifndef __x86_64__
-#define __x86_64__
-#endif
-#else
-#define __x86_32__
-#endif
+#   ifdef _WIN64
+#       ifndef __x86_64__
+#           define __x86_64__
+#       endif
+#   else
+#       define __x86_32__
+#   endif
 #else
-#ifndef LINUX
-#define LINUX 1 // Support 64bit only
-#endif
+#   ifndef LINUX
+#       define LINUX 1 // Support 64bit only
+#   endif
 #endif
+
 #if (__BCPLUSPLUS__ && defined(__APPLE__))
-#define __APPLE_32__ 1
+#   define __APPLE_32__ 1
 #endif
+
 // thread strage
 #ifndef __THREAD_BCB
-#undef __THREAD
-#if (__BCPLUSPLUS__ && !defined(__clang__))
-#define __THREAD_BCB __thread
-#define __THREAD
-#else
-#define __THREAD_BCB
-#if (_MSC_VER || (__BORLANDC__ && __clang__))
-#define __THREAD __declspec(thread)
-#else
-#define __THREAD __thread
-#endif
-#endif
+#   undef __THREAD
+#   if (__BCPLUSPLUS__ && !defined(__clang__))
+#       define __THREAD_BCB __thread
+#       define __THREAD
+#   else
+#       define __THREAD_BCB
+#       if (_MSC_VER || (__BORLANDC__ && __clang__))
+#           define __THREAD __declspec(thread)
+#       else
+#           define __THREAD __thread
+#       endif
+#   endif
 #endif //__THREAD_BCB
 
 // BCB_64
 #if (__BCPLUSPLUS__ && defined(__clang__))
-#define BCB_64
+#   define BCB_64
 #endif
 
 // BCB32
 #if (__BCPLUSPLUS__ && defined(__x86_32__))
-#define BCB_32
+#   define BCB_32
 #endif
 
 // export
 #undef PACKAGE
 #ifdef __BCPLUSPLUS__
-#ifndef PACKAGE
-#ifdef __x86_64__
-#define PACKAGE __declspec(dllexport)
+#   ifndef PACKAGE
+#       ifdef __x86_64__
+#           define PACKAGE __declspec(dllexport)
+#       else
+#           define PACKAGE __declspec(package)
+#       endif
+#   endif
 #else
-#define PACKAGE __declspec(package)
-#endif
-#endif
-#else
-#if (_WIN32 && !defined(__MINGW32__))
-#define PACKAGE __declspec(dllexport)
-#else
-#define PACKAGE
-#endif
+#   if (_WIN32 && !defined(__MINGW32__))
+#       define PACKAGE __declspec(dllexport)
+#   else
+#       define PACKAGE
+#   endif
 #endif
 
 #ifdef PACKAGE_NO_EXPORT
-#undef PACKAGE
-#define PACKAGE
+#   undef PACKAGE
+#   define PACKAGE
 #endif
 
 #define AGRPACK PACKAGE
 
 // bcb_osx
 #if (__BCPLUSPLUS__ && defined(__APPLE__) && !defined(__clang__))
-#define PACKAGE_OSX PACKAGE
+#   define PACKAGE_OSX PACKAGE
 #else
-#define PACKAGE_OSX
+#   define PACKAGE_OSX
 #endif
 
 // import
 #if (defined(LINUX) || __MINGW32__)
-#define PACKAGE_IMPORT
+#   define PACKAGE_IMPORT
 #else
-#define PACKAGE_IMPORT __declspec(dllimport)
+#   define PACKAGE_IMPORT __declspec(dllimport)
+#endif
+
+
+//__int64 basic type
+#if (defined(LINUX))
+#   ifndef __int64
+#       define __int64 long long int
+#   endif
+#   ifndef NULL
+#       define NULL 0
+#   endif
 #endif
 
 // data alignment
 #if (_MSC_VER || (__BORLANDC__ && __clang__))
-#define pragma_pack1 __pragma(pack(push, 1))
-#define pragma_pop __pragma(pack(pop))
-#else
-#ifdef __BCPLUSPLUS__
-#define pragma_pack1
-#define pragma_pop
+#   define pragma_pack1 __pragma(pack(push, 1))
+#   define pragma_pop __pragma(pack(pop))
 #else
-#define pragma_pack1 _Pragma("pack(1)")
-#define pragma_pop _Pragma("pack()")
-#endif
+#   ifdef __BCPLUSPLUS__
+#       define pragma_pack1
+#       define pragma_pop
+#   else
+#       define pragma_pack1 _Pragma("pack(1)")
+#       define pragma_pop _Pragma("pack()")
+#   endif
 #endif
 
 //memory leak detector
 #ifdef _MSC_VER
-#ifdef _DEBUG
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-#endif // _DEBUG
+#   ifdef _DEBUG
+#       define _CRTDBG_MAP_ALLOC
+#       include <stdlib.h>
+#       include <crtdbg.h>
+#   endif // _DEBUG
 #endif // _MSC_VER
 
 
 // compiler name
 #if (_MSC_VER == 1400)
-#define COMPILER_VERSTR "vc80"
+#   define COMPILER_VERSTR "vc80"
 #endif
 
 #if (_MSC_VER == 1500)
-#define COMPILER_VERSTR "vc90"
+#   define COMPILER_VERSTR "vc90"
 #endif
 
 #if (_MSC_VER == 1600)
-#define COMPILER_VERSTR "vc100"
+#   define COMPILER_VERSTR "vc100"
 #endif
 
 #if (_MSC_VER == 1700)
-#define COMPILER_VERSTR "vc110"
+#   define COMPILER_VERSTR "vc110"
 #endif
 
 #if (_MSC_VER == 1800)
-#define COMPILER_VERSTR "vc120"
+#   define COMPILER_VERSTR "vc120"
 #endif
 
 #if (_MSC_VER == 1900)
-#define COMPILER_VERSTR "vc140"
+#   define COMPILER_VERSTR "vc140"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x630 && (__BCPLUSPLUS__ < 0x640))
-#define COMPILER_VERSTR "bc150"
+#   define COMPILER_VERSTR "bc150"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x640 && (__BCPLUSPLUS__ < 0x650))
-#define COMPILER_VERSTR "bc160"
+#   define COMPILER_VERSTR "bc160"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x650 && (__BCPLUSPLUS__ < 0x660))
-#define COMPILER_VERSTR "bc170"
+#   define COMPILER_VERSTR "bc170"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x660 && (__BCPLUSPLUS__ < 0x670))
-#define COMPILER_VERSTR "bc180"
+#   define COMPILER_VERSTR "bc180"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x670 && (__BCPLUSPLUS__ < 0x680))
-#define COMPILER_VERSTR "bc190"
+#   define COMPILER_VERSTR "bc190"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x680 && (__BCPLUSPLUS__ < 0x690))
-#define COMPILER_VERSTR "bc200"
+#   define COMPILER_VERSTR "bc200"
 #endif
 
 #if (__BCPLUSPLUS__ >= 0x690 && (__BCPLUSPLUS__ < 0x700))
-#define COMPILER_VERSTR "bc210"
+#   define COMPILER_VERSTR "bc210"
 #endif
 
 #if (__APPLE__)
-#define SHARED_LIB_EXTENTION ".dylib"
+#   define SHARED_LIB_EXTENTION ".dylib"
 #else
-#if (defined(LINUX) || (__BORLANDC__ && __clang__))
-#define SHARED_LIB_EXTENTION ".a"
-#else
-#define SHARED_LIB_EXTENTION ".lib"
-#endif
+#   if (defined(LINUX) || (__BORLANDC__ && __clang__))
+#       define SHARED_LIB_EXTENTION ".a"
+#   else
+#       define SHARED_LIB_EXTENTION ".lib"
+#   endif
 #endif
 
 #if (defined(LINUX) || (__BORLANDC__ && __clang__))
-#define LIB_EXTENTION ".a"
+#   define LIB_EXTENTION ".a"
 #else
-#define LIB_EXTENTION ".lib"
+#   define LIB_EXTENTION ".lib"
 #endif
 
 #ifdef LINUX
-#define LIB_PREFIX "lib"
+#   define LIB_PREFIX "lib"
 #else
-#define LIB_PREFIX
+#   define LIB_PREFIX
 #endif
 
 #endif // BZS_ENV_COMPILER_H

data/source/bzs/env/crosscompile.cpp

@@ -23,6 +23,7 @@
 #include <wctype.h>
 #include <wchar.h>
 
+
 char16_t* _strupr16(char16_t* s)
 {
     char16_t* p = s;
@@ -67,18 +68,6 @@ char* _strlwr(char* s)
     return p;
 }
 
-char* _i64toa_s(__int64 v, char* tmp, unsigned long size, int radix)
-{
-    snprintf(tmp, size, "%lld", v);
-    return tmp;
-}
-
-char* _ltoa_s(int v, char* tmp, unsigned long size, int radix)
-{
-    snprintf(tmp, size, "%d", v);
-    return tmp;
-}
-
 int wcsnicmp16(const char16_t* sl, const char16_t* sr, size_t n)
 {
     if (n == 0)
@@ -145,3 +134,26 @@ char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count)
 }
 
 #endif // LINUX
+
+#if (defined(_WIN32) && !defined(__MINGW32__))
+#include <windows.h>
+#include "crosscompile.h"
+
+static const __int64 EPOCH = ((__int64) 116444736000000000ULL);
+int gettimeofday(struct timeval * tp, struct timezone * tzp)
+{
+
+    SYSTEMTIME  system_time;
+    FILETIME    file_time;
+    __int64    time;
+
+    GetSystemTime( &system_time );
+    SystemTimeToFileTime( &system_time, &file_time );
+    time =  ((__int64)file_time.dwLowDateTime )      ;
+    time += ((__int64)file_time.dwHighDateTime) << 32;
+
+    tp->tv_sec  = (long) ((time - EPOCH) / 10000000L);
+    tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
+    return 0;
+}
+#endif //(defined(_WIN32) && !defined(__MINGW32__))

data/source/bzs/env/crosscompile.h

@@ -47,14 +47,20 @@ int gettimeofday(struct timeval*, struct timezone*);
 #include <ctype.h>
 #include <stddef.h>
 #include <linuxTypes.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
+#include <wctype.h>
+#include <wchar.h>
 /* c c++ runtime library */
-#define _strnicmp strncasecmp
+#ifndef __int64
 #define __int64 long long int
+#endif
+
+#define _strnicmp strncasecmp
 #define _atoi64 atoll
-#define _wtoi(W) wcstol(W, NULL, 10)
 #define _access access
 #define sprintf_s snprintf
-#define swprintf_s swprintf
 #define localtime_s localtime_r
 #define strncpy_s(A, B, C, D) strncpy(A, C, D)
 #define strcpy_s(A, B, C) strcpy(A, C)
@@ -71,8 +77,58 @@ int gettimeofday(struct timeval*, struct timezone*);
 
 char* _strupr(char* s);
 char* _strlwr(char* s);
-char* _ltoa_s(int v, char* tmp, unsigned long size, int radix);
-char* _i64toa_s(__int64 v, char* tmp, unsigned long size, int radix);
+
+
+inline char* _i64toa_s(__int64 v, char* tmp, unsigned long size, int radix)
+{
+    snprintf(tmp, size, "%lld", v);
+    return tmp;
+}
+
+inline char* _ui64toa_s(unsigned __int64 v, char* tmp, unsigned long size, int radix)
+{
+    snprintf(tmp, size, "%llu", v);
+    return tmp;
+}
+
+inline char* _ltoa_s(int v, char* tmp, unsigned long size, int radix)
+{
+    snprintf(tmp, size, "%d", v);
+    return tmp;
+}
+
+inline char* _ultoa_s(int v, char* tmp, unsigned long size, int radix)
+{
+    snprintf(tmp, size, "%u", v);
+    return tmp;
+}
+
+inline char* _ltoa(int v, char* tmp, int radix)
+{
+    sprintf(tmp, "%d", v);
+    return tmp;
+}
+
+inline char* _ultoa(int v, char* tmp, int radix)
+{
+    sprintf(tmp, "%u", v);
+    return tmp;
+}
+
+#if !defined(__BORLANDC__)
+inline char* _i64toa(__int64 v, char* tmp, int radix)
+{
+    sprintf(tmp, "%lld", v);
+    return tmp;
+}
+
+inline char* _ui64toa(unsigned __int64 v, char* tmp, int radix)
+{
+    sprintf(tmp, "%llu", v);
+    return tmp;
+}
+#endif
+
 char16_t* _strupr16(char16_t* s);
 char16_t* _strlwr16(char16_t* s);
 size_t strlen16(const char16_t* src);
@@ -127,14 +183,21 @@ typedef unsigned __int32 char32_t; // 32bit
 /* c c++ runtime library */
 #include <tchar.h>
 #if defined(__BORLANDC__) || defined(__MINGW32__)
+
 #define _ltow_s(A, B, C, D) _ltow(A, B, D)
 #define _ltoa_s(A, B, C, D) _ltoa(A, B, D)
 #define _ltot_s(A, B, C, D) _ltot(A, B, D)
 #define _ultot_s(A, B, C, D) _ultot(A, B, D)
 #define _i64tot_s(A, B, C, D) _i64tot(A, B, D)
-#define _i64tow_s(A, B, C, D) _i64tow(A, B, D)
 #define _i64toa_s(A, B, C, D) _i64toa(A, B, D)
+#define _i64tow_s(A, B, C, D) _i64tow(A, B, D)
+#define _ui64tot_s(A, B, C, D) _ui64tot(A, B, D)
+#define _ui64toa_s(A, B, C, D) _ui64toa(A, B, D)
+#define _ui64tow_s(A, B, C, D) _ui64tow(A, B, D)
 #define _strlwr_s(A, B) strlwr(A)
+#ifndef _tcslwr_s
+#define _tcslwr_s(A, B) _tcslwr(A)
+#endif
 #endif
 
 #if defined(__BORLANDC__)
@@ -157,6 +220,7 @@ typedef unsigned __int32 char32_t; // 32bit
 /* muliti byete char */
 typedef unsigned char mbchar;
 typedef unsigned char char_m;
+int gettimeofday(struct timeval * tp, struct timezone * tzp);
 
 #endif // defined(LINUX)
 
@@ -176,4 +240,9 @@ typedef unsigned char char_m;
 #define tls_setspecific(A, B) pthread_setspecific(A, B)
 #endif
 
+#if (defined(_MSC_VER) && (_MSC_VER < 1800))
+#define strtoull _strtoui64
+#define wcstoull _wcstoui64 
+#endif
+
 #endif // BZS_ENV_CROSSCOMPILE_H

data/source/bzs/env/mbcswchrLinux.cpp

@@ -40,8 +40,8 @@ void cleanupTls(void* p)
 
 void initCvtProcess()
 {
-    int ret = pthread_key_create(&g_tls1, cleanupTls);
-    assert(ret == 0);
+    pthread_key_create(&g_tls1, cleanupTls);
+    //assert(ret == 0);
     pthread_setspecific(g_tls1, NULL);
 }
 

data/source/bzs/env/tcharMinGW.h

@@ -23,10 +23,12 @@
 #ifdef _UNICODE
 
 #define _tcsncpy_s wcsncpy_s
+#define _tcslwr _wcslwr
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) // 4.5 and lesser
 #define _tcscpy_s wcscpy_s
 #define _tcscat_s wcscat_s
+#define _tcserror _wcserror
 typedef wchar_t _TUCHAR;
 #elseif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5) // 4.6 and grater
 #define _tcsstr wcsstr
@@ -41,10 +43,12 @@ typedef wchar_t _TUCHAR;
 
 #define _tcsncpy_s strncpy_s
 #define _tcsupr_s(a, b) (_strupr(a))
+#define _tcslwr _strlwr
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) // 4.5 and lesser
 #define _tcscpy_s strcpy_s
 #define _tcscat_s strcat_s
+#define _tcserror strerror
 typedef char _TUCHAR;
 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5) // 4.6 and grater
 #define _tcsstr strstr

data/source/bzs/example/changeSchema.cpp

@@ -87,28 +87,33 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         // backup current user table schema
         db->dbDef()->pushBackup(tablenum_user);
-
-        if (changeUserTable(db->dbDef()))
+        if (db->dbDef()->stat() == 0)
         {
-            // convert table if table exist;
-            if (db->existsTableFile(tablenum_user, NULL))
+            if (changeUserTable(db->dbDef()))
             {
-                db->setOnCopyData(onCopyData);
+                // convert table if table exist;
+                if (db->existsTableFile(TABLE_NUM_TMP, NULL))
+                {
+                    db->setOnCopyData(onCopyData);
+
+                    db->convertTable(tablenum_user, false, NULL);
+                    if (db->stat())
+                        showError(_T("convert table"), NULL, db->stat());
+                }
+            }
 
-                db->convertTable(tablenum_user, false, NULL);
-                if (db->stat())
-                    showError(_T("convert table"), NULL, db->stat());
+            if (db->stat())
+            {
+                result = db->stat();
+                // restore user table schema
+                db->dbDef()->popBackup(tablenum_user);
             }
-        }
+            else
+                _tprintf(_T("\nchange schema success. \n"));
+            
+        }else
+            showError(_T("backup table def"), NULL, db->dbDef()->stat());
 
-        if (db->stat())
-        {
-            result = db->stat();
-            // restore user table schema
-            db->dbDef()->popBackup(tablenum_user);
-        }
-        else
-            _tprintf(_T("\nchange schema success. \n"));
         db->close();
     }
     database::destroy(db);

data/source/bzs/example/queryData.cpp

@@ -449,6 +449,7 @@ bool checkVersion(database_ptr db)
                 return (tb->recordCount(false) == 20000);
             }
         }
+        td = def->tableDefs(1);
     }
     return false;
 }
@@ -464,6 +465,9 @@ int prebuiltData(database_ptr db, const connectParams& param, bool foceCreate,
                 dropDatabase(db);
             else
                 return 0;
+        }else if (db->stat() == STATUS_INVALID_DATASIZE)
+        {
+            dropDatabase(db);
         }
         std::tcout << _T("\nInserting query test data. Please wait... ")
                    << std::flush;

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

@@ -21,10 +21,11 @@
 #ifdef __BCPLUSPLUS__
 #pragma warn -8012
 #endif
-
 #include <boost/version.hpp>
 #if (BOOST_VERSION > 104900)
+
 #include <boost/asio.hpp>
+
 #else
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/buffer.hpp>
@@ -107,6 +108,7 @@ public:
     virtual char* read() = 0;
     virtual bool isHandShakable() const = 0;
     virtual const boost::system::error_code& error() const = 0;
+    virtual void* versions() = 0;
 };
 
 #define CONNECTION_FUNCTION_DIRECT_READ 1

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

@@ -19,10 +19,12 @@
  02111-1307, USA.
  ================================================================= */
 
+#pragma warning(disable : 4005) //BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT redefine bug 
 #include <bzs/netsvc/client/iconnection.h>
-
 #include <boost/asio/write.hpp>
 #include <boost/asio/read.hpp>
+#pragma warning(default : 4005)
+
 #include <boost/bind.hpp>
 #include <boost/thread/mutex.hpp>
 #if (BOOST_VERSION > 104900)
@@ -148,6 +150,7 @@ public:
 
 /** Implementation of Part of the connection interface
  */
+#define VER_ST_SIZE 12
 class connectionBase : public connection
 {
 protected:
@@ -159,6 +162,7 @@ protected:
     size_t m_readLen;
     int m_refCount;
     int m_charsetServer;
+    char m_vers[VER_ST_SIZE];
     bool m_connected;
     bool m_isHandShakable;
     boost::system::error_code m_e;
@@ -183,6 +187,7 @@ public:
           m_ep(ep), m_reader(NULL), m_refCount(0),
           m_charsetServer(-1), m_connected(false), m_isHandShakable(true)
     {
+        memset(m_vers, 0, VER_ST_SIZE);
     }
     virtual ~connectionBase()
     {
@@ -196,6 +201,8 @@ public:
     void setDirectReadHandler(idirectReadHandler* p){ m_reader = p; }
     bool isHandShakable() const {return m_isHandShakable;};
     const boost::system::error_code& error() const { return m_e; };
+
+    void* versions() {return (void*)m_vers;};
 };
 
 
@@ -672,8 +679,8 @@ class pipeConnection : public connectionImple<platform_stream>
     {
         char* p = buf;
         DWORD processId = GetCurrentProcessId();
-        __int64 clientid = (__int64) this;
-        sprintf_s(p, 120, "%s_%u_%Lu", name, processId, clientid);
+		unsigned __int64 clientid = (unsigned __int64) this;
+        sprintf_s(p, 120, "%s_%u_%llu", name, processId, clientid);
         return p;
     }
 

data/source/bzs/rtl/stringBuffers.cpp

@@ -30,6 +30,7 @@ namespace rtl
 {
 
 static const int MEMORY_UNIT = 8192;
+static const size_t MAX_STRING_BUFFER = 196608; // MAX_USHORT * 3
 
 stringBuffer::stringBuffer(size_t size) : m_ptr(NULL), m_len(0), m_pos(0)
 {
@@ -59,6 +60,12 @@ size_t stringBuffer::alloc(size_t size)
 
 size_t stringBuffer::re_alloc(size_t size)
 {
+    if ((size - m_pos) < MAX_STRING_BUFFER && m_len > MAX_STRING_BUFFER)
+    {
+        m_pos = 0;
+        return m_len;
+    }
+
     size =
         ((size / MEMORY_UNIT) + ((size % MEMORY_UNIT) ? 1 : 0)) * MEMORY_UNIT;
     m_ptr = (char*)::realloc(m_ptr, size);