transactd 2.0.1 → 2.1.0

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

@@ -112,6 +112,23 @@ Database_Ptr connectionPool<Database_Ptr>::addOne(const connectParams& param)
     return m_dbs[m_dbs.size() - 1];
 }
 
+template <class Database_Ptr>
+int connectionPool<Database_Ptr>::usingCount() const
+{
+    boost::mutex::scoped_lock lck(m_mutex, boost::defer_lock);
+#ifdef TRANSACTD_RB_CALL_WITHOUT_GVL
+    TRANSACTD_RB_CALL_WITHOUT_GVL(scopedLock, lck);
+#else
+    lck.lock();
+#endif
+    int n = 0;
+    for (size_t i = 0; i < m_dbs.size(); i++)
+    {
+        if (m_dbs[i].use_count() > 1)
+            ++n;
+    }
+    return n;
+}
 /** Delivery database instance
         If a connect error is occured then bzs::rtl::exception exception is
    thrown.

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

@@ -76,6 +76,7 @@ public:
     int maxConnections() const;
     void releaseOne();
     bool reset(int waitSec = 5);
+    int usingCount() const;
 };
 
 typedef connectionPool<database_ptr> stdDbCconnectionPool;

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

@@ -180,7 +180,10 @@ void database::create(const _TCHAR* fullpath, short type)
 void database::drop()
 {
     if (m_impl->dbDef == NULL)
+    {
         m_stat = STATUS_DB_YET_OPEN;
+        return;
+    }
     _TCHAR FullPath[MAX_PATH];
     std::vector<std::_tstring> fileNames;
     for (int i = 0; i <= m_impl->dbDef->tableCount(); i++)
@@ -322,7 +325,8 @@ bool database::open(const _TCHAR* _uri, short type, short mode,
             create(_uri, TYPE_SCHEMA_BDF);
             if (m_stat == STATUS_SUCCESS)
             {
-                doOpen(_uri, type, mode, ownername);
+                //Open mode force normal
+                doOpen(_uri, type, TD_OPEN_NORMAL, ownername);
                 if (m_stat == STATUS_SUCCESS)
                 {
                     m_impl->dbDef->autoMakeSchema();

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

@@ -35,7 +35,7 @@ class database;
 class table;
 class dbdef;
 
-#if defined(__BORLANDC__)
+#if (defined(__BORLANDC__) && !defined(__clang__))
 typedef bool __stdcall (*deleteRecordFn)(database* db, table* tb, bool inkey);
 typedef short __stdcall (*schemaMgrFn)(database* db);
 typedef void __stdcall (*copyDataFn)(database* db, int recordCount, int count,

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

@@ -21,7 +21,11 @@
 
 #include "database.h"
 #include <bzs/rtl/exception.h>
-//---------------------------------------------------------------------------
+#ifdef LINUX
+#include <pthread.h>
+#include <bzs/env/crosscompile.h>
+#include <bzs/env/mbcswchrLinux.h>
+#endif
 
 #pragma package(smart_init)
 
@@ -71,9 +75,12 @@ tls_key g_tlsiID_SC3;
 
 void initTlsThread()
 {
-    tls_setspecific(g_tlsiID_SC1, new wchar_t[256]);
-    tls_setspecific(g_tlsiID_SC2, new wchar_t[45]);
-    tls_setspecific(g_tlsiID_SC3, new wchar_t[45]);
+    if (tls_getspecific(g_tlsiID_SC1) == NULL)
+        tls_setspecific(g_tlsiID_SC1, new wchar_t[256]);
+    if (tls_getspecific(g_tlsiID_SC2) == NULL)
+        tls_setspecific(g_tlsiID_SC2, new wchar_t[45]);
+    if (tls_getspecific(g_tlsiID_SC3) == NULL)
+        tls_setspecific(g_tlsiID_SC3, new wchar_t[45]);
 }
 
 void cleanupTls()
@@ -81,36 +88,62 @@ void cleanupTls()
     delete (char*)tls_getspecific(g_tlsiID_SC1);
     delete (char*)tls_getspecific(g_tlsiID_SC2);
     delete (char*)tls_getspecific(g_tlsiID_SC3);
+    tls_setspecific(g_tlsiID_SC1, NULL);
+    tls_setspecific(g_tlsiID_SC2, NULL);
+    tls_setspecific(g_tlsiID_SC3, NULL);
+}
+
+void cleanupCharPtr(void* p)
+{
+    delete ((char*)p);
 }
+#endif // USETLS
 
-#ifdef __APPLE__
+#ifdef LINUX
 
 #include <pthread.h>
-
 void __attribute__((constructor)) onLoadLibrary(void);
 void __attribute__((destructor)) onUnloadLibrary(void);
 
 void onLoadLibrary(void)
 {
-    pthread_key_create(&g_tlsiID_SC1, NULL);
-    pthread_key_create(&g_tlsiID_SC2, NULL);
-    pthread_key_create(&g_tlsiID_SC3, NULL);
+    bzs::env::initCvtProcess();
+#if (defined(__APPLE__) && defined(USETLS))
+    if (tls_getspecific(g_tlsiID_SC1) == NULL)
+        pthread_key_create(&g_tlsiID_SC1, cleanupCharPtr);
+    if (tls_getspecific(g_tlsiID_SC2) == NULL)
+        pthread_key_create(&g_tlsiID_SC2, cleanupCharPtr);
+    if (tls_getspecific(g_tlsiID_SC3) == NULL)
+        pthread_key_create(&g_tlsiID_SC3, cleanupCharPtr);
+
+#endif
 }
 
 void onUnloadLibrary(void)
 {
+    bzs::env::deinitCvtProcess();
+#if (defined(__APPLE__) && defined(USETLS))
     cleanupTls();
     pthread_key_delete(g_tlsiID_SC1);
     pthread_key_delete(g_tlsiID_SC2);
     pthread_key_delete(g_tlsiID_SC3);
+#endif
 }
 
-#else
+#endif // LINUX
+
+#if (defined(_WIN32) && defined(USETLS))
 
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
 {
     if (reason == DLL_PROCESS_ATTACH)
     {
+#ifdef _MSC_VER
+        _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+        _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_DEBUG );
+        //_CrtSetBreakAlloc(151);
+#endif
+
         if ((g_tlsiID_SC1 = TlsAlloc()) == TLS_OUT_OF_INDEXES)
             return FALSE;
         if ((g_tlsiID_SC2 = TlsAlloc()) == TLS_OUT_OF_INDEXES)
@@ -133,8 +166,12 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
         TlsFree(g_tlsiID_SC1);
         TlsFree(g_tlsiID_SC2);
         TlsFree(g_tlsiID_SC3);
+#ifdef _MSC_VER
+        OutputDebugString(_T("After tdclcpp DLL_PROCESS_DETACH \n"));
+        _CrtDumpMemoryLeaks();
+#endif
     }
     return TRUE;
 }
-#endif
-#endif //(_UNICODE && defined(_WIN32) && _MSC_VER)
+#endif //(defined(_WIN32) && defined(USETLS))
+

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

@@ -80,29 +80,43 @@ public:
     }
 
     inline database* db() const { return m_db; }
+
     inline void use(const connectParams* param = NULL)
     {
         if (param)
             connect(*param, false);
     }
+
     inline void unUse(){};
 
     inline void setOption(__int64){};
+
     inline __int64 option() { return 0; };
+
     inline void beginTrn(short bias) { m_db->beginTrn(bias); };
+
     inline void endTrn() { m_db->endTrn(); }
+
     inline void abortTrn() { m_db->abortTrn(); }
+
     inline int enableTrn() { return m_db->enableTrn(); }
-    inline void beginSnapshot() { m_db->beginSnapshot(); }
+
+    inline void beginSnapshot(short bias = CONSISTENT_READ) { m_db->beginSnapshot(bias); }
+
     inline void endSnapshot() { m_db->endSnapshot(); }
+
     inline const _TCHAR* uri() const { return m_db->uri(); }
+
     inline char_td mode() const { return m_db->mode(); }
+
     inline bool isOpened() const { return m_db->isOpened(); }
 
     inline short_td stat() const { return m_db->stat(); }
+
     inline uchar_td* clientID() const { return m_db->clientID(); }
 };
 
+/** @cond INTERNAL */
 /* multi databases and a single thread inplemantation idatabaseManager
 */
 inline void releaseDatabaseDummy(database* p)
