transactd 1.2.0 → 2.0.0

data/source/bzs/env/tstring.h

@@ -14,12 +14,12 @@
    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  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 
-#ifndef __TSTRING_H //old tstring.h is used
+#ifndef __TSTRING_H // old tstring.h is used
 
 #include <string.h>
 #include <string>
@@ -34,150 +34,145 @@
 #ifdef LINUX
 #include <bzs/env/mbcswchrLinux.h>
 #endif
+#include <bzs/env/crosscompile.h>
 
-
-namespace std {
+namespace std
+{
 #ifdef _UNICODE
-	typedef wstring _tstring;
-
+typedef wstring _tstring;
+typedef wstringstream _tstringstream;
 #else
-	typedef string _tstring;
-
+typedef string _tstring;
+typedef stringstream _tstringstream;
 #endif
-} //std
-
+} // std
 
 #ifdef _UNICODE
-	#define tPos Pos
-    #define tcout wcout
+#define tPos Pos
+#define tcout wcout
 #else
-	#define tPos AnsiPos
-    #define tcout cout
+#define tPos AnsiPos
+#define tcout cout
 #endif
 
-
 #ifdef _UNICODE
-    #define _tcsmcmp _tcscmp
-	#define _tcsmclen _tcsclen
-	#define _tcsmnextc _tcsnextc
-	#define _tcsmrchr _tcsrchr
-	#define _tcsmstr _tcsstr
-	#define _tcsmupr _tcsupr
-
-	typedef char _NTCHAR;
+#define _tcsmcmp _tcscmp
+#define _tcsmclen _tcsclen
+#define _tcsmnextc _tcsnextc
+#define _tcsmrchr _tcsrchr
+#define _tcsmstr _tcsstr
+#define _tcsmupr _tcsupr
+
+typedef char _NTCHAR;
 #else
-	#define _tcsmcmp _mbscmp
-	#define _tcsmclen _mbslen
-	#define _tcsmnextc _mbsnextc
-	#define _tcsmrchr _mbsrchr
-	#define _tcsmstr _mbsstr
-	#define _tcsmupr _mbsupr
-	typedef wchar_t _NTCHAR;
+#define _tcsmcmp _mbscmp
+#define _tcsmclen _mbslen
+#define _tcsmnextc _mbsnextc
+#define _tcsmrchr _mbsrchr
+#define _tcsmstr _mbsstr
+#define _tcsmupr _mbsupr
+typedef wchar_t _NTCHAR;
 #endif
 
 #define __BEGIN_NO_TCHAR_CONVERT__
 #define __END_NO_TCHAR_CONVERT__
 
-
 inline const char* toChar(char* buf, const _TCHAR* w, int size)
-{   //If w becomes in Ansi, a pointer will be returned without doing anything.
-    #ifdef _UNICODE
-        WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, buf, size, NULL, NULL);
-        return buf;
-	#else
-		return w;
-	#endif
+{ // If w becomes in Ansi, a pointer will be returned without doing anything.
+#ifdef _UNICODE
+    WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, buf, size, NULL,
+                        NULL);
+    return buf;
+#else
+    return w;
+#endif
 }
 
 inline const char* wtoa(char* buf, const WCHAR* w, int size)
 {
-	WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, buf, size, NULL, NULL);
-	return buf;
+    WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, buf, size, NULL,
+                        NULL);
+    return buf;
 }
 
 inline const WCHAR* toWChar(WCHAR* buf, const _TCHAR* w, int size)
-{//If w becomes in WCHAR, a pointer will be returned without doing anything.
-	#ifdef _UNICODE
-		return w;
-	#else
-		MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, w, -1, buf, size);
-		return buf;
-	#endif
+{ // If w becomes in WCHAR, a pointer will be returned without doing anything.
+#ifdef _UNICODE
+    return w;
+#else
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, w, -1, buf, size);
+    return buf;
+#endif
 }
 
