transactd 3.2.1 → 3.3.0

data/build/tdclc/tdclc.cbproj

@@ -62,7 +62,7 @@
         <VerInfo_Locale>1041</VerInfo_Locale>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_3_2</DllSuffix>
+        <DllSuffix>_3_3</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,0,195
- PRODUCTVERSION 3,2,0,195
+ FILEVERSION 3,3,0,198
+ PRODUCTVERSION 3,3,0,198
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "3.2.0.195"
+            VALUE "FileVersion", "3.3.0.198"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.2.0.195"
+            VALUE "ProductVersion", "3.3.0.198"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,1,195
- PRODUCTVERSION 3,2,1,195
+ FILEVERSION 3,3,0,198
+ PRODUCTVERSION 3,3,0,198
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "3.2.1.195"
+            VALUE "FileVersion", "3.3.0.198"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.2.1.195"
+            VALUE "ProductVersion", "3.3.0.198"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp_bc.cbproj

@@ -153,7 +153,7 @@
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <TD_VER_MAJOR>3</TD_VER_MAJOR>
-        <TD_VER_MINOR>2</TD_VER_MINOR>
+        <TD_VER_MINOR>3</TD_VER_MINOR>
         <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
         <TD_CPU>32</TD_CPU>
     </PropertyGroup>

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,1,195
- PRODUCTVERSION 3,2,1,195
+ FILEVERSION 3,3,0,198
+ PRODUCTVERSION 3,3,0,198
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "3.2.1.195"
+            VALUE "FileVersion", "3.3.0.198"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.2.1.195"
+            VALUE "ProductVersion", "3.3.0.198"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/source/bzs/db/IBlobBuffer.h

@@ -18,10 +18,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
-#include <boost/asio/buffer.hpp>
+//#include <boost/asio/buffer.hpp>
 #include <vector>
 #include "blobStructs.h"
 
+namespace boost{namespace asio{class const_buffer;}}
 namespace bzs
 {
 namespace db

data/source/bzs/db/blobBuffer.h

@@ -22,6 +22,7 @@
 #include "IBlobBuffer.h"
 #include <assert.h>
 #include <boost/shared_array.hpp>
+#include <boost/asio/buffer.hpp>
 
 extern unsigned int g_pipeCommSharememSize;
 #define FILE_MAP_SIZE (g_pipeCommSharememSize - 1024)
@@ -109,11 +110,11 @@ public:
      *  result buffer image
      *  ---------------------------
      *  n               record image
-     *  2				fieldNum
-     *	4				dataLength
-     *  n(dataLength)	data
-     *  2				null terminate
-     *  2				fieldNum ...
+     *  2       fieldNum
+     *  4       dataLength
+     *  n(dataLength) data
+     *  2       null terminate
+     *  2       fieldNum ...
      *  ----------------------------
      */
 
@@ -165,11 +166,11 @@ public:
      *  result buffer image
      *  ---------------------------
      *  n               record image
-     *  2				fieldNum
-     *	4				dataLength
-     *  n(dataLength)	data
-     *  2				null terminate
-     *  2				fieldNum ...
+     *  2       fieldNum
+     *  4       dataLength
+     *  n(dataLength) data
+     *  2       null terminate
+     *  2       fieldNum ...
      *  ----------------------------
      */
     unsigned int writeBuffer(unsigned char* buffer, unsigned int maxsize,

data/source/bzs/db/engine/mysql/database.cpp

@@ -290,11 +290,19 @@ void database::addDbName(const std::string& dbname)
     secx->security_ctx.restore_security_context(m_thd, &secx->security_ctx);
 
     //Get Grant
-    bool ret = ::setGrant(m_thd, m_backup_sctx->cp_priv_host(), m_backup_sctx->cp_priv_user(), dbname.c_str());
-    if (ret)
-        check_access(m_thd, SELECT_ACL, dbname.c_str(), &secx->privilege, NULL, false, true);
-    
-    //Restore current ctx
+	if (m_backup_sctx->cp_master_accsess() == (ulong)~NO_ACCESS)
+		cp_security_ctx(m_thd)->skip_grants();
+	else
+	{
+		const char* user = m_backup_sctx->cp_priv_user();
+		const char* host = m_backup_sctx->cp_priv_host();
+		bool ret = ::setGrant(m_thd, host ? host : "", user ? user : "", dbname.c_str());
+		if (ret)
+			check_access(m_thd, SELECT_ACL, dbname.c_str(), &secx->privilege, NULL, false, true);
+		else
+			secx->privilege = 0;
+	}
+	//Restore current ctx
     restoreSctx();
 }
 
@@ -2639,26 +2647,6 @@ const char* table::valStr(int fieldNum, int& size)
     return m_str.c_ptr();
 }
 