@@ -111,7 +125,9 @@ inline void releaseDatabaseDummy(database* p)
 inline void releaseDbManagerDummy(idatabaseManager* p)
 {
 }
+/** @endcond */
 
+/** Single thread distribution database manager */
 class disbDbManager : public idatabaseManager, private boost::noncopyable
 {
     std::vector<database_ptr> m_dbs;
@@ -143,6 +159,7 @@ public:
 
     disbDbManager(database* db)
     {
+        //No delete , because managing life cycle is db owner.
         database_ptr d(db, releaseDatabaseDummy);
         addDb(d);
     }
@@ -196,6 +213,7 @@ public:
         else
             m_db = m_dbs[0].get();
     }
+
     inline void unUse(){};
 
     inline const _TCHAR* uri() const { return m_db->uri(); }
@@ -208,15 +226,34 @@ public:
 
     inline __int64 option() { return 0; };
 
-    inline void beginTrn(short bias) { m_db->beginTrn(bias); };
+    inline void beginTrn(short bias) 
+    { 
+        for (size_t i = 0; i < m_dbs.size(); ++i)
+        {
+            m_dbs[i]->beginTrn(bias);
+            if (m_dbs[i]->stat())
+            {
+                abortTrn();
+                nstable::throwError(m_dbs[i]->uri(), m_dbs[i]->stat());
+            }
+        }
+    }
 
