transactd 3.2.1 → 3.3.0

data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_MYSQL_TDAPCOMMANDEXECUTER_H
 #define BZS_DB_PROTOCOL_TDAP_MYSQL_TDAPCOMMANDEXECUTER_H
 /*=================================================================
-   Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2012-2016 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
@@ -99,6 +99,7 @@ public:
     inline int errorCode(int ha_error) { return tdap::mysql::errorCode(ha_error);}
     inline short_td errorCodeSht(int ha_error) { return (short_td)tdap::mysql::errorCode(ha_error);}
     netsvc::server::IAppModule* mod() { return m_mod; };
+    friend class commandExecuter;
 };
 
 /** Command dispatcher for connectionManager
@@ -107,18 +108,19 @@ class connMgrExecuter
 {
     request& m_req;
     __int64 m_modHandle;
-
+    blobBuffer* m_blobBuffer;
     int definedDatabases(char* buf, size_t& size);
     int schemaTables(char* buf, size_t& size);
     int definedTables(char* buf, size_t& size);
     int definedViews(char* buf, size_t& size);
-    int slaveStatus(char* buf, size_t& size);
+    int slaveStatus(netsvc::server::netWriter* nw);
     int systemVariables(char* buf, size_t& size);
+    int statusVariables(char* buf, size_t& size);
     int read(char* buf, size_t& size);
     int disconnectOne(char* buf, size_t& size);
     int disconnectAll(char* buf, size_t& size);
 public:
-    connMgrExecuter(request& req, unsigned __int64 parent);
+    connMgrExecuter(request& req, unsigned __int64 parent, blobBuffer* bb);
     int commandExec(netsvc::server::netWriter* nw);
 };
 
@@ -146,8 +148,8 @@ public:
     int execute(netsvc::server::netWriter* nw)
     {
         if (m_req.op == TD_STASTISTICS)
-            return connMgrExecuter(m_req, (unsigned __int64)m_dbExec->mod())
-                                            .commandExec(nw);
+            return connMgrExecuter(m_req, (unsigned __int64)m_dbExec->mod(), 
+                        m_dbExec->m_blobBuffer).commandExec(nw);
         return m_dbExec->commandExec(m_req, nw);
     }
 

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

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_TDAPSCHEMA_H
 #define BZS_DB_PROTOCOL_TDAP_TDAPSCHEMA_H
 /* =================================================================
- Copyright (C) 2000-2013 BizStation Corp All rights reserved.
+ Copyright (C) 2000-2016 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
@@ -900,10 +900,14 @@ private:
         unsigned int size = f->size;
         //Copy data size
         memcpy(dest, &size, sizeByte);
-        //Copy data 
-        memcpy(blobBlock, f->data(), size);
-        //Copy data ptr
-        memcpy(dest + sizeByte, &blobBlock, sizeof(char*));
+        //Copy data
+        if (size)
+        {
+            memcpy(blobBlock, f->data(), size);
+            //Copy data ptr
+            memcpy(dest + sizeByte, &blobBlock, sizeof(char*));
+        }else
+            memset(dest + sizeByte, 0, sizeof(char*));
         hd->nextField = (blobField*)f->next();
         if (fieldNum == hd->fieldCount - 1)
             ++hd->curRow;

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

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H
 #define BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H
 /* =================================================================
- Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+ Copyright (C) 2012 2013-2016 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
@@ -201,6 +201,7 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 #define TD_STSTCS_TABLE_LIST            6
 #define TD_STSTCS_VIEW_LIST             7
 #define TD_STSTCS_SLAVE_STATUS          8
+#define TD_STSTCS_STATUS_VARIABLES      9
 
 /** connect sub operation
  */
@@ -607,13 +608,22 @@ struct handshale_t
 #define TD_VAR_TIMESTAMPMODE      17
 #define TD_VAR_SIZE               18
 
