transactd 3.2.1 → 3.3.0

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

@@ -54,6 +54,17 @@ static const _TCHAR* SYSVAR_NAME[TD_VAR_SIZE] =
     _T("timestamp_always)")
 };
 
+static const _TCHAR* STATUSVAR_NAME[TD_VAR_SIZE] =
+{
+    _T("tcp_connections"),
+    _T("tcp_wait_threads"),
+    _T("tpool_connections"),
+    _T("tpool_threads"),
+    _T("pipe_connections"),
+    _T("pipe_wait_threads"),
+    _T("cur_open_databases"),
+};
+
 static const _TCHAR* SLAVE_STATUS_NAME[SLAVE_STATUS_DEFAULT_SIZE] =
 {
     _T("Slave_IO_State"),
@@ -98,6 +109,55 @@ static const _TCHAR* SLAVE_STATUS_NAME[SLAVE_STATUS_DEFAULT_SIZE] =
     _T("Master_Server_Id" ),
 };
 
+
+class stringBuffer
+{
+	friend class connMgr;
+	std::vector<char> m_buf;
+public:
+	inline void resize(size_t size) { m_buf.resize(size); }
+	inline char* ptr() { return &m_buf[0]; }
+	inline size_t size() const { return m_buf.size(); }
+};
+
+//-----------------------------------------------------------------------------
+//    class connRecords
+//-----------------------------------------------------------------------------
+connRecords::connRecords(){}
+
+connRecords::connRecords(const connRecords& r) :
+    m_records(r.m_records), m_buf(r.m_buf) {}
+
+connRecords& connRecords::operator=(const connRecords& r)
+{
+    if (this != &r)
+    {
+    	m_records = r.m_records;
+	    m_buf = r.m_buf;
+    }
+    return *this;
+}
+
+void connRecords::clear() { m_records.clear(); m_buf.reset(); }
+
+const connRecords::record& connRecords::operator[] (int index) const
+{
+    return m_records[index];
+}
+
+connRecords::record& connRecords::operator[] (int index)
+{
+    return m_records[index];
+}
+
+size_t connRecords::size() const { return m_records.size(); }
+
+connRecords* connRecords::create(){ return new connRecords();}
+
+void connRecords::release(){ delete this;}
+
+//-----------------------------------------------------------------------------
+
 #pragma pack(push, 1)
 pragma_pack1
 struct oldRrecord
@@ -271,6 +331,26 @@ const connMgr::records& connMgr::schemaTables(const _TCHAR* dbname)
     return doDefinedTables(dbname, TD_STSTCS_SCHEMA_TABLE_LIST);
 }
 
+void connMgr::setBlobFieldPointer(const blobHeader* hd)
+{
+    if (!hd) return;
+    assert(hd->curRow < hd->rows);
+    m_records.m_buf.reset(new stringBuffer());
+    m_records.m_buf->resize(hd->dataSize + 100);
+    const blobField* f = hd->nextField;
+
+    char* p = m_records.m_buf->ptr();
+    for (int i = 0; i < hd->fieldCount; ++i)
+    {
+        memcpy(p, f->data(), f->size);
+        m_records[f->fieldNum].longValue = (__int64)p;
+        p += f->size;
+        *p = 0x00;
+        ++p;
+        f = f->next();
+    }
+}
+
 const connMgr::records& connMgr::slaveStatus()
 {
     if ((m_pluginVer.majorVersion >= 3) && (m_pluginVer.minorVersion >= 2))
@@ -280,8 +360,11 @@ const connMgr::records& connMgr::slaveStatus()
         getRecords();
         if (m_records.size() > SLAVE_STATUS_DEFAULT_SIZE)
             m_records.resize(SLAVE_STATUS_DEFAULT_SIZE);
+
+        // set blob pointers
+        setBlobFieldPointer(getBlobHeader());
         return m_records;
-    }
+   }
     m_stat = STATUS_NOSUPPORT_OP;
     m_records.resize(0);
     return m_records;
@@ -294,6 +377,13 @@ const connMgr::records& connMgr::sysvars()
     return getRecords();
 }
 