-    inline void endTrn() { m_db->endTrn(); }
+    inline void endTrn() 
+    { 
+        for (size_t i = 0; i < m_dbs.size(); ++i)
+            m_dbs[i]->endTrn();
+    }
 
-    inline void abortTrn() { m_db->abortTrn(); }
+    inline void abortTrn() 
+    { 
+        for (size_t i = 0; i < m_dbs.size(); ++i)
+            m_dbs[i]->abortTrn();
+    }
 
     inline int enableTrn() { return m_db->enableTrn(); }
 
-    inline void beginSnapshot() { m_db->beginSnapshot(); }
+    inline void beginSnapshot(short bias = CONSISTENT_READ) { m_db->beginSnapshot(bias); }
 
     inline void endSnapshot() { m_db->endSnapshot(); }
 

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

@@ -730,6 +730,8 @@ tabledef* dbdef::tableDefs(int index)
         def->autoIncExSpace = ((database*)nsdb())->defaultAutoIncSpace();
 
         setCodePage(def);
+        //Fix:Bug of maxRecordLen is mistake value saved, recalculate maxRecordLen.
+        setRecordLen(index);
     }
     else if (def == (tabledef*)-1)
         return NULL;
@@ -806,7 +808,7 @@ void dbdef::create(const _TCHAR* fullpath)
     fileSpec* fs;
 
     fs = (fileSpec*)malloc(512);
-    memset(fs, 512, 0x00);
+    memset(fs, 0x00, 512);
     fs->recLen = sizeof(tabledef);
     fs->pageSize = 4096;
     fs->indexCount = 1;
@@ -840,7 +842,7 @@ ushort_td dbdef::getRecordLen(short TableIndex)
     short i;
     tabledef* td = tableDefs(TableIndex);
     for (i = 0; i < td->fieldCount; i++)
-        ret += td->fieldDefs[i].len + td->fieldDefs[i].varLenBytes();
+        ret += td->fieldDefs[i].len/* + td->fieldDefs[i].varLenBytes()*/;
     return ret;
 }
 

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

@@ -46,10 +46,26 @@ dllUnloadCallback dllUnloadCallbackFunc = NULL;
 #ifdef USETLS
 tls_key g_tlsiID1;
 tls_key g_tlsiID_SC1;