+/* server status variables index */
+#define TD_SVAR_TCP_CONNECTIONS     0
+#define TD_SVAR_TCP_WAIT_THREADS    1
+#define TD_SVAR_TPOOL_CONNECTIONS   2
+#define TD_SVAR_TPOOL_WAIT_THREADS  3
+#define TD_SVAR_PIPE_CONNECTIONS    4
+#define TD_SVAR_PIPE_WAIT_THREADS   5
+#define TD_SVAR_OPEN_DBS            6
+#define TD_SVAR_SIZE                7
 /** @endcond */
 
 /* In the case of "tdclcppxxx" library of msvc, The ($TargetName) is not changed automatically.
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "2"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "3"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -677,8 +687,8 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "2"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "1"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "3"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -714,7 +724,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 2//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 3//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

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

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2013-2016 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
@@ -29,8 +29,12 @@
 /* implemnts in transactd.cpp */
 extern const char* get_trd_sys_var(int index);
 
+/* implemnts in transactd.cpp */
+extern const unsigned int* get_trd_status_var(int index);
 
-extern int getSlaveStatus(THD* thd, bzs::db::transactd::connection::records& recs);
+/* implemnts in mysqlProtocol.cpp */
+extern int getSlaveStatus(THD* thd, bzs::db::transactd::connection::records& recs, 
+         bzs::db::IblobBuffer* bb);
 
 namespace bzs
 {
@@ -195,6 +199,7 @@ const connection::records& connManager::systemVariables() const
             m_records.push_back(connection::record());
             connection::record& rec = m_records[m_records.size() - 1];
             rec.id = i;
+            rec.type = 1;
             switch(i)
             {
             case TD_VER_DB:
@@ -204,13 +209,13 @@ const connection::records& connManager::systemVariables() const
             case TD_VAR_ISOLATION:
             case TD_VAR_AUTHTYPE:
             case TD_VAR_HSLISTENPORT:
-                strncpy(rec.value, p , 65);
+                strncpy(rec.name, p , 65);
                 break;
             case TD_VER_SERVER:
-                sprintf_s(rec.value, 65, "%d.%d.%d", TRANSACTD_VER_MAJOR, TRANSACTD_VER_MINOR, TRANSACTD_VER_RELEASE);
+                sprintf_s(rec.name, 65, "%d.%d.%d", TRANSACTD_VER_MAJOR, TRANSACTD_VER_MINOR, TRANSACTD_VER_RELEASE);
                 break;
             default:
-                _ltoa_s(*((unsigned int*)p), rec.value, 65, 10);
+                _ltoa_s(*((unsigned int*)p), rec.name, 65, 10);
                 break;
             }
         }
@@ -218,6 +223,25 @@ const connection::records& connManager::systemVariables() const
     return m_records;
 }
 
+const connection::records& connManager::statusVariables() const
+{
+    m_records.clear();
+    for (int i = 0 ; i < TD_SVAR_SIZE; ++i)
+    {
+        const unsigned int* p =  ::get_trd_status_var(i);
+        m_records.push_back(connection::record());
+        if (p)
+        {
+            connection::record& rec = m_records[m_records.size() - 1];
+            rec.type = 0;
+            rec.id = i;
+            rec.longValue = *p; 
+        }
+    }
+    return m_records;
+}
+
+
 const connection::records& connManager::definedDatabases() const
 {
     m_records.clear();
@@ -308,13 +332,13 @@ bool connManager::checkGlobalACL(THD* thd, ulong wantAccess) const
         cp_security_ctx(thd)->skip_grants();
     else
         ::setGrant(thd, mod->host(), mod->user(),  NULL);
-	bool ret = (cp_masterAccess(thd) & wantAccess) != 0;
+  bool ret = (cp_masterAccess(thd) & wantAccess) != 0;
     if (!ret)
         m_stat = STATUS_ACCESS_DENIED;
     return ret;
 }
 