-
 #ifdef _UNICODE
 inline const WCHAR* toWChar(WCHAR* buf, const char* a, int size)
 {
-	MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, -1, buf, size);
-	return buf;
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, -1, buf, size);
+    return buf;
 }
 #endif
 
 inline const WCHAR* toWChar_n(WCHAR* buf, const char* a, int size)
 {
-	MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, size, buf, size);
-	return buf;
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, size, buf, size);
+    return buf;
 }
 
 inline const _TCHAR* toTChar(_TCHAR* t, const WCHAR* w, int size)
 {
-	 #ifdef _UNICODE
-		return w;
-	 #else
-		WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, t, size, NULL, NULL);
-		return t;
-	 #endif
+#ifdef _UNICODE
+    return w;
+#else
+    WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, t, size, NULL, NULL);
+    return t;
+#endif
 }
 
 inline const _TCHAR* toTCharCopy(_TCHAR* t, const WCHAR* w, int size)
-{ //It returns, after certainly copying, even if w is _TCHAR.
-	 #ifdef _UNICODE
-		_tcscpy_s(t, size, w);
-		return t;
-	 #else
-		WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, t, size, NULL, NULL);
-		return t;
-
-	 #endif
+{ // It returns, after certainly copying, even if w is _TCHAR.
+#ifdef _UNICODE
+    _tcscpy_s(t, size, w);
+    return t;
+#else
+    WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, t, size, NULL, NULL);
+    return t;
+
+#endif
 }
 
-#pragma warning(disable:4996)
 inline const char* toCharCpy(char* buf, const _TCHAR* w, int size)
-{   
-	 #ifdef _UNICODE
-		WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, buf, size, NULL, NULL);
-		return buf;
-	 #else
-		strncpy(buf, w, size);
-		return buf;
-	 #endif
+{
+#ifdef _UNICODE
+    WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, w, -1, buf, size, NULL,
+                        NULL);
+    return buf;
+#else
+    strncpy_s(buf, size, w, size - 1);
+    return buf;
+#endif
 }
-#pragma warning(default:4996)
 
 inline const _TCHAR* toTChar(_TCHAR* t, const char* a, int size)
 {
-	 #ifdef _UNICODE
-		MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, -1, t, size);
-		return t;
-	 #else
-		return a;
-	 #endif
+#ifdef _UNICODE
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, -1, t, size);
+    return t;
+#else
+    return a;
+#endif
 }
 
-#pragma warning(disable:4996)
 inline const _TCHAR* toTCharCopy(_TCHAR* t, const char* a, int size)
 {
-	 #ifdef _UNICODE
-		MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, -1, t, size);
-		return t;
-	 #else
-		_tcsncpy(t, a, size);
-		return t;
-	 #endif
+#ifdef _UNICODE
+    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, a, -1, t, size);
+    return t;
+#else
+    _tcsncpy_s(t, size, a, size - 1);
+    return t;
+#endif
 }
-#pragma warning(default:4996)
-
 
 #endif //__TSTRING_H
-#endif //BZS_ENV_TSTRING_H
+#endif // BZS_ENV_TSTRING_H

data/source/bzs/example/changeSchema.cpp

@@ -6,7 +6,6 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /** @brief change schema and  convert table example
 
 This program  change "user" table.
@@ -20,14 +19,13 @@ Please execute the "create database" example before execute this example.
 static const short tablenum_user = 1;
 static const short fieldnum_name = 1;
 
-
 /** show database operation error
 */