-uint table::makeBlobFieldList(int fieldNum)
-{
-    m_blobBuffer->clear();
-    int st = fieldNum == -1 ? 0 : fieldNum;
-    int en = fieldNum == -1 ? m_table->s->fields : fieldNum + 1;
-    uint count = 0;
-    for (int i = st; i < en; i++)
-    {
-        Field* fd = m_table->field[fieldNum];
-        if (isBlobType(fd->type()))
-        {
-            m_blobBuffer->addBlob(blob_len(fd), fd->field_index,
-                                  fd->ptr + blob_var_bytes(fd));
-            count++;
-        }
-    }
-    m_blobBuffer->setFieldCount(count);
-    return count;
-}
-
 inline void setSegmentValue(const KEY_PART_INFO& segment, const std::string& v)
 {
     segment.field->set_notnull();

data/source/bzs/db/engine/mysql/database.h

@@ -679,15 +679,8 @@ public:
     void endBulkInsert();
 
     inline TABLE* internalTable() { return m_table; }
-    /// for debuglog
-    const char* valStr(int index, int& size);
-    /// for debuglog
 
-    /** add blob field list.
-     *  @param fieldNum field index if it is -1 then all fields of cureent row;
-     *  @return field count of listed.
-     */
-    uint makeBlobFieldList(int fieldNum);
+    const char* valStr(int index, int& size);
 
     inline void addBlobBuffer(int fieldNum)
     {

data/source/bzs/db/engine/mysql/mysqlProtocol.cpp

@@ -22,9 +22,10 @@
 #endif
 
 #include "mysqlProtocol.h"
-#include "mysqlThd.h"
 #include <bzs/env/crosscompile.h>
 #include <bzs/db/protocol/tdap/tdapcapi.h>
+#include <bzs/db/IBlobBuffer.h>
+#include "mysqlThd.h"
 
 #if defined(USE_BINLOG_VAR) && (!defined(MARIADB_BASE_VERSION) &&  MYSQL_VERSION_ID > 50600)
 #  include "sql/binlog.h"
@@ -46,28 +47,28 @@
 
 class dummyProtocol : public Protocol_mysql
 {
-	THD* m_thd;
+  THD* m_thd;
     Protocol_mysql* m_backup;
     
 public:
 #if defined(MYSQL_5_7)
-	inline dummyProtocol(THD *thd_arg) : Protocol_mysql()
-	{
-		m_thd = thd_arg;
+  inline dummyProtocol(THD *thd_arg) : Protocol_mysql()
+  {
+    m_thd = thd_arg;
         m_backup = m_thd->get_protocol();
-		m_thd->set_protocol(this);
-	}
-	inline virtual ~dummyProtocol()
+    m_thd->set_protocol(this);
+  }
+  inline virtual ~dummyProtocol()
     {
         m_thd->set_protocol(m_backup);    
     }
 #else
-	inline dummyProtocol(THD *thd_arg) : Protocol_mysql(thd_arg)
-	{
-		m_thd = thd_arg;
+  inline dummyProtocol(THD *thd_arg) : Protocol_mysql(thd_arg)
+  {
+    m_thd = thd_arg;
         m_backup = m_thd->protocol;
         m_thd->protocol = this;
-	}
+  }
     inline virtual ~dummyProtocol()
     {
         m_thd->protocol = m_backup;       
@@ -91,7 +92,7 @@ public:
                      const CHARSET_INFO* /*tocs*/){return false;}
 
     virtual bool send_out_parameters(List<Item_param> *sp_params){return false;}
-	virtual Protocol::enum_protocol_type type(void){ return CP_PROTOCOL; };
+  virtual Protocol::enum_protocol_type type(void){ return CP_PROTOCOL; };
 #ifdef MARIADB_BASE_VERSION      //Mariadb 5.5 10.0 10.1
     virtual bool store(MYSQL_TIME *time, int decimals){return false;}
     virtual bool store_time(MYSQL_TIME *time, int decimals){ return false;}
@@ -101,28 +102,28 @@ public:
     virtual bool store(const char *from, size_t length, 
         CHARSET_INFO *fromcs, CHARSET_INFO *tocs){return false;}
 #elif defined(MYSQL_5_7) 
-	bool store_decimal(const my_decimal *, uint, uint){ return true; }
-	bool store(Proto_field *){ return true; }
-	void start_row(){}
-	int read_packet(void){ return 0; }
-	int get_command(COM_DATA *, enum_server_command *){ return m_thd->lex->sql_command; }
-	enum_vio_type connection_type(void){ return VIO_TYPE_PLUGIN; }
-	ulong get_client_capabilities(void){ return 0; }
-	bool has_client_capability(unsigned long){ return false; }
-	bool connection_alive(void){ return false; }
-	bool end_row(void){ return false; }
-	void abort_row(void){}
-	void end_partial_result_set(void){}
-	int shutdown(bool){ return 0; }
-	SSL_handle get_ssl(void){ return NULL; }
-	uint get_rw_status(void){ return 0; }
-	bool get_compression(void){ return false; }
-	bool start_result_metadata(uint, uint, const CHARSET_INFO *){ return false; }
-	bool send_field_metadata(Send_field *, const CHARSET_INFO *){ return false; }
-	bool end_result_metadata(void){ return false; }
-	bool send_ok(uint, uint, ulonglong, ulonglong, const char *){ return false; }
-	bool send_eof(uint, uint){ return false; }
-	bool send_error(uint, const char *, const char *){ return false; }
+  bool store_decimal(const my_decimal *, uint, uint){ return true; }
+  bool store(Proto_field *){ return true; }
+  void start_row(){}
+  int read_packet(void){ return 0; }
+  int get_command(COM_DATA *, enum_server_command *){ return m_thd->lex->sql_command; }
+  enum_vio_type connection_type(void){ return VIO_TYPE_PLUGIN; }
+  ulong get_client_capabilities(void){ return 0; }
+  bool has_client_capability(unsigned long){ return false; }
+  bool connection_alive(void){ return false; }
+  bool end_row(void){ return false; }
+  void abort_row(void){}
+  void end_partial_result_set(void){}
+  int shutdown(bool){ return 0; }
+  SSL_handle get_ssl(void){ return NULL; }
+  uint get_rw_status(void){ return 0; }
+  bool get_compression(void){ return false; }
+  bool start_result_metadata(uint, uint, const CHARSET_INFO *){ return false; }
+  bool send_field_metadata(Send_field *, const CHARSET_INFO *){ return false; }
+  bool end_result_metadata(void){ return false; }
+  bool send_ok(uint, uint, ulonglong, ulonglong, const char *){ return false; }
+  bool send_eof(uint, uint){ return false; }
+  bool send_error(uint, const char *, const char *){ return false; }
 #endif
 };
 
@@ -149,7 +150,7 @@ public:
     {
         if (!m_writed)
         {
-			strncpy(m_bpos->filename, from, BINLOGNAME_SIZE); 
+      strncpy(m_bpos->filename, from, BINLOGNAME_SIZE); 
             m_writed = true;
         }
         return false;
@@ -159,7 +160,7 @@ public:
     {
         if (!m_writed)
         {
-			strncpy(m_bpos->filename, from, BINLOGNAME_SIZE);
+      strncpy(m_bpos->filename, from, BINLOGNAME_SIZE);
             m_writed = true;
         }
         return false;
@@ -181,11 +182,11 @@ bool safe_commit_lock::lock()
     if (m_thd)
     {
         MDL_request mdl_request;
-		#if ((MYSQL_VERSION_NUM > 50700) && !defined(MARIADB_BASE_VERSION))
-		mdl_request.init_with_source(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT, __FILE__, __LINE__);
-		#else
-		mdl_request.init(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT);
-		#endif
+    #if ((MYSQL_VERSION_NUM > 50700) && !defined(MARIADB_BASE_VERSION))
+    mdl_request.init_with_source(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT, __FILE__, __LINE__);
+    #else
+    mdl_request.init(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT);
+    #endif
         if (m_thd->mdl_context.acquire_lock(&mdl_request,
                                     m_thd->variables.lock_wait_timeout))
             return false;
@@ -233,9 +234,9 @@ safe_commit_lock::~safe_commit_lock()
             {
                 sprintf_s(bpos->gtid, GTID_SIZE, "%u-%u-%llu", gtid.domain_id, gtid.server_id, gtid.seq_no); 
                 size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
-			    strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
-			    bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
-			    bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
+          strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
+          bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
+          bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
             }
         }
         return 0;
@@ -248,10 +249,10 @@ safe_commit_lock::~safe_commit_lock()
     {
         if (mysql_bin_log.is_open())
         {
-			size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
-			strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
-			bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
-			bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
+      size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
+      strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
+      bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
+      bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
             bpos->type = REPL_POSTYPE_POS;
         }
         return 0;
@@ -270,7 +271,7 @@ int execSql(THD* thd, const char* sql)
 {
     thd->variables.lock_wait_timeout = OPEN_TABLE_TIMEOUT_SEC;
     thd->clear_error();
-	int result = cp_query_command(thd, (char*)sql);
+  int result = cp_query_command(thd, (char*)sql);
     if (thd->is_error())
         result = thd->cp_get_sql_error();
     cp_lex_clear(thd); // reset values for insert
@@ -284,17 +285,23 @@ using namespace bzs::db::transactd;
 class slaveStatus : public dummyProtocol
 {
     connection::records& m_records;
+    bzs::db::IblobBuffer* m_bb;
+    int m_blobfields;
     connection::record& getRec()
     {
         m_records.push_back(connection::record());
         return m_records[m_records.size() - 1];
     }
 public:
-    inline slaveStatus(THD *thd_arg, connection::records& recs) : 
-        dummyProtocol(thd_arg), m_records(recs)
+    inline slaveStatus(THD *thd_arg, connection::records& recs, bzs::db::IblobBuffer* bb) : 
+        dummyProtocol(thd_arg), m_records(recs), m_bb(bb), m_blobfields(0)
     {
         m_records.clear();   
     }
+    ~slaveStatus()
+    {
+        m_bb->setFieldCount(m_blobfields);
+    }
     bool store_longlong(longlong from, bool unsigned_flag)
     {
         connection::record& rec = getRec();
@@ -306,34 +313,44 @@ public:
     {
         connection::record& rec = getRec();
         rec.type = 1;
-        strncpy(rec.value, "NULL", CON_REC_VALUE_SIZE); 
+        strncpy(rec.name, "NULL", CON_REC_VALUE_SIZE); 
         return false;
     }
-#if (MYSQL_VERSION_ID < 50600 || defined(MARIADB_BASE_VERSION)) // MySQL 5.5 
-    bool store(const char *from, size_t length, CHARSET_INFO *cs)
+    bool str_store(const char *from, size_t length)
     {
         connection::record& rec = getRec();
         rec.type = 1;
         if (length && from)
-            strncpy(rec.value, from, CON_REC_VALUE_SIZE); 
+        {
+            if (length >= CON_REC_VALUE_SIZE)
+            {
+                ++m_blobfields;
+                rec.type = 2;
+                m_bb->addBlob((unsigned int)length, (unsigned short)(m_records.size() -1),
+                        (const unsigned char*)from);
+            }else
+                strncpy(rec.name, from, CON_REC_VALUE_SIZE);
+        }
         return false;
     }
+
+#if (MYSQL_VERSION_ID < 50600 || defined(MARIADB_BASE_VERSION)) // MySQL 5.5 
+    bool store(const char *from, size_t length, CHARSET_INFO *cs)
+    {
+        return str_store(from, length);
+    }
 #else
     bool store(const char *from, size_t length, const CHARSET_INFO *cs)
     {
-        connection::record& rec = getRec();
-        rec.type = 1;
-        if (length && from)
-            strncpy(rec.value, from, CON_REC_VALUE_SIZE); 
-        return false;
+        return str_store(from, length);
     }
 #endif
 };
 
-int getSlaveStatus(THD* thd, connection::records& recs)
+int getSlaveStatus(THD* thd, connection::records& recs, bzs::db::IblobBuffer* bb)
 {
-	slaveStatus ss(thd, recs);
-	return execSql(thd, "show slave status");
+  slaveStatus ss(thd, recs, bb);
+  return execSql(thd, "show slave status");
 }
 
 #pragma GCC diagnostic warning "-Woverloaded-virtual"
@@ -373,23 +390,23 @@ bool setGrant(THD* thd, const char* host, const char* user,  const char* db)
 {
     // sctx->master_access and sctx->db_access
     return (acl_getroot(cp_security_ctx(thd), cp_strdup(user, MYF(0)),
-		cp_strdup(host, MYF(0)), cp_strdup(host, MYF(0)), (char*)db)) == false;
+    cp_strdup(host, MYF(0)), cp_strdup(host, MYF(0)), (char*)db)) == false;
 }
 
 bool copyGrant(THD* thd, THD* thdSrc, const char* db)
 {
     Security_context* sctx = cp_security_ctx(thdSrc);
-	if (sctx->cp_master_accsess() == (ulong)~NO_ACCESS)
+  if (sctx->cp_master_accsess() == (ulong)~NO_ACCESS)
     {
         cp_security_ctx(thd)->skip_grants();
         return true;
     }
-	return setGrant(thd, sctx->cp_priv_host(), sctx->cp_priv_user(), db);
+  return setGrant(thd, sctx->cp_priv_host(), sctx->cp_priv_user(), db);
 }
 
 void setDbName(THD* thd, const char* name)
 {
-	cp_set_db(thd, name);
+  cp_set_db(thd, name);
 }
 
 /*