-const connection::records& connManager::readSlaveStatus() const
+const connection::records& connManager::readSlaveStatus(blobBuffer* bb) const
 {
     m_records.clear();
     try
@@ -328,7 +352,7 @@ const connection::records& connManager::readSlaveStatus() const
         if (!checkGlobalACL(thd.get(), SUPER_ACL | REPL_CLIENT_ACL))
             return m_records;
 
-        m_stat = errorCode(getSlaveStatus(thd.get(), m_records));
+        m_stat = errorCode(getSlaveStatus(thd.get(), m_records, bb));
     }
     catch (bzs::rtl::exception& e)
     {

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

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_TRANSACTD_CONNMANAGER_H
 #define BZS_DB_TRANSACTD_CONNMANAGER_H
 /*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2013-2016 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
@@ -60,11 +60,12 @@ public:
     connManager(unsigned __int64 me) : m_me(me), m_stat(0){};
     virtual ~connManager();
     const connection::records& systemVariables() const;
+    const connection::records& statusVariables() const;
     const connection::records& getRecords(unsigned __int64 conid, int dbid) const;
     const connection::records& definedDatabases() const;
     const connection::records& schemaTables(const char* dbname) const;
     const connection::records& definedTables(const char* dbname, int type) const;
-    const connection::records& readSlaveStatus() const;
+    const connection::records& readSlaveStatus(blobBuffer* bb) const;
     void disconnect(unsigned __int64 conid);
     void disconnectAll();
     short stat() const {return m_stat;}

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

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_TRANSACTD_CONNECTIONRECORD_H
 #define BZS_DB_TRANSACTD_CONNECTIONRECORD_H
 /*=================================================================
-   Copyright (C) 2013 2016 BizStation Corp All rights reserved.
+   Copyright (C) 2013-2016 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
@@ -117,7 +117,7 @@ struct record
     union
     {
         __int64 conId;                      // 8 byte
-        __int64 longValue; 
+        __int64 longValue;
         struct
         {
             unsigned int delCount;                  
@@ -136,11 +136,7 @@ struct record
         unsigned int type;                           
     };
     
-    union                                   // 67 byte
-    {
-        char name[CON_REC_VALUE_SIZE];
-        char value[CON_REC_VALUE_SIZE];
-    };
+    char name[CON_REC_VALUE_SIZE];           // 67 byte
     union
     {
         char status;                        // 1 byte
@@ -155,17 +151,49 @@ struct record
             char dummy : 2;
         };
     };
-    
+
 
     #ifdef _UNICODE
-    inline _TCHAR* nameW(_TCHAR* buf, int size)
+    inline const wchar_t* t_name(wchar_t* buf, int size) const
     {
         MultiByteToWideChar(CP_UTF8, 0, name, -1, buf, size);
         return buf;
     }
+    const wchar_t* value(wchar_t* buf, int size) const
+    {
+        if (type == 0)
+        {
+            _i64tow_s(longValue, buf, size, 10);
+            return buf;
+        }else if (type == 1)
+        {
+            MultiByteToWideChar(CP_UTF8, 0, name, -1, buf, size);
+            return buf;
+        }
+        MultiByteToWideChar(CP_UTF8, 0, (char*)longValue, -1, buf, size);
+        return buf;
+    }
+    #else
+    inline const char* t_name(char* /*buf*/, int /*size*/) const
+    {
+        return name;
+    }
+    const char* value(char* buf, int size) const
+    {
+        if (type == 0)
+        {
+            _i64toa_s(longValue, buf, size, 10);
+            return buf;
+        }else if (type == 1)
+            return name;
+        return (char*)longValue;
+    }
     #endif
 };                                          // 20 + 68 = 88
+
+#ifdef MYSQL_DYNAMIC_PLUGIN
 typedef std::vector<record> records;
+#endif
 
 } // connection
 } // transactd

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

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2012-2016 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
@@ -338,14 +338,32 @@ const char* get_trd_sys_var(int index)
     return NULL;
 }
 