-void showError(const _TCHAR* caption,const _TCHAR* tableName, short statusCode)
+void showError(const _TCHAR* caption, const _TCHAR* tableName, short statusCode)
 {
-    _TCHAR tmp[1024]={0x00};
+    _TCHAR tmp[1024] = { 0x00 };
     nstable::tdapErr(0x00, statusCode, tableName, tmp);
-    _tprintf(_T("%s error No.%ld %s\n"),caption, statusCode, tmp);
+    _tprintf(_T("[ERROR] %s No.%ld %s\n"), caption, statusCode, tmp);
 }
 
 /** Change user table schema
@@ -35,20 +33,20 @@ void showError(const _TCHAR* caption,const _TCHAR* tableName, short statusCode)
 bool changeUserTable(dbdef* def)
 {
 
-    //change name size
-    tabledef** td = def->tableDefPtr(tablenum_user);
-    fielddef* fd = &(*td)->fieldDefs[fieldnum_name];
+    // change name size
+    tabledef* td = def->tableDefs(tablenum_user);
+    fielddef* fd = &td->fieldDefs[fieldnum_name];
     fd->setLenByCharnum(64);
 
-    //add tel field
-    fd = def->insertField((*td)->id, (*td)->fieldCount);
+    // add tel field
+    fd = def->insertField(tablenum_user, td->fieldCount);
     fd->setName(_T("tel"));
     fd->type = ft_mychar;
-    fd->setCharsetIndex( CHARSET_LATIN1);
+    fd->setCharsetIndex(CHARSET_LATIN1);
     fd->setLenByCharnum(16);
 
-    //write user table schema
-    def->updateTableDef((*td)->id);
+    // write user table schema
+    def->updateTableDef(tablenum_user);
     if (def->stat() != 0)
     {
         showError(_T("edit schema table"), NULL, def->stat());
@@ -70,12 +68,12 @@ bool openDbExclusive(database* db, const _TCHAR* uri)
     return true;
 }
 
-void __STDCALL onCopyData(database* db, int recordCount, int count, bool &cancel)
+void __STDCALL
+    onCopyData(database* db, int recordCount, int count, bool& cancel)
 {
-     if (count == 0)
-         _tprintf(_T("\n"));
-     _tprintf(_T("."));
-
+    if (count == 0)
+        _tprintf(_T("\n"));
+    _tprintf(_T("."));
 }
 
 #pragma argsused
@@ -87,12 +85,12 @@ int _tmain(int argc, _TCHAR* argv[])
 
     if (openDbExclusive(db, uri))
     {
-        //backup current user table schema
+        // backup current user table schema
         db->dbDef()->pushBackup(tablenum_user);
 
         if (changeUserTable(db->dbDef()))
         {
-            //convert table if table exist;
+            // convert table if table exist;
             if (db->existsTableFile(tablenum_user, NULL))
             {
                 db->setOnCopyData(onCopyData);
@@ -106,10 +104,11 @@ int _tmain(int argc, _TCHAR* argv[])
         if (db->stat())
         {
             result = db->stat();
-            //restore user table schema
+            // restore user table schema
             db->dbDef()->popBackup(tablenum_user);
-        }else
-            _tprintf(_T("\nchage table success. \n"));
+        }
+        else
+            _tprintf(_T("\nchange schema success. \n"));
         db->close();
     }
     database::destroy(db);

data/source/bzs/example/changeSchema_c.cpp

@@ -3,7 +3,6 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief change schema and  convert table example
 
@@ -18,61 +17,60 @@ Please execute the "create database" example before execute this example.
 static const short tablenum_user = 1;
 static const short fieldnum_name = 1;
 
-
-
 /** Change user table schema
  */
 void changeUserTable(dbdef* def)
 {
-    //change name size
-    tabledef** td = def->tableDefPtr(tablenum_user);
-    fielddef* fd = &(*td)->fieldDefs[fieldnum_name];
+    // change name size
+    tabledef* td = def->tableDefs(tablenum_user);
+    fielddef* fd = &td->fieldDefs[fieldnum_name];
     fd->setLenByCharnum(64);
 
-    //add tel field
+    // add tel field
     int size = lenByCharnum(ft_mychar, CHARSET_LATIN1, 16);
-    fd = insertField(def, (*td)->id, (*td)->fieldCount, _T("tel"), ft_mychar, size);
+    fd = insertField(def, tablenum_user, td->fieldCount, _T("tel"), ft_mychar,
+                     size);
     fd->setCharsetIndex(CHARSET_LATIN1);
-
-    //write user table schema
-    updateTableDef(def, (*td)->id);
+    // write user table schema
+    updateTableDef(def, tablenum_user);
 }
 