+const connMgr::records& connMgr::statusvars()
+{
+    m_keynum = TD_STSTCS_STATUS_VARIABLES;
+    allocBuffer();
+    return getRecords();
+}
+
 const connMgr::records& connMgr::connections()
 {
     m_keynum = TD_STSTCS_READ;
@@ -352,7 +442,7 @@ void connMgr::removeSystemDb(connMgr::records& recs)
             (strcmp(recs[i].name, "performance_schema")==0) ||
             (strcmp(recs[i].name, "information_schema")==0) ||
             (strcmp(recs[i].name, "sys")==0))
-        recs.erase(recs.begin() + i);
+        recs.erase(/*recs.begin() +*/ i);
     }
 }
 
@@ -363,6 +453,13 @@ const _TCHAR* connMgr::sysvarName(uint_td index)
     return _T("");
 }
 
+const _TCHAR* connMgr::statusvarName(uint_td index)
+{
+    if (index < TD_SVAR_SIZE)
+        return STATUSVAR_NAME[index];
+    return _T("");
+}
+
 const _TCHAR* connMgr::slaveStatusName(uint_td index)
 {
     if (index < SLAVE_STATUS_DEFAULT_SIZE)

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

@@ -37,15 +37,38 @@ namespace client
 
 class database;
 class connMgr;
+class stringBuffer;
 typedef boost::shared_ptr<connMgr> connMgr_ptr;
 
+class DLLLIB connRecords
+{
+    typedef bzs::db::transactd::connection::record record;
+	friend class connMgr;
+	std::vector<record> m_records;
+	boost::shared_ptr<stringBuffer> m_buf;
+	inline void resize(size_t size) { m_records.resize(size); }
+	inline void erase(size_t index) { m_records.erase(m_records.begin() + index); }
+
+public:
+    connRecords();
+    connRecords(const connRecords& r);
+    connRecords& operator=(const connRecords& r);
+	const record& operator[] (int index) const;
+	record& operator[] (int index);
+	size_t size() const;
+	void clear();
+    void release();
+    static connRecords* create();
+};
+
 class DLLLIB connMgr : private nstable  // no copyable
 {
+
 public:
     typedef bzs::db::transactd::connection::record record;
-    typedef std::vector<record> records;
+	typedef connRecords records;
 private:
-    std::vector<record> m_records;
+	connMgr::records m_records;
     __int64 m_params[2];
     database* m_db;
     std::_tstring m_uri;
@@ -59,6 +82,7 @@ private:
     explicit connMgr(const connMgr& r);  //no copyable
     connMgr& operator=(const connMgr& r); //no copyable
     const connMgr::records& doDefinedTables(const _TCHAR* dbname, int type);
+    void setBlobFieldPointer(const bzs::db::blobHeader* bd);
     explicit connMgr(database* db);
 
 public:
@@ -71,6 +95,7 @@ public:
     const records& schemaTables(const _TCHAR* dbname);
     const records& slaveStatus();
     const records& sysvars();
+    const records& statusvars();
     const records& connections();
     const records& inUseDatabases(__int64 connid);
     const records& inUseTables(__int64 connid, int dbid);
@@ -82,6 +107,7 @@ public:
     using nstable::release;
     static void removeSystemDb(records& recs);
     static const _TCHAR* sysvarName(uint_td index);
+    static const _TCHAR* statusvarName(uint_td index);
     static const _TCHAR* slaveStatusName(uint_td index);
     static connMgr* create(database* db);
 };

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

@@ -1,5 +1,5 @@
 /* =================================================================
- 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
@@ -861,6 +861,23 @@ void nstable::dropIndex(bool NoRenumber)
         m_keynum -= ((uchar_td)0x80);
 }
 
+const blobHeader* nstable::getBlobHeader()
+{
+    short stat = m_stat;
+    const blobHeader* p;
+    /*backup current data buffer*/
+    const void* tmp = data();
+    setData(&p);
+    tdap(TD_GET_BLOB_BUF);
+    /*restore data buffer*/
+    setData((void*)tmp);
+    std::swap(stat, m_stat);
+
+    if (stat)
+        return NULL;
+    return p;
+}
+
 short_td nstable::doBtrvErr(HWND hWnd, _TCHAR* retbuf)
 {
     return tdapErr(hWnd, m_stat, m_impl->uri, retbuf);
@@ -976,6 +993,7 @@ void nstable::throwError(const _TCHAR* caption, nstable* tb)
     THROW_BZS_ERROR_WITH_CODEMSG(tb->stat(), tmp2);
 }
 
