transactd 3.4.1 → 3.5.0

data/build/tdclrb/CMakeLists.txt

@@ -72,7 +72,8 @@ endif()
 if(WIN32)
   link_directories("${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common")
 else()
- link_directories("../tdclcpp")
+  cmake_policy(SET CMP0015 OLD)
+  link_directories(../tdclcpp)
 endif()
 
 
@@ -145,11 +146,11 @@ if(TRANSACTD_HAVE_RB_THREAD_CALL_WITHOUT_GVL)
 endif()
 if(MSVC)
   set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
-    WIN32 _WIN32 _WINDOWS _USRDLL BOOST_ALL_NO_LIB 
-    LIB_TDCLCPP TRDCL_AUTOLINK TRDCLENGN_EXPORTS _CRT_SECURE_NO_WARNINGS)
+    WIN32 _WIN32 _WINDOWS _USRDLL
+    TRDCL_AUTOLINK TRDCLENGN_EXPORTS _CRT_SECURE_NO_WARNINGS)
 else()
   set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
-    PIC _REENTRANT BOOST_ALL_NO_LIB)
+    PIC _REENTRANT)
   if(NOT MINGW)
     set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
       LINUX)

data/build/tdclrb/tdclrb.rc

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

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

@@ -2094,7 +2094,7 @@ void table::readRecords(IReadRecordsHandler* hdr, bool includeCurrent, int type,
                         bool noBookmark)
 {
 
-    if ((m_table->file->inited == handler::NONE) || !m_cursor)
+    if ((m_table->file->inited == handler::NONE) || (m_table->file->inited == handler::INDEX && !m_cursor))
     {
         m_stat = STATUS_NO_CURRENT;
         return;
@@ -2108,50 +2108,58 @@ void table::readRecords(IReadRecordsHandler* hdr, bool includeCurrent, int type,
     // dummy bookmark , use if bobbokmark=true
     unsigned int tmp = 0;
     const uchar* bm = (unsigned char*)&tmp;
-
+    uint poslen = posPtrLen();
+    short tmp_stat = 0;
+    bool inTrn = m_db.inSnapshot() || m_db.inTransaction();
     // Is a current position read or not?
     bool read = !includeCurrent;
     bool forword = 
         (type == READ_RECORD_GETNEXT) || (type == READ_RECORD_STEPNEXT);
+
     while ((reject != 0) && (rows != 0))
     {
         if (read)
         {
             unlockRow(false);
-
-            if (type == READ_RECORD_GETNEXT)
-                m_stat = m_table->file->ha_index_next(m_table->record[0]);
-            else if (type == READ_RECORD_GETPREV)
-                m_stat = m_table->file->ha_index_prev(m_table->record[0]);
-            else if (type == READ_RECORD_STEPNEXT)
-                m_stat = m_table->file->ha_rnd_next(m_table->record[0]);
-            else if (type == READ_RECORD_STEPPREV)
+            switch(type)
             {
+            case READ_RECORD_GETNEXT:
+                m_stat = m_table->file->ha_index_next(m_table->record[0]);break;
+            case READ_RECORD_GETPREV:
+                m_stat = m_table->file->ha_index_prev(m_table->record[0]);break;
+            case READ_RECORD_STEPNEXT:
+                m_stat = m_table->file->ha_rnd_next(m_table->record[0]);break;
+            default: //READ_RECORD_STEPPREV
+                setCursorStaus();
                 m_stat = STATUS_NOSUPPORT_OP;
                 return;
             }
-            setCursorStaus();
+            //setCursorStaus();
         }
         else
             read = true;
 
         if (m_stat)
+        {
+            tmp_stat = m_stat;
             break;
+        }
         int ret = hdr->match(forword);
         if (ret == REC_MACTH)
         {
-
             if (!noBookmark)
                 bm = position();
-            m_stat = hdr->write(bm, posPtrLen());
-            if (m_stat)
+            tmp_stat = hdr->write(bm, poslen);
+            if (tmp_stat)
                 break;
             --rows;
         }else
         {
-            unlock();
+            if (inTrn) unlock();
+                
             if (ret == REC_NOMACTH_NOMORE)
             {
+                setCursorStaus();
                 m_stat = STATUS_REACHED_FILTER_COND;
                 return;
             }
@@ -2159,6 +2167,8 @@ void table::readRecords(IReadRecordsHandler* hdr, bool includeCurrent, int type,
                 --reject;
         }
     }
+    setCursorStaus();
+    m_stat = tmp_stat;
     if (reject == 0)
         m_stat = STATUS_LIMMIT_OF_REJECT;
 }
@@ -2722,6 +2732,26 @@ void table::getCreateSql(String* s)
     cp_store_create_info(m_db.thd(), &tables, s, NULL, (int)FALSE);
 }
 
+void table::setValue(int index, const std::string& v, int type)
+{
+    Field* field = *(m_table->field + index);
+    if ((v.size() == 1) && (v[0] == 0x00))
+        field->set_null();
+    else
+        field->set_notnull();
+    if ((type == UPDATE_INC) || (type == UPDATE_DEC))
+    {
+        __int64 old = field->val_int();
+        __int64 intv = _atoi64(v.c_str());
+        if (type == UPDATE_INC)
+            field->store(old + intv, false);
+        else
+            field->store(old - intv, false);
+    }
+    else
+        field->store(v.c_str(), (uint)v.size(), &my_charset_bin);
+}
+
 #ifdef USE_HANDLERSOCKET
 
 int table::fieldIndexByName(const char* name) const
@@ -2744,26 +2774,6 @@ void table::setUseFieldList(const std::string& csv)
         addUseField(fieldIndexByName(values[i].c_str()));
 }
 
-void table::setValue(int index, const std::string& v, int type)
-{
-    Field* field = *(m_table->field + index);
-    if ((v.size() == 1) && (v[0] == 0x00))
-        field->set_null();
-    else
-        field->set_notnull();
-    if ((type == UPDATE_INC) || (type == UPDATE_DEC))
-    {
-        __int64 old = field->val_int();
-        __int64 intv = _atoi64(v.c_str());
-        if (type == UPDATE_INC)
-            field->store(old + intv, false);
-        else
-            field->store(old - intv, false);
-    }
-    else
-        field->store(v.c_str(), (uint)v.size(), &my_charset_bin);
-}
-
 void table::setUseValues(const std::vector<std::string>& values, int type)
 {
     for (int i = 0; i < (int)values.size(); i++)

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

@@ -78,6 +78,9 @@ class table;
  */
 #define REF_SIZE_MAX 112
 
+#define UPDATE_REPLACE 0
+#define UPDATE_INC 1
+#define UPDATE_DEC 2
 
 
 /** Control mysql table cahche
@@ -346,7 +349,6 @@ class table : private boost::noncopyable
     bookmarks* bms();
     int percentage(uchar* first, uchar* last, uchar* cur);
 
-    bool setNonKey(bool scan = false);
     void fillNull(uchar* ptr, int size);
 
     inline void* keybuf() const { return &m_keybuf[0]; }
@@ -382,19 +384,12 @@ class table : private boost::noncopyable
     std::vector<int> m_useFields;
     void checkFiledIndex(int index);
     int fieldIndexByName(const char* name) const;
-
     void addUseField(int index) { m_useFields.push_back(index); };
-
 public:
     std::vector<int>& useFields() { return m_useFields; };
     void setUseFieldList(const std::string& csv);
-    void setValue(int index, const std::string& v, int type);
     void setUseValues(const std::vector<std::string>& values, int type);
 
-#define UPDATE_REPLACE 0
-#define UPDATE_INC 1
-#define UPDATE_DEC 2
-
 #endif
 
 public:
@@ -524,6 +519,7 @@ public:
     {
         return (1U << m_table->key_info[(int)m_keyNum].user_defined_key_parts) - 1;
     }
+    bool setNonKey(bool scan = false);
     unsigned long long tableFlags() const { return m_table->file->ha_table_flags();}
     void seekKey(enum ha_rkey_function find_flag, key_part_map keyMap);
     void getNextSame(key_part_map keyMap);
@@ -779,6 +775,8 @@ public:
     inline void setTimestampAlways(bool v) { m_timestampAlways = v;}
 
     void getCreateSql(String* s);
+
+    void setValue(int index, const std::string& v, int type);
 };
 
 class fieldBitmap

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

@@ -157,6 +157,17 @@ void dbManager::releaseDatabase(short cid)
             m_handles.erase(m_handles.begin() + i);
 }
 
+int dbManager::trxProcessing()
+{
+    int transactins = 0;
+    for (size_t i = 0; i < m_dbs.size(); i++)
+    {
+        if (m_dbs[i]->inTransaction() || m_dbs[i]->inSnapshot())
+            ++transactins;
+    }
+    return transactins;
+}
+
 database* dbManager::useDataBase(int id) const
 {
     if (id >= (int)m_dbs.size())

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

@@ -99,6 +99,7 @@ public:
     bool isShutDown() const;
     const databases& dbs() const { return m_dbs; }
     boost::mutex& mutex() { return m_mutex; }
+    int trxProcessing();
 };
 
 } // namespace mysql

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

@@ -0,0 +1,174 @@
+/*=================================================================
+   Copyright (C) 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
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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
+   02111-1307, USA.
+=================================================================*/
+#include <my_config.h>
+# include <string>
+#include <boost/thread.hpp>
+#include "ha.h"
+#include "mysqlInternal.h"
+#include <bzs/env/fileopen.h>
+#include <bzs/db/protocol/tdap/tdapcapi.h>
+
+/* implemnts in transactd.cpp */
+extern unsigned int g_startup_ha;
+
+unsigned int g_ha;
+bool trx_blocking = trx_noblock;
+
+namespace bzs
+{
+namespace db
+{
+namespace engine
+{
+namespace mysql
+{
+
+#define roleInfoName "transactd_srv_master"
+
+
+boost::recursive_try_mutex g_tmtx_ha;
+boost::try_mutex g_tmtx_trx;
+
+int getRoleFromFile()
+{
+    int ret = -1;
+    char filename[FN_REFLEN];
+    fn_format(filename, roleInfoName, "", ".info", MY_REPLACE_EXT | MY_UNPACK_FILENAME);
+    FILE* fp = fileOpen(filename, "r");
+    if (fp)
+    {
+        char buf[20];
+        char* p = fgets(buf, 20, fp);
+        if (p && *p)
+            ret = atol(p);
+        fclose(fp);
+    }else
+        sql_print_error("Transactd: File : %s was not opened for read", filename);
+    return ret;
+}
+
+bool saveRoleToFile(int role)
+{
+    char filename[FN_REFLEN];
+    fn_format(filename, roleInfoName, "", ".info", MY_REPLACE_EXT | MY_UNPACK_FILENAME);
+    FILE* fp = fileOpen(filename, "w");
+    if (fp)
+    {
+        const char* p = (role == HA_ROLE_MASTER) ? "1" : 
+                    ((role == HA_ROLE_NONE) ? "2" : "0");
+        fputs(p, fp);
+        fclose(fp);
+        return true;
+    }
+    sql_print_error("Transactd: File : %s was not opened for write", filename);
+    return true;
+}
+
+int initHa()
+{
+    boost::recursive_try_mutex::scoped_lock lck(g_tmtx_ha);
+    g_ha = g_startup_ha & ~HA_RESTORE_ROLE;
+    if (g_startup_ha & HA_RESTORE_ROLE)
+    {
+        int ret = getRoleFromFile();
+        if (ret != -1)
+            g_ha |= (unsigned int)ret;
+    }
+    return g_ha;
+}
+
+bool haLock()
+{
+    return g_tmtx_ha.try_lock();
+}
+
+bool haUnlock()
+{
+#ifdef _WIN32
+    if (g_tmtx_ha.locking_thread_id)
+    {
+        g_tmtx_ha.unlock();
+        return true;
+    }
+    return false;
+#else
+    g_tmtx_ha.unlock();
+    return true;
+#endif
+}
+
+bool setRole(int role)
+{
+    int ret = getRole();
+    if (ret != role)
+    {
+        if (g_tmtx_ha.try_lock())
+        {
+            g_ha &= ~(HA_ROLE_MASTER | HA_ROLE_NONE);
+            g_ha |= role;
+            saveRoleToFile(role);
+            g_tmtx_ha.unlock();
+            return true;
+        }
+        return false;
+    }
+    return true;
+}
+
+int getRole()
+{
+    return (g_ha & (HA_ROLE_MASTER | HA_ROLE_NONE));
+}
+
+bool setEnableFailover(bool enable)
+{
+    if (g_tmtx_ha.try_lock())
+    {
+        if (enable)
+            g_ha |= HA_ENABLE_FAILOVER;
+        else
+            g_ha &= ~HA_ENABLE_FAILOVER;
+        g_tmtx_ha.unlock();
+        return true;
+    }
+    return false;
+}
+
+bool getEnableFailover()
+{
+    return (g_ha & HA_ENABLE_FAILOVER) != 0;
+}
+
+bool setTrxBlock(bool v)
+{
+    if (g_tmtx_trx.try_lock())
+    {
+        trx_blocking = v ? trx_block : trx_noblock;
+        g_tmtx_trx.unlock();
+        return true;
+    }
+    return false;
+}
+
+
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
+