-void __stdcall onCopyData(database* db, int recordCount, int count, bool &cancel)
+void __STDCALL
+    onCopyData(database* db, int recordCount, int count, bool& cancel)
 {
-     if (count == 0)
-         std::cout << std::endl;
-     std::cout << "." ;
-
+    if (count == 0)
+        std::cout << std::endl;
+    std::cout << ".";
 }
 
 #pragma argsused
 int _tmain(int argc, _TCHAR* argv[])
 {
-    database_ptr db = createDatadaseObject();
+    database_ptr db = createDatabaseObject();
     try
     {
-        connectParams prams(_T("tdap"), _T("localhost"), _T("test"), _T("test"));
+        connectParams prams(_T("tdap"), _T("localhost"), _T("test"),
+                            _T("test"));
         prams.setMode(TD_OPEN_EXCLUSIVE);
 
         openDatabase(db, prams);
 
-        //backup current user table schema
+        // backup current user table schema
         db->dbDef()->pushBackup(tablenum_user);
 
         changeUserTable(db->dbDef());
 
-        //convert table
-        //If an error ouccered then restore the table schema automaticaly.
+        // convert table
+        // If an error ouccered then restore the table schema automaticaly.
         convertTable(db, _T("user"), onCopyData);
 
-        std::cout << "change databse success." << std::endl;
+        std::cout << "change schema success." << std::endl;
         return 0;
     }
 
-    catch(bzs::rtl::exception& e)
+    catch (bzs::rtl::exception& e)
     {
-        std::tcout << *bzs::rtl::getMsg(e) << std::endl;
+        std::tcout << _T("[ERROR] ") << *bzs::rtl::getMsg(e) << std::endl;
     }
     return 1;
 }

data/source/bzs/example/connection_pool_c.cpp

@@ -1,10 +1,5 @@
-#include <bzs/db/protocol/tdap/client/trdboostapi.h>
+#include <bzs/db/protocol/tdap/client/pooledDatabaseManager.h>
 #include <iostream>
-#include <vector>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/condition.hpp>
-
-
 
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
@@ -19,147 +14,97 @@ And execute ten worker jobs with each thread.
 Each worker shows the connection object pointer.
 
 */
-
-
 struct clientID
 {
     void* con;
-    char_td reserved[12 - sizeof(void*)];//32bit = 8 64bit = 4
-    char_td     aid[2];
-    ushort_td   id;
+    char_td reserved[12 - sizeof(void*)]; // 32bit = 8 64bit = 4
+    char_td aid[2];
+    ushort_td id;
 };
 