+#pragma warn -8060
 _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
 {
     bool uri = false;
@@ -990,7 +1008,7 @@ _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
     _TUCHAR* p = _tcsmrchr((_TUCHAR*)buf, '=');
     if (p)
         *(p+1) = 0x00;
-    else if (p = _tcsmrchr((_TUCHAR*)buf, '?'))
+    else if ((p = _tcsmrchr((_TUCHAR*)buf, '?')))
         *p = 0x00;
     else if ((p = _tcsmrchr((_TUCHAR*)buf, PSEPARATOR_C)) && (uri == false))
         *p = 0x00;
@@ -1005,6 +1023,7 @@ _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
     }
     return buf;
 }
+#pragma warn .8060
 
 /* Get file name from full path name.
  *

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

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_CLIENT_NSTABLE_H
 #define BZS_DB_PROTOCOL_TDAP_CLIENT_NSTABLE_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
@@ -144,6 +144,7 @@ protected:
     void destroy();
     void setShared();
     void seekByBookmark(bookmark_td* bm, ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    const bzs::db::blobHeader* getBlobHeader();
 public:
     explicit nstable(nsdatabase* pbe);
     void addref(void);

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

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2014 BizStation Corp All rights reserved.
+   Copyright (C) 2014-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
@@ -130,7 +130,7 @@ void serializeExecutable(Archive& ar, executable& exec, const unsigned int versi
         int v = (int)exec.isEnabled();
         ar& make_nvp("enabled", v);
         if (Archive::is_loading::value)
-            exec.setEnabled(v);
+            exec.setEnabled(v != 0);
     }
 }
 

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

@@ -1,5 +1,5 @@
 /* =================================================================
- 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
@@ -731,11 +731,11 @@ uint_td table::doRecordCount(bool estimate, bool fromCurrent)
             seekByBookmark(bm);
         m_impl->exBookMarking = false;
         m_stat = tmpStat;
-        if (m_stat == STATUS_EOF)
-            m_stat = 0;
     }
     else
-        return nstable::doRecordCount(estimate, fromCurrent);
+        result = nstable::doRecordCount(estimate, fromCurrent);
+    if (m_stat == STATUS_EOF)
+        m_stat = 0;
 
     return result;
 }
@@ -1617,22 +1617,7 @@ void table::addSendBlob(const blob* blob)
     m_stat = stat;
 }
 
-const blobHeader* table::getBlobHeader()
-{
-    short stat = m_stat;
-    const blobHeader* p;
-    /*backup current data buffer*/
-    const void* tmp = data();
-    setData(&p);
-    tdap(TD_GET_BLOB_BUF);
-    /*restore data buffer*/
-    setData((void*)tmp);
-    std::swap(stat, m_stat);
 
-    if (stat)
-        return NULL;
-    return p;
-}
 
 unsigned char* table::setBlobFieldPointer(char* ptr, const blobHeader* hd, unsigned char* to)
 {

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

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_CLIENT_TABLE_H
 #define BZS_DB_PROTOCOL_TDAP_CLIENT_TABLE_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
@@ -106,7 +106,6 @@ class DLLLIB table : public nstable
     uchar_td charset() const;
     bool checkIndex(short index) const;
     void getKeySpec(keySpec* ks, bool SpecifyKeyNum = false);
-    const bzs::db::blobHeader* getBlobHeader();
     unsigned char* setBlobFieldPointer(char* ptr, const ::bzs::db::blobHeader* p,
                                         unsigned char* to=NULL);
     void addSendBlob(const bzs::db::blob* blob);

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

@@ -53,6 +53,13 @@ inline static void readStatusCheck(table& tb, const _TCHAR* name)
         nstable::throwError(name, tb.stat());
 }
 
+template <class T>
+void validateStatus(const T& obj, const _TCHAR* caption)
+{
+    if (obj->stat())
+        nstable::throwError(caption, obj->stat());
+}
+
 class indexNavi
 {
 

data/source/bzs/db/protocol/tdap/myDateTime.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
@@ -34,6 +34,7 @@ namespace protocol
 namespace tdap
 {
 #pragma warning(disable : 4996)
+#pragma warn -8056
 #ifdef _WIN32
 const wchar_t wtime_format_ms[] = L"%02d:%02d:%02d.%0*u";
 const wchar_t wtime_format[] = L"%02d:%02d:%02d";
@@ -913,7 +914,7 @@ wchar_t* myTimeStamp::timeStr(wchar_t* p, size_t size) const
 
 
 #pragma warning(default : 4996)    
-
+#pragma warn .8056
 
 } // namespace tdap
 } // namespace protocol