-#else
+
+void cleanupClinet(void* p)
+{
+    delete ((bzs::db::protocol::tdap::client::client*)(p));
+}
+
+void cleanupClientID(void* p)
+{
+    delete ((clientID*)(p));
+}
+
+void cleanupWChar(void* p)
+{
+    delete ((wchar_t*)(p));
+}
+
+#else // NOT USETLS
 __THREAD clientID __THREAD_BCB g_cid;
 __THREAD bool __THREAD_BCB g_initCid = false;
-#endif
+#endif // NOT USETLS
 
 #ifdef _WIN32
 
@@ -57,6 +73,12 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
 {
     if (reason == DLL_PROCESS_ATTACH)
     {
+#ifdef _MSC_VER
+        _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+        _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_DEBUG );
+        //_CrtSetBreakAlloc(155);
+#endif
+
 #ifdef USETLS
         if ((g_tlsiID = TlsAlloc()) == TLS_OUT_OF_INDEXES)
             return FALSE;
@@ -71,9 +93,9 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
     else if (reason == DLL_THREAD_DETACH)
     {
 #ifdef USETLS
-        delete (bzs::db::protocol::tdap::client::client*)tls_getspecific(
-            g_tlsiID);
-        tls_setspecific(g_tlsiID1, 0);
+        cleanupClinet(tls_getspecific(g_tlsiID));
+        cleanupClientID(tls_getspecific(g_tlsiID1));
+        cleanupWChar(tls_getspecific(g_tlsiID_SC1));
 #else
         delete g_client;
         g_client = NULL;
@@ -81,16 +103,26 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
     }
     else if (reason == DLL_PROCESS_DETACH)
     {
+        try
+        {
         if (dllUnloadCallbackFunc)
             dllUnloadCallbackFunc();
-
         delete m_cons;
+        }
+        catch(...){}
         m_cons = NULL;
 
 #ifdef USETLS
+        cleanupClinet(tls_getspecific(g_tlsiID));
+        cleanupClientID(tls_getspecific(g_tlsiID1));
+        cleanupWChar(tls_getspecific(g_tlsiID_SC1));
         TlsFree(g_tlsiID);
         TlsFree(g_tlsiID1);
         TlsFree(g_tlsiID_SC1);
+#endif
+#ifdef _MSC_VER
+    OutputDebugString(_T("After tdclc DLL_PROCESS_DETACH \n"));
+    _CrtDumpMemoryLeaks();
 #endif
     }
     return TRUE;
@@ -107,24 +139,30 @@ void __attribute__((destructor)) onUnloadLibrary(void);
 
 void onLoadLibrary(void)
 {
-    m_cons = new connections(PIPENAME);
+    if (m_cons == NULL)
+    {
+        m_cons = new connections(PIPENAME);
 #ifdef USETLS
-    pthread_key_create(&g_tlsiID, NULL);
-    pthread_key_create(&g_tlsiID1, NULL);
-    pthread_key_create(&g_tlsiID_SC1, NULL);
+        pthread_key_create(&g_tlsiID, cleanupClinet);
+        pthread_key_create(&g_tlsiID1, cleanupClientID);
+        pthread_key_create(&g_tlsiID_SC1, cleanupWChar);
 #endif
+    }
 }
 
 void onUnloadLibrary(void)
 {
-    if (dllUnloadCallbackFunc)
-        dllUnloadCallbackFunc();
-    delete m_cons;
-    m_cons = NULL;
+    if (m_cons)
+    {
+        if (dllUnloadCallbackFunc)
+            dllUnloadCallbackFunc();
+        delete m_cons;
+        m_cons = NULL;
 #ifdef USETLS
-    pthread_key_delete(g_tlsiID);
-    pthread_key_delete(g_tlsiID1);
-    pthread_key_delete(g_tlsiID_SC1);
+        pthread_key_delete(g_tlsiID);
+        pthread_key_delete(g_tlsiID1);
+        pthread_key_delete(g_tlsiID_SC1);
+    }
 #endif
 }
 #endif // NOT _WIN32
@@ -138,19 +176,21 @@ extern "C" PACKAGE_OSX short_td __STDCALL
     short_td ret;
     try
     {
-
         if ((TD_GET_BLOB_BUF != op) && (TD_ADD_SENDBLOB != op))
+        {
+            if (cid == NULL) return 1;
+            
             client_t->setParam(op, pbk, data, datalen, keybuf, keylen, keyNum,
                                cid);
 
-        if (client_t->stop_if())
-        {
-            client_t->cleanup();
-            return 0;
+            if (client_t->stop_if())
+            {
+                client_t->cleanup();
+                return 0;
+            }
         }
-        if (cid == NULL)
-            return 1;
 
+        op = op % 100;
         switch (op)
         {
         case TD_GET_BLOB_BUF:
@@ -165,7 +205,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             {
                 if (op == TD_CREATETABLE)
                 {
-                    if (client_t->readServerCharsetIndex())
+                    if (client_t->getServerCharsetIndex() != -1)
                         client_t->create();
                     else
                     {
@@ -211,6 +251,8 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             client_t->req().paramMask = P_MASK_NOKEYBUF;
             break;
         case TD_UNLOCK:
+            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_KEYNUM;
+            break;
         case TD_UPDATE_PART:
             client_t->cleanup();
             return 0;
@@ -255,6 +297,8 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             break;
         case TD_KEY_NEXT_MULTI:
         case TD_KEY_PREV_MULTI:
+        case TD_KEY_SEEK_MULTI:
+        case TD_FILTER_PREPARE:
             client_t->req().paramMask = P_MASK_POSBLK | P_MASK_DATA |
                                         P_MASK_DATALEN | P_MASK_EX_SENDLEN |
                                         P_MASK_KEYNUM;
@@ -282,11 +326,6 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             client_t->req().paramMask = P_MASK_POSBLK | P_MASK_DATA |
                                         P_MASK_DATALEN | P_MASK_EX_SENDLEN;
             break;
-        case TD_KEY_SEEK_MULTI:
-            client_t->req().paramMask = P_MASK_POSBLK | P_MASK_DATA |
-                                        P_MASK_KEYNUM | P_MASK_DATALEN |
-                                        P_MASK_EX_SENDLEN;
-            break;
         case TD_GETDIRECTORY:
         case TD_SETDIRECTORY:
             break;
@@ -412,13 +451,6 @@ inline clientID* getCid()
     }
     return p;
 #else
-    return &g_cid;
-#endif
-}
-
-void initCid()
-{
-#ifndef USETLS
     if (!g_initCid)
     {
         g_initCid = true;
@@ -427,10 +459,11 @@ void initCid()
         g_cid.aid[0] = 'G';
         g_cid.aid[1] = 'X';
     }
+    return &g_cid;
 #endif
 }
 
-extern "C" PACKAGE_OSX short_td BTRVID(ushort_td op, posblk* pbk, void_td* data,
+extern "C" PACKAGE_OSX short_td __STDCALL BTRVID(ushort_td op, posblk* pbk, void_td* data,
                                        uint_td* datalen, void_td* keybuf,
                                        char_td keyNum, clientID* cid)
 {
@@ -444,7 +477,6 @@ extern "C" PACKAGE_OSX short_td __STDCALL BTRV(ushort_td op, posblk* pbk,
                                                void_td* data, uint_td* datalen,
                                                void_td* keybuf, char_td keyNum)
 {
-    initCid();
     return BTRVID(op, pbk, data, datalen, keybuf, keyNum, getCid());
 }
 
@@ -452,7 +484,6 @@ extern "C" PACKAGE_OSX short_td __STDCALL
     BTRCALL(ushort_td op, posblk* pbk, void_td* data, uint_td* datalen,
             void_td* keybuf, keylen_td keylen, char_td keyNum)
 {
-    initCid();
     return BTRCALLID(op, pbk, data, datalen, keybuf, keylen, keyNum, getCid());
 }
 
@@ -460,7 +491,6 @@ extern "C" PACKAGE_OSX short_td __STDCALL
     BTRCALL32(ushort_td op, posblk* pbk, void_td* data, uint_td* datalen,
               void_td* keybuf, keylen_td keylen, char_td keyNum)
 {
-    initCid();
     return BTRCALLID(op, pbk, data, datalen, keybuf, keylen, keyNum, getCid());
 }