-
-/** connection pool class
-    Hold database instance and delivery.
-*/
-class connectionPool
+class worker
 {
-    std::vector<database_ptr> m_dbs;
-    mutable mutex m_mutex;
-    mutable mutex m_mutex2;
-
-    mutable condition m_busy;
+    int m_id;
+    int m_worktime;
+    static mutex m_mutex;
 
 public:
-    connectionPool(){};
+    worker(int id, int worktime) : m_id(id), m_worktime(worktime){};
 
-    /** delivery database instance*/
-    database_ptr get()const
+    void execute()
     {
-        mutex::scoped_lock lck(m_mutex);
-        while (1)
+        try
         {
-            for (size_t i = 0;i<m_dbs.size();i++)
+            pooledDbManager db;
+            db.use();
+
+            clientID* cid = (clientID*)db.clientID();
+
             {
-                if (m_dbs[i].use_count() == 1)
-                    return m_dbs[i];
+                mutex::scoped_lock lck(m_mutex);
+                std::cout << "worker strat id = " << m_id << " connection = 0x"
+                          << std::hex << cid->con << std::endl;
+            }
+
+            Sleep(m_worktime);
+            if (m_id == 4)
+                throw "error"; // throw error example
 
+            {
+                mutex::scoped_lock lck(m_mutex);
+                std::cout << "worker finish id = " << m_id << " connection = 0x"
+                          << std::hex << cid->con << std::endl;
             }
-            mutex::scoped_lock lck(m_mutex2);
-            m_busy.wait(lck);
-      
+            db.unUse();
+            delete this;
         }
-    }
 
-    /** create database and login the server with each connection*/
-    void create(size_t size, const connectParams& param)
-    {
-        for (size_t i =0;i<size;++i)
+        catch (bzs::rtl::exception& e)
         {
-            database_ptr db = createDatadaseObject();
-            connect(db, param, true/* new connection*/);
-            openDatabase(db, param);
-            m_dbs.push_back(db);
+            std::tcout << _T("[ERROR] ") << *bzs::rtl::getMsg(e) << std::endl;
         }
-    }
-    
-    void releaseOne()
-    {
-        m_busy.notify_one();
-    }
 
-};
-
-connectionPool cpool;
-
-void releaseConnection(connectionPool* pool)
-{
-    pool->releaseOne();
-}
-
-class worker
-{
-   int m_id;
-   int m_worktime;
-   static mutex m_mutex;
-public:
-    worker(int id, int worktime):m_id(id),m_worktime(worktime){};
-    void execute()
-    {
-        try
-        {
-            shared_ptr<connectionPool> pool(&cpool, releaseConnection);
-            {
-                database_ptr db = pool->get();
-            
-                clientID* cid = (clientID*)db->clientID();
-        
-                {
-                    mutex::scoped_lock lck(m_mutex);
-                    std::cout << "worker strat id = " << m_id
-                                << " connection = 0x" << std::hex << cid->con << std::endl;
-                }
-        
-                Sleep(m_worktime);
-                if (m_id == 4) throw "error";    //throw error example
-
-                {
-                    mutex::scoped_lock lck(m_mutex);
-                    std::cout << "worker finish id = " << m_id
-                            << " connection = 0x" << std::hex << cid->con << std::endl;
-                }
-            } // release database
-
-            delete this;
-        } //call releaseConnection
-
-        catch(...)
+        catch (...)
         {
             mutex::scoped_lock lck(m_mutex);
             std::cout << "worker error id = " << m_id << std::endl;
             delete this;
         }
     }
-
 };
 mutex worker::m_mutex;
 
-static const worktime[10] = {5, 1, 3, 5, 4, 1, 2, 5, 4, 1};
+static const int worktime[10] = { 5, 1, 3, 5, 4, 1, 2, 5, 4, 1 };
 
 #pragma argsused
 int _tmain(int argc, _TCHAR* argv[])
 {
     try
     {
-        connectParams param(_T("tdap"), _T("localhost"), _T("test"), _T("test"));
-        //create four databases
-        cpool.create(4, param);
+        connectParams param(_T("tdap"), _T("localhost"), _T("test"),
+                            _T("test"));
+        // create four databases
+        pooledDbManager::reserve(4, param);
 
-        //Execute 10 workers with each thread.
+        // Execute 10 workers with each thread.
         thread_group threads;
-        for (int i=0;i<10;++i)
+        for (int i = 0; i < 10; ++i)
         {
-            worker* w = new worker(i+1, worktime[i]*100);
-            threads.create_thread( bind(&worker::execute, w));
+            worker* w = new worker(i + 1, worktime[i] * 100);
+            threads.create_thread(bind(&worker::execute, w));
         }
         threads.join_all();
+
+        // release all connection.
+        pooledDbManager().reset(0);
+
+        std::cout << "Connection pool test success." << std::endl;
         return 0;
     }
 
-    catch(bzs::rtl::exception& e)
+    catch (bzs::rtl::exception& e)
     {
-        std::tcout << *bzs::rtl::getMsg(e) << std::endl;
+        std::tcout << _T("[ERROR] ") << *bzs::rtl::getMsg(e) << std::endl;
     }
     return 1;
 }