data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.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
@@ -16,7 +16,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
-
 #include "tdapCommandExecuter.h"
 #include "recordsetReader.h"
 #include <bzs/db/blobBuffer.h>
@@ -102,10 +101,10 @@ std::string getDatabaseName(const request& req, bool forSql)
 {
     std::vector<std::string> ssc;
     std::vector<std::string> ss;
-	const char* p = (const char*)req.keybuf;
-	if (p && p[0])
+    const char* p = (const char*)req.keybuf;
+    if (p && p[0])
     {
-		std::string s(p);
+        std::string s(p);
         split(ssc, s, "\t");
         if (ssc.size())
         {
@@ -287,17 +286,17 @@ std::string dbExecuter::makeSQLcreateTable(const request& req)
 bool isMetaDb(const request& req)
 {
     char buf[MAX_PATH];
-	const char* p = (const char*)req.keybuf;
-	char_m* st = NULL;
-	if (p && p[0])
-	{
-		strncpy(buf, p, MAX_PATH);
-		_strlwr(buf);
-		st = _mbsstr((char_m*)buf, (char_m*)BdfNameTitle);
-		if (st == NULL)
-			st = (char_m*)strstr(buf, TRANSACTD_SCHEMANAME);
-	}
-	return (st != NULL);
+    const char* p = (const char*)req.keybuf;
+    char_m* st = NULL;
+    if (p && p[0])
+    {
+        strncpy(buf, p, MAX_PATH);
+        _strlwr(buf);
+        st = _mbsstr((char_m*)buf, (char_m*)BdfNameTitle);
+        if (st == NULL)
+            st = (char_m*)strstr(buf, TRANSACTD_SCHEMANAME);
+    }
+    return (st != NULL);
 }
 
 inline bool getUserPasswd(request& req, char* &user, char* &pwd)
@@ -429,7 +428,7 @@ inline bool dbExecuter::doCreateTable(request& req)
             {
                 if (req.result == 0)
                 {
-					std::string dbname = db->name();
+                    std::string dbname = db->name();
                     dbManager::releaseDatabase(req.cid);
                     req.result = ddl_dropDataBase(dbname, dbSqlname, req.cid);
                     if (ER_DB_DROP_EXISTS+ MYSQL_ERROR_OFFSET == req.result) req.result = 0;
@@ -1087,7 +1086,7 @@ inline void dbExecuter::doInsertBulk(request& req)
             smartBulkInsert sbi(m_tb, *n);
             for (ushort_td i = 0; i < *n; i++)
             {
-				ushort_td len = *((ushort_td*)pos);
+                ushort_td len = *((ushort_td*)pos);
                 if (pos + len > (const uchar*)req.data + *req.datalen)
                 {
                     ret = STATUS_BUFFERTOOSMALL;
@@ -1136,7 +1135,7 @@ inline void dbExecuter::doGetSchema(request& req, netsvc::server::netWriter* nw)
         THD* thd = db->thd();
         std::string name = getTableName(req);
         tables.init_one_table(dbname.c_str(), dbname.size(), name.c_str(),
-		            name.size(), name.c_str(), TL_READ);
+                name.size(), name.c_str(), TL_READ);
         uint key_length= cp_get_table_def_key(thd, &tables, &keyPtr);
         if (!cp_tdc_open_view(thd, &tables, name.c_str(), key, key_length, OPEN_VIEW_NO_PARSE))
         {
@@ -1159,7 +1158,7 @@ inline void dbExecuter::doGetSchema(request& req, netsvc::server::netWriter* nw)
         String s;
         m_tb = getTable(req.pbk->handle);
         m_tb->getCreateSql(&s);
-		unsigned int len = (unsigned int)s.length();
+        unsigned int len = (unsigned int)s.length();
         if (len+1 <= *req.datalen)
         {
             char* p = nw->curPtr() - sizeof(unsigned short);// orver write row space
@@ -1768,11 +1767,11 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
 
 void makeRandomKey(unsigned char *buf, unsigned int size)
 {
-  unsigned char *end= buf + size;
-  std::random_device rnd;
-  for (; buf < end; buf++)
-    *buf = (unsigned char)(rnd() * 94 + 33);
-  *buf= 0x00;
+	unsigned char *end= buf + size;
+	std::random_device rnd;
+	for (; buf < end; buf++)
+		*buf = (unsigned char)(rnd() * 94 + 33);
+	*buf= 0x00;
 }
 
 size_t dbExecuter::getAcceptMessage(char* message, size_t size)
@@ -1818,15 +1817,19 @@ size_t dbExecuter::getAcceptMessage(char* message, size_t size)
 // ---------------------------------------------------------------------------
 //      class connMgrExecuter
 // ---------------------------------------------------------------------------
-connMgrExecuter::connMgrExecuter(request& req, unsigned __int64 parent)
-    : m_req(req), m_modHandle(parent)
+connMgrExecuter::connMgrExecuter(request& req, unsigned __int64 parent, blobBuffer* bb)
+    : m_req(req), m_modHandle(parent), m_blobBuffer(bb) 
 {
+    m_blobBuffer->clear();
 }
 
-int serialize(request& req, char* buf, size_t& size, const connection::records& records, short stat)
+int serialize(request& req, char* buf, size_t& size, const connection::records& records, short stat
+        , blobBuffer* bb = NULL)
 {
     req.reset();
     req.paramMask = P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYBUF;
+    if (bb && bb->fieldCount())
+        req.paramMask |= P_MASK_BLOBBODY;
     if (records.size())
         req.data = (void*)&records[0];
     else
@@ -1862,6 +1865,13 @@ int connMgrExecuter::systemVariables(char* buf, size_t& size)
     return serialize(m_req, buf, size, records, st.stat());
 }
 
+int connMgrExecuter::statusVariables(char* buf, size_t& size)
+{
+    connManager st(m_modHandle);
+    const connection::records& records = st.statusVariables();
+    return serialize(m_req, buf, size, records, st.stat());
+}
+
 int connMgrExecuter::schemaTables(char* buf, size_t& size)
 {
     connManager st(m_modHandle);
@@ -1883,11 +1893,16 @@ int connMgrExecuter::definedViews(char* buf, size_t& size)
     return serialize(m_req, buf, size, records, st.stat());
 }
 
-int connMgrExecuter::slaveStatus(char* buf, size_t& size)
+int connMgrExecuter::slaveStatus(netsvc::server::netWriter* nw)
 {
     connManager st(m_modHandle);
-    const connection::records& records = st.readSlaveStatus();
-    return serialize(m_req, buf, size, records, st.stat());
+    const connection::records& records = st.readSlaveStatus(m_blobBuffer);
+    int v =  serialize(m_req, nw->ptr(), nw->datalen, records, st.stat(), m_blobBuffer);
+    short dymmy = 0;
+    if ((m_req.result == 0) && m_blobBuffer->fieldCount())
+        nw->datalen = m_req.serializeBlobBody(m_blobBuffer, nw->ptr(), nw->datalen,
+                                         FILE_MAP_SIZE, nw->optionalData(), dymmy);
+    return v;
 }
 
 int connMgrExecuter::disconnectOne(char* buf, size_t& size)
@@ -1926,6 +1941,8 @@ int connMgrExecuter::commandExec(netsvc::server::netWriter* nw)
             return definedDatabases(nw->ptr(), nw->datalen);
         case TD_STSTCS_SYSTEM_VARIABLES:
             return systemVariables(nw->ptr(), nw->datalen);
+        case TD_STSTCS_STATUS_VARIABLES:
+            return statusVariables(nw->ptr(), nw->datalen);
         case TD_STSTCS_SCHEMA_TABLE_LIST:
             return schemaTables(nw->ptr(), nw->datalen);
         case TD_STSTCS_TABLE_LIST:
@@ -1933,7 +1950,7 @@ int connMgrExecuter::commandExec(netsvc::server::netWriter* nw)
         case TD_STSTCS_VIEW_LIST:
             return definedViews(nw->ptr(), nw->datalen);
         case TD_STSTCS_SLAVE_STATUS:
-            return slaveStatus(nw->ptr(), nw->datalen);
+            return slaveStatus(nw);
         default:
             m_req.reset();
             m_req.result = STATUS_NOSUPPORT_OP;