+
+const unsigned int* get_trd_status_var(int index)
+{
+    switch(index)
+    {
+    case TD_SVAR_TCP_CONNECTIONS:return &cpt::g_connections;
+    case TD_SVAR_TCP_WAIT_THREADS:return &cpt::g_waitThread;
+    case TD_SVAR_TPOOL_CONNECTIONS:return &tpool::g_connections;
+    case TD_SVAR_TPOOL_WAIT_THREADS:return &tpool::server::m_threadPoolSize;
+#ifdef PIPE_SERVER
+    case TD_SVAR_PIPE_CONNECTIONS:return &pipe::g_connections;
+    case TD_SVAR_PIPE_WAIT_THREADS:return &pipe::g_waitThread;
+#endif
+    case TD_SVAR_OPEN_DBS:return &g_openDatabases;
+    };
+    return NULL;
+}
+
 /** show status struct.
  */
 static st_mysql_show_var g_statusVariables[] = {
     { "trnsctd_tcp_connections", (char*)&cpt::g_connections, SHOW_INT },
     { "trnsctd_tcp_wait_threads", (char*)&cpt::g_waitThread, SHOW_INT },
     { "trnsctd_tpool_connections", (char*)&tpool::g_connections, SHOW_INT },
-    { "trnsctd_tpool_threads", (char*)&tpool::server::m_threadPoolSize,
-      SHOW_INT },
+    { "trnsctd_tpool_threads", (char*)&tpool::server::m_threadPoolSize, SHOW_INT },
+
 #ifdef PIPE_SERVER
     { "trnsctd_pipe_connections", (char*)&pipe::g_connections, SHOW_INT },
     { "trnsctd_pipe_wait_threads", (char*)&pipe::g_waitThread, SHOW_INT },

data/source/bzs/test/tdclatl/test_v3.js

@@ -748,14 +748,25 @@ function testConnMgr(uri)
 	var size = recs.size;
 	mgr.RemoveSystemDb(recs);
 	checkNotEqual(size , recs.size,  "RemoveSystemDb recs");
+
+	//sysvar
+	recs = mgr.sysvars();
+	checkEqual(mgr.stat , 0,  "mgr.sysvars");
+	checkEqual(mgr.sysvarName(0) , "database_version",  "mgr.sysvarName");
+
+	//statusvar
+	recs = mgr.statusvars();
+	checkEqual(mgr.stat , 0,  "mgr.statusvars");
+	checkEqual(mgr.statusvarName(0) , "tcp_connections",  "mgr.statusvarName");
 	
 	//slaveStatus
 	recs = mgr.slaveStatus();
 	checkEqual(mgr.stat , 0,  "mgr.slaveStatus");
+	checkEqual(mgr.slaveStatusName(0) , "Slave_IO_State",  "mgr.slaveStatusName");
 	var status = "";
-	/*for (var i = 0; i<recs.size; ++i)
-	   status += (mgr.SlaveStatusName(i) + "\t:" + recs(i).value + "\n");
-	*/
+	for (var i = 0; i<recs.size; ++i)
+	   status += (mgr.slaveStatusName(i) + "\t:" + recs(i).value + "\n");
+	
 	mgr.disconnect();
 	checkEqual(mgr.stat , 0,  "mgr.disconnect");
 	WScript.Echo("\n\n" + status);

data/source/bzs/test/tdclphp/transactd_Test.php

@@ -1856,11 +1856,13 @@ class transactdTest extends PHPUnit_Framework_TestCase
           $expected_count = $expected_count + 1;
         // estimate count
         $count = $tb->recordCount(true);
-        $is_valid_count = (abs($count - $expected_count) < 5000);
+        $this->assertEquals($tb->stat(), 0);
+        $is_valid_count = (abs($count - $expected_count) < 10000);
         $this->assertTrue($is_valid_count);
         if (! $is_valid_count)
           print("true record count = " . $expected_count . " and estimate recordCount count = " . $count);
         $this->assertEquals($tb->recordCount(false), $expected_count); // true count
+        $this->assertEquals($tb->stat(), 0);
         $vv = TEST_COUNT * 3 / 4 + 1;
         $tb->clearBuffer();
         $tb->setFV(FDI_ID, $vv);

data/source/bzs/test/tdclphp/transactd_v3_Test.php

@@ -849,12 +849,21 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($mgr->stat(), 0);
         $this->assertEquals($recs->size(), count($recs));
         $this->assertNotEquals($recs->size(), $size);
-        // slaveStatus
+        //sysvar
+        $recs = $mgr->sysvars();
+        $this->assertEquals($mgr->stat(), 0);
+        $this->assertEquals(bz\connMgr::sysvarName(0), "database_version");
+        //statusvar
+        $recs = $mgr->statusvars();
+        $this->assertEquals($mgr->stat(), 0);
+        $this->assertEquals(bz\connMgr::statusvarName(0), "tcp_connections");
+        //slaveStatus
         $recs = $mgr->slaveStatus();
         $this->assertEquals($mgr->stat(), 0);
+        $this->assertEquals(bz\connMgr::slaveStatusName(0), "Slave_IO_State");
         for ($i = 0; $i < $recs->size(); $i++)
         {
-            echo(PHP_EOL . $mgr->slaveStatusName($i) . "\t:" . $recs[$i]->value);
+            echo(PHP_EOL . bz\connMgr::slaveStatusName($i) . "\t:" . $recs[$i]->value);
         }
         $mgr->disconnect();
         $this->assertEquals($mgr->stat(), 0);