transactd 2.2.0 → 2.3.0

data/source/bzs/db/protocol/tdap/uri.h

@@ -66,7 +66,7 @@ inline const _TCHAR* hostName(const _TCHAR* uri, _TCHAR* buf, size_t size)
     if (st)
     {
         const _TCHAR* en = _tcsstr(st, _T("/"));
-        if (en)
+        if (en && en > st)
         {
             _tcsncpy_s(buf, size, st, en - st);
             buf[en - st] = 0x00;
@@ -85,7 +85,7 @@ inline const _TCHAR* dbname(const _TCHAR* uri, _TCHAR* buf, size_t size)
         if (st)
         {
             const _TCHAR* en = _tcsstr(st + 1, _T("?"));
-            if (en)
+            if (en && en > st)
             {
                 _tcsncpy_s(buf, size, st + 1, en - (st + 1));
                 buf[en - (st + 1)] = 0x00;
@@ -103,7 +103,7 @@ inline const _TCHAR* schemaTable(const _TCHAR* uri, _TCHAR* buf, size_t size)
     {
         st+= 7;
         const _TCHAR* en = _tcsrchr(uri, _T('.'));
-        if (en)
+        if (en && en > st)
         {
             _tcsncpy_s(buf, size, st, en - st);
             buf[en - st] = 0x00;
@@ -122,7 +122,7 @@ inline const _TCHAR* userName(const _TCHAR* uri, _TCHAR* buf, size_t size)
     if (st)
     {
         const _TCHAR* en = _tcsstr(st, _T("@"));
-        if (en)
+        if (en && en > st)
         {
             _tcsncpy_s(buf, size, st, en - st);
             buf[en - st] = 0x00;

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

@@ -35,8 +35,9 @@
 
 /** tcp server type
  */
-#define TCP_CPT_SERVER 1
-#define TCP_TPOOL_SERVER 2
+#define TCP_CPT_SERVER       1
+#define TCP_TPOOL_SERVER     2
+#define PIPE_SHARE_MEM_SIZE  6292480 // 6Mbyte + 1024
 
 using namespace bzs::netsvc::server;
 
@@ -50,7 +51,7 @@ static unsigned int g_tcpServerType = TCP_CPT_SERVER;
 
 static unsigned int g_maxTcpConnections = 200;
 static unsigned int g_pool_threads = 20;
-unsigned int g_pipeCommSharememSize = 3145728;
+unsigned int g_pipeCommSharememSize = PIPE_SHARE_MEM_SIZE;
 int g_tableNmaeLower = 1; // defined in btrvProtocol.h
 unsigned int g_lock_wait_timeout = 1;
 char* g_transaction_isolation = NULL;
@@ -257,8 +258,8 @@ static MYSQL_SYSVAR_STR(auth_type, g_auth_type,
 */
 #ifdef PIPE_SERVER
 static MYSQL_SYSVAR_UINT(pipe_comm_sharemem_size, g_pipeCommSharememSize,
-                         PLUGIN_VAR_READONLY, "66000..52428800", 0, 0, 3145728,
-                         66000, 52428800, 0);
+                         PLUGIN_VAR_READONLY, "66000..52428800 ", 0, 0, PIPE_SHARE_MEM_SIZE,
+                         66000, 52428800, 0);  
 static MYSQL_SYSVAR_UINT(max_pipe_connections, g_maxPipeConnections,
                          PLUGIN_VAR_READONLY, "1..100", 0, 0, 50, 1, 100, 0);
 static MYSQL_SYSVAR_INT(use_piped_local, g_usePipedLocal, PLUGIN_VAR_READONLY,

data/source/bzs/env/crosscompile.cpp

@@ -114,6 +114,23 @@ int wcsncmp16(const char16_t* sl, const char16_t* sr, size_t n)
     return 0 - *sr;
 }
 
+int wmemcmp16(const char16_t* sl, const char16_t* sr, size_t n)
+{
+    if (n == 0)
+        return 0;
+    while (1)
+    {
+        if (*sl != *sr)
+            return (int)(*sl - *sr);
+        if (--n == 0)
+            return 0;
+        ++sl;
+        ++sr;
+    }
+    return 0 - *sr;
+}
+
+
 char16_t* wmemset16(char16_t* p, char16_t c, size_t n)
 {
     char16_t* end = p + n;

data/source/bzs/env/crosscompile.h

@@ -78,9 +78,11 @@ char16_t* _strlwr16(char16_t* s);
 size_t strlen16(const char16_t* src);
 int wcsnicmp16(const char16_t* sl, const char16_t* sr, size_t n);
 int wcsncmp16(const char16_t* sl, const char16_t* sr, size_t n);
+int wmemcmp16(const char16_t* sl, const char16_t* sr, size_t n);
 char16_t* wmemset16(char16_t* p, char16_t c, size_t n);
 char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count);
 
+
 /* operating system */
 #ifndef _TCHAR
 #define _TCHAR char
@@ -143,8 +145,9 @@ typedef unsigned __int32 char32_t; // 32bit
 #define wcsnicmp16(A, B, C)                                                    \
     _wcsnicmp((const wchar_t*)(A), (const wchar_t*)(B), C)
 #define wcsncmp16(A, B, C) wcsncmp((const wchar_t*)(A), (const wchar_t*)(B), C)
+#define wmemcmp16(A, B, C) wmemcmp((const wchar_t*)(A), (const wchar_t*)(B), C)
 #define wmemset16 wmemset
-#define strlen16 wcslen
+#define strlen16(A) wcslen((const wchar_t*)(A))
 
 /* operating system */
 #define PSEPARATOR _T("\\")

data/source/bzs/env/mbcswchrLinux.cpp

@@ -42,6 +42,7 @@ void initCvtProcess()
 {
     int ret = pthread_key_create(&g_tls1, cleanupTls);
     assert(ret == 0);
+    pthread_setspecific(g_tls1, NULL);
 }
 
 void deinitCvtProcess()
@@ -51,6 +52,8 @@ void deinitCvtProcess()
 
 cvt& getCvt(int index)
 {
+    if (g_tls1 == 0)
+        initCvtProcess();
     cvt* p = (cvt*)pthread_getspecific(g_tls1);
     if (p == NULL)
     {

data/source/bzs/example/deleteRecords.cpp

@@ -48,6 +48,19 @@ bool deleteUser(table* tb)
  */
 bool openDatabase(database* db, const _TCHAR* uri)
 {
+    /******************************************************
+     !!!  Important   !!!
+     When using a multi-threaded, 
+     please request a new connection for each database. 
+    *******************************************************/
+    // When using a multi-threaded, set to true.
+    bool newConnection = false; 
+    if (!db->connect(uri, newConnection))
+    {
+        showError(_T("connect daatabase"), NULL, db->stat());
+        return false;
+    }
+    
     db->open(uri, TYPE_SCHEMA_BDF);
     if (db->stat() != 0)
     {

data/source/bzs/example/deleteRecords_c.cpp

@@ -37,7 +37,14 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("test"),
                             _T("test"));
-        openDatabase(db, param);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
         table_ptr tb = openTable(db, _T("user"));
         deleteUser(tb);

data/source/bzs/example/insertRecords.cpp

@@ -161,6 +161,20 @@ void readImage(const _TCHAR* path, std::vector<char>& s)
  */
 bool openDatabase(database* db, const _TCHAR* uri)
 {
+    /******************************************************
+     !!!  Important   !!!
+     When using a multi-threaded, 
+     please request a new connection for each database. 
+    *******************************************************/
+    // When using a multi-threaded, set to true.
+    bool newConnection = false; 
+
+    if (!db->connect(uri, newConnection))
+    {
+        showError(_T("connect daatabase"), NULL, db->stat());
+        return false;
+    }
+    
     db->open(uri, TYPE_SCHEMA_BDF);
     if (db->stat() != 0)
     {

data/source/bzs/example/insertRecords_c.cpp

@@ -121,7 +121,14 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("test"),
                             _T("test"));
-        openDatabase(db, param);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
         table_ptr tb = openTable(db, _T("group1"));
         insertGroups(tb);

data/source/bzs/example/ormap_c.cpp

@@ -601,7 +601,14 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("test"),
                             _T("test"));
-        openDatabase(db, param);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
         databaseManager mgr(db);
         std::vector<user_ptr> users;

data/source/bzs/example/queryData.cpp

@@ -214,6 +214,12 @@ bool createUserExtTable(dbdef* def)
     fd->type = BLOB_TYPE;
 #ifndef USE_PSQL_DATABASE
     fd->len = 10;
+        ++filedIndex;
+    fd = def->insertField(tableid, filedIndex);
+    fd->setName(_T("binary"));
+    fd->type = BLOB_TYPE;
+    fd->len = 10;
+
 #else
     fd->len = 16000;
 #endif
@@ -276,6 +282,69 @@ bool createCacheTable(dbdef* def)
     return true;
 }
 
+bool createBlobOnlyTable(dbdef* def)
+{
+    short tableid = 4;
+    tabledef t;
+    tabledef* td = &t;
+    td->charsetIndex = mysql::charsetIndex(GetACP());
+    td->schemaCodePage = CP_UTF8;
+    td->id = tableid;
+    td->setTableName(_T("blobonly"));
+    td->setFileName(_T("blobonly"));
+
+    def->insertTable(td);
+    if (def->stat() != 0)
+        return showDbdefError(def, _T("blobonly insertTable"));
+
+    short filedIndex = 0;
+    fielddef* fd = def->insertField(tableid, filedIndex);
+    fd->setName(_T("id"));
+    fd->type = ft_integer;
+    fd->len = 4;
+
+    ++filedIndex;
+    fd = def->insertField(tableid, filedIndex);
+    fd->setName(_T("binary"));
+    fd->type = BLOB_TYPE;
+    fd->len = 10;
+
+    char keyNum = 0;
+    keydef* kd = def->insertKey(tableid, keyNum);
+    keySegment* seg1 = &kd->segments[0];
+    seg1->fieldNum = 0;
+    seg1->flags.bit8 = true; // extended key type
+    seg1->flags.bit1 = true; // chanageable
+    kd->segmentCount = 1;
+    td = def->tableDefs(tableid);
+    td->primaryKeyNum = keyNum;
+    def->updateTableDef(tableid);
+    if (def->stat() != 0)
+        return showDbdefError(def, _T("blobonly updateTableDef"));
+    return true;
+}
+
+void fillBlobField(short fieldNum, int id, table* tb, unsigned char* buf)
+{
+    for (int j = 0 ; j < 256 ; ++j)
+        buf[j] = (unsigned char)(j + id);
+    tb->setFV(fieldNum, buf, 256);
+}
+
+bool compBlobField(int id, field& fd)
+{
+    uint_td size;
+    unsigned char* p = (unsigned char*)fd.getBin(size);
+    if (size != 256) return false;
+
+    for (int j = 0 ; j < 256 ; ++j)
+    {
+        if (p[j] != (unsigned char)(j + id))
+            return false;
+    } 
+    return true;    
+}
+
 bool insertData(database_ptr db, int maxId)
 {
     _TCHAR tmp[256];
@@ -300,6 +369,13 @@ bool insertData(database_ptr db, int maxId)
         return false;
     }
 
+    table* tbb = db->openTable(_T("blobonly"), TD_OPEN_NORMAL);
+    if (db->stat())
+    {
+        showDbError(db.get(), _T("openTable blobonly"));
+        return false;
+    }
+
     dbTransaction trn(db);
     trn.begin();
 
@@ -326,6 +402,7 @@ bool insertData(database_ptr db, int maxId)
             return showTableError(tbg, _T("groups insert"));
     }
 
+    unsigned char bin[256];
     tbe->clearBuffer();
     for (int i = 1; i <= maxId; ++i)
     {
@@ -334,15 +411,27 @@ bool insertData(database_ptr db, int maxId)
         tbe->setFV(1, tmp);
         _stprintf_s(tmp, 256, _T("%d blob"), i);
         tbe->setFV(2, tmp);
+        fillBlobField(3, i, tbe, bin);
         tbe->insert();
         if (tbe->stat() != 0)
             return showTableError(tbe, _T("extention insert"));
     }
 
+    tbb->clearBuffer();
+    for (int i = 1; i <= 10; ++i)
+    {
+        tbb->setFV((short)0, i);
+        fillBlobField(1, i, tbb, bin);
+        tbb->insert();
+        if (tbb->stat() != 0)
+            return showTableError(tbb, _T("blobonly insert"));
+    }
+
     trn.end();
     tbg->release();
     tbu->release();
     tbe->release();
+    tbb->release();
     return true;
 }
 
@@ -354,7 +443,7 @@ bool checkVersion(database_ptr db)
         tabledef* td = def->tableDefs(3);
         if (td)
         {
-            if (td->fieldCount == 3)
+            if (td->fieldCount == 4)
             {
                 table_ptr tb = openTable(db, _T("extention"));
                 return (tb->recordCount(false) == 20000);
@@ -386,7 +475,8 @@ int prebuiltData(database_ptr db, const connectParams& param, bool foceCreate,
             return 1;
         if (!createUserExtTable(db->dbDef()))
             return 1;
-
+        if (!createBlobOnlyTable(db->dbDef()))
+            return 1;
         if (!insertData(db, maxId))
             return 1;
         std::tcout << _T("done!") << std::endl;

data/source/bzs/example/queryData.h

@@ -10,7 +10,9 @@ int prebuiltData(bzs::db::protocol::tdap::client::database_ptr db,
                  bool foceCreate = false, int maxId = 20000);
 
 bool createCacheTable(bzs::db::protocol::tdap::client::dbdef* def);
-
+void fillBlobField(short fieldNum, int id, bzs::db::protocol::tdap::client::table* tb,
+                    unsigned char* buf);
+bool compBlobField(int id, bzs::db::protocol::tdap::client::field& fd);
 const _TCHAR* name_field_str(_TCHAR* buf);
 
 #endif // BZS_EXSAMPLE_QUERYDATA_H

data/source/bzs/example/readRecords.cpp

@@ -98,6 +98,19 @@ bool readUsers(table* tb, std::vector<user*>& users)
  */
 bool openDatabase(database* db, const _TCHAR* uri)
 {
+    /******************************************************
+     !!!  Important   !!!
+     When using a multi-threaded, 
+     please request a new connection for each database. 
+    *******************************************************/
+    // When using a multi-threaded, set to true.
+    bool newConnection = false; 
+    if (!db->connect(uri, newConnection))
+    {
+        showError(_T("connect daatabase"), NULL, db->stat());
+        return false;
+    }
+
     db->open(uri, TYPE_SCHEMA_BDF);
     if (db->stat() != 0)
     {

data/source/bzs/example/readRecords_c.cpp

@@ -86,7 +86,14 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("test"),
                             _T("test"));
-        openDatabase(db, param);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
         table_ptr tb = openTable(db, _T("user"));
         std::vector<user_ptr> users;

data/source/bzs/example/updateRecords.cpp

@@ -60,6 +60,19 @@ bool updateUsers(table* tb)
  */
 bool openDatabase(database* db, const _TCHAR* uri)
 {
+    /******************************************************
+     !!!  Important   !!!
+     When using a multi-threaded, 
+     please request a new connection for each database. 
+    *******************************************************/
+    // When using a multi-threaded, set to true.
+    bool newConnection = false; 
+    if (!db->connect(uri, newConnection))
+    {
+        showError(_T("connect daatabase"), NULL, db->stat());
+        return false;
+    }
+    
     db->open(uri, TYPE_SCHEMA_BDF);
     if (db->stat() != 0)
     {

data/source/bzs/example/updateRecords_c.cpp

@@ -51,7 +51,14 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("test"),
                             _T("test"));
-        openDatabase(db, param);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
         table_ptr tb = openTable(db, _T("user"));
         updateUsers(tb);

data/source/bzs/example/update_with_transaction.cpp

@@ -61,6 +61,19 @@ bool updateUsers(table* tb)
  */
 bool openDatabase(database* db, const _TCHAR* uri)
 {
+    /******************************************************
+     !!!  Important   !!!
+     When using a multi-threaded, 
+     please request a new connection for each database. 
+    *******************************************************/
+    // When using a multi-threaded, set to true.
+    bool newConnection = false; 
+    if (!db->connect(uri, newConnection))
+    {
+        showError(_T("connect daatabase"), NULL, db->stat());
+        return false;
+    }
+    
     db->open(uri, TYPE_SCHEMA_BDF);
     if (db->stat() != 0)
     {

data/source/bzs/example/update_with_transaction_c.cpp

@@ -51,7 +51,14 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("test"),
                             _T("test"));
-        openDatabase(db, param);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
         table_ptr tb = openTable(db, _T("user"));
         dbTransaction trn(db);

data/source/bzs/example/useORMRecord.cpp

@@ -156,11 +156,17 @@ int _tmain(int argc, _TCHAR* argv[])
     {
         connectParams param(_T("tdap"), _T("localhost"), _T("mri"),
                             _T("dj32.bdf"));
-        openDatabase(db, param);
-        databaseManager mgr(db);
+        /******************************************************
+         !!!  Important   !!!
+         When using a multi-threaded, 
+         please request a new connection for each database. 
+        *******************************************************/
+        // When using a multi-threaded, set to true.
+        bool newConnection = false;          
+        connectOpen(db, param, newConnection);
 
+        databaseManager mgr(db);
         recordset rowset;
-
         bzs::rtl::benchmark bm;
         bm.report(boost::bind(readUsers, &mgr, &rowset), "exec time ");
         showConsole(rowset);

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

@@ -22,10 +22,16 @@
 #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>
+#endif
 #include <vector>
 
+
 #ifdef __BCPLUSPLUS__
 #pragma warn +8012
 #endif
@@ -76,6 +82,8 @@ class connection
 public:
     virtual ~connection(){};
     virtual void connect() = 0;
+    virtual void reconnect(boost::asio::ip::tcp::endpoint& ep) = 0;
+    virtual void cleanup() = 0;
     virtual void addref() = 0;
     virtual void release() = 0;
     virtual int refCount() const = 0;