transactd 3.3.0 → 3.4.0

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

@@ -61,8 +61,6 @@ public:
     ~safe_commit_lock();
 };
 
-short getBinlogPos(THD* thd, binlogPos* pos, THD* tmpThd);
-int getSlaveStatus(THD* thd, bzs::db::transactd::connection::records& recs);
 int execSql(THD* thd, const char* sql);
 void readDbList(THD* thd, bzs::db::transactd::connection::records& recs);
 bool setGrant(THD* thd, const char* host, const char* user,  const char* db);

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

@@ -109,6 +109,42 @@ static const _TCHAR* SLAVE_STATUS_NAME[SLAVE_STATUS_DEFAULT_SIZE] =
     _T("Master_Server_Id" ),
 };
 
+static const _TCHAR* SLAVE_STATUS_NAME_EX[SLAVE_STATUS_EX_SIZE] =
+{
+    _T("Master_UUID"),
+    _T("Master_Info_File"),
+    _T("SQL_Delay"),
+    _T("SQL_Remaining_Delay"),
+    _T("Slave_SQL_Running_State"),
+    _T("Master_Retry_Count"),
+    _T("Master_Bind"),
+    _T("Last_IO_Error_Timestamp"),
+    _T("Last_SQL_Error_Timestamp"),
+    _T("Master_SSL_Crl"),
+    _T("Master_SSL_Crlpath"),
+    _T("Retrieved_Gtid_Set"),
+    _T("Executed_Gtid_Set"),
+    _T("Auto_Position"),
+    _T("Replicate_Rewrite_DB"),
+    _T("Channel_Name"),
+};
+
+static const _TCHAR* SLAVE_STATUS_NAME_EX_MA[SLAVE_STATUS_EX_MA_SIZE] =
+{
+    _T("Master_SSL_Crl"),
+    _T("Master_SSL_Crlpath"),
+    _T("Using_Gtid"),
+    _T("Gtid_IO_Pos"),
+    _T("Replicate_Do_Domain_Ids"),
+    _T("Replicate_Ignore_Domain_Ids"),
+    _T("Parallel_Mode"),
+    _T("Retried_transactions"),
+    _T("Max_relay_log_size"),
+    _T("Executed_log_entries"),
+    _T("Slave_received_heartbeats"),
+    _T("Slave_heartbeat_period"),
+    _T("Gtid_Slave_Pos"),
+};
 
 class stringBuffer
 {
@@ -245,6 +281,7 @@ bool connMgr::connect(const _TCHAR* uri)
         btrVersions vs;
         m_db->getBtrVersion(&vs);
         m_pluginVer = vs.versions[VER_IDX_PLUGIN];
+        m_serverVer = vs.versions[VER_IDX_DB_SERVER];
     }
     return ret;
 }
@@ -358,9 +395,6 @@ const connMgr::records& connMgr::slaveStatus()
         m_keynum = TD_STSTCS_SLAVE_STATUS;
         allocBuffer();
         getRecords();
-        if (m_records.size() > SLAVE_STATUS_DEFAULT_SIZE)
-            m_records.resize(SLAVE_STATUS_DEFAULT_SIZE);
-
         // set blob pointers
         setBlobFieldPointer(getBlobHeader());
         return m_records;
@@ -460,13 +494,26 @@ const _TCHAR* connMgr::statusvarName(uint_td index)
     return _T("");
 }
 
-const _TCHAR* connMgr::slaveStatusName(uint_td index)
+const _TCHAR* slaveStatusName1(uint_td index)
 {
     if (index < SLAVE_STATUS_DEFAULT_SIZE)
         return SLAVE_STATUS_NAME[index];
     return _T("");
 }
 
+const _TCHAR* connMgr::slaveStatusName(uint_td index) const
+{
+    bool mariadb = m_serverVer.isMariaDB();
+    if (index < SLAVE_STATUS_DEFAULT_SIZE)
+        return slaveStatusName1(index);
+    index -= SLAVE_STATUS_DEFAULT_SIZE;
+    if(mariadb &&  (index < SLAVE_STATUS_EX_MA_SIZE))
+        return SLAVE_STATUS_NAME_EX_MA[index];
+    else if(!mariadb &&  (index < SLAVE_STATUS_EX_SIZE))
+        return SLAVE_STATUS_NAME_EX[index];
+    return _T("");
+}
+
 } // namespace client
 } // namespace tdap
 } // namespace protocol

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

@@ -73,6 +73,7 @@ private:
     database* m_db;
     std::_tstring m_uri;
     btrVersion m_pluginVer;
+    btrVersion m_serverVer;
     void allocBuffer();
     void writeRecordData(){};
     void onReadAfter(){};
@@ -103,12 +104,12 @@ public:
     void postDisconnectAll();
     short_td stat();
     database* db() const;
+    const _TCHAR* slaveStatusName(uint_td index) const;
     using nstable::tdapErr;
     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/database.cpp

@@ -1136,8 +1136,6 @@ struct fieldChnageInfo
     bool changed;
 };
 
-
-
 void makeChangeInfo(const tabledef* ddef, const tabledef* sdef,
                     fieldChnageInfo* fci, bool& hasBlob)
 {
@@ -1235,32 +1233,51 @@ inline int moveVaileRecord(table* src)
     return 0;
 }
 
+#define MOVE_TYPE_KEY    0
+#define MOVE_TYPE_NONKEY -1
+#define MOVE_TYPE_MULTI  -2
+
 inline void moveNextRecord(table* src, short keyNum)
 {
-
-    if (keyNum == -1)
+    if (keyNum >= MOVE_TYPE_KEY)
+        src->seekNext();
+    else if (keyNum == MOVE_TYPE_NONKEY)
         src->stepNext();
-    else if (keyNum == -2)
-        src->findNext();
     else
-        src->seekNext();
+        src->findNext();
+}
+
+inline char_td findUniqueKeynum(table* src)
+{
+    const tabledef* td =  src->tableDef();
+    if (td->parentKeyNum != 0xff) return td->parentKeyNum;
+    for (int i=0;i<td->keyCount;++i)
+    {
+        const keydef* kd = &td->keyDefs[i];
+        if (kd->segments[0].flags.kf_duplicatable == false)
+            return i;
+    }
+    return -1;
 }
 
 inline void moveFirstRecord(table* src, short keyNum)
 {
-    if (keyNum == -1)
+    if (keyNum >= MOVE_TYPE_KEY)
+    {
+        src->setKeyNum((char_td)keyNum);
+        src->seekFirst();
+    }
+    else if (keyNum == MOVE_TYPE_NONKEY)
         src->stepFirst();
-    else if (keyNum == -2)
+    else
     {
-        src->setKeyNum(0);
         query q;
         q.all().bookmarkAlso(false).reject(0)
-            .limit(src->isUseTransactd() ? 100 : 20);
+            .limit(src->isUseTransactd() ? 500 : 20);
         src->setQuery(&q);
+        src->setKeyNum(findUniqueKeynum(src));
         src->findFirst();
     }
-    else
-        src->seekFirst();
 }
 
 /* Copy from src to dest table.

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

@@ -136,6 +136,8 @@ public:
     void setAutoSchemaUseNullkey(bool v);
     database* createAssociate();
     virtual int defaultAutoIncSpace() const { return 0; };
+    inline bool execSql(const char* utf8Sql){return createTable(utf8Sql);}
+
     static database* create();
     /* For C++ direct only. don't use by wrapper class for COM or SWIG
      This method is ignore refarence count of nsdatabse.

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

@@ -163,11 +163,21 @@ _TCHAR* getErrorMessageLocale(int errorCode, _TCHAR* buf, size_t size)
         p = _T("Cannot create databse. Please check the database exists ")
             _T("already.");
         break;
+    case STATUS_SQL_PARSE_ERROR:
+        p = _T("Sql perse error.");
+        break;
     default:
+    {
+        const _TCHAR* s=_T("");
+        if (errorCode > MYSQL_ERROR_OFFSET)
+        {
+            s = _T(" of mysql error codes");
+            errorCode -= MYSQL_ERROR_OFFSET;
+        }
         _stprintf_s(buf, size, _T("The error occurred by database operation. ")
-                               _T("\nThe error code is %d.\nProcessing is ")
-                               _T("stopped."),
-                    errorCode);
+                               _T("\nThe error code is %d%s.\nProcessing is ")
+                               _T("stopped."), errorCode, s);
+    }
     }
     if (p)
     {

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

@@ -169,11 +169,21 @@ PACKAGE _TCHAR* getErrorMessageLocale(int errorCode, _TCHAR* buf, size_t size)
         p = _T("データベースの作成に失敗しました。既にデータベースが存在してい")
             _T("ないか確認してください。");
         break;
+    case STATUS_SQL_PARSE_ERROR:
+        p = _T("Sql perse error.");
+        break;
     default:
+    {
+        const _TCHAR* s=_T("");
+        if (errorCode > MYSQL_ERROR_OFFSET)
+        {
+            s = _T("MySqlのエラー番号");
+            errorCode -= MYSQL_ERROR_OFFSET;
+        }
         _stprintf_s(buf, 256, _T("データベースオペレーションでエラーが発生しま")
-                              _T("した。\r\nエラー番号は %d \r\n ")
-                              _T("処理を中止します。"),
-                    errorCode);
+                    _T("した。\r\nエラー番号は%s %d \r\n処理を中止します。"),
+                    s ,errorCode);
+    }
     }
     if (p)
     {

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

@@ -2227,7 +2227,8 @@ int field::comp(const field& r, char log) const
     int ret = nullComp(r, log & 0xf);
     if (ret < 2)
         return ret;
-    comp1Func f = getCompFunc(m_fd->type, m_fd->len, log, m_fd->varLenBytes() + m_fd->blobLenBytes());
+    comp1Func f = getCompFunc(m_fd->type, m_fd->len, log | CMPLOGICAL_FIELD,
+                         m_fd->varLenBytes() + m_fd->blobLenBytes());
     return f((const char*)ptr(), (const char*)r.ptr(), r.len());
 }
 

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

@@ -239,9 +239,11 @@ public:
 
     void* ptr() const;
 
-    unsigned char type() const { return m_fd->type; }
+    inline const fielddef* def() const {return m_fd;}
 
-    unsigned short len() const { return m_fd->len; }
+    inline unsigned char type() const { return m_fd->type; }
+
+    inline unsigned short len() const { return m_fd->len; }
 
     inline const _TCHAR* c_str() const { return getFVstr(); }
 

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

@@ -1336,7 +1336,8 @@ public:
     bool checkFindDirection(ushort_td op)
     {
         bool ret;
-        if ((op == TD_KEY_LE_PREV_MULTI) || (op == TD_KEY_PREV_MULTI))
+        if ((op == TD_KEY_LE_PREV_MULTI) || (op == TD_KEY_PREV_MULTI)||
+                (op == TD_POS_PREV_MULTI))
             ret = (direction() == table::findBackForword);
         else
             ret = (direction() == table::findForword);

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

@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <boost/thread/mutex.hpp>
+#include <boost/shared_ptr.hpp>
 #include <bzs/db/protocol/tdap/uri.h>
 
 #ifdef LINUX
@@ -139,6 +140,49 @@ BTRCALLID_PTR getBtrvEntryPoint()
     return BTRCALLIDX;
 }
 
+//------------------------------------------------------------------------------
+struct bpimple
+{
+    boost::shared_ptr<std::string> buf;
+};
+
+binlogPos::binlogPos() : m_impl(new bpimple), gtid(gtid_buf) 
+{
+    gtid_buf[0] = 0x00;
+}
+
+binlogPos::binlogPos(const binlogPos& r) : pos(r.pos), type(r.type),
+                        m_impl(new bpimple(*r.m_impl)) 
+{
+    strcpy_s(filename, BINLOGNAME_SIZE, r.filename);
+    strcpy_s(gtid_buf, GTID_SIZE, r.gtid_buf);
+    gtid = (r.gtid == r.gtid_buf) ? gtid_buf: r.gtid;
+}
+
+binlogPos::~binlogPos(){ delete m_impl;}
+
+void binlogPos::setGtid(const char* p)
+{
+    m_impl->buf.reset(new std::string(p));
+    gtid = m_impl->buf->c_str();
+}
+
+binlogPos& binlogPos::operator=(const binlogPos& r)
+{
+    if (&r != this)
+    {
+        pos = r.pos;
+        type = r.type;
+        strcpy_s(filename, BINLOGNAME_SIZE, r.filename);
+        strcpy_s(gtid_buf, GTID_SIZE, r.gtid_buf);
+        gtid = (r.gtid == r.gtid_buf) ? gtid_buf: r.gtid;
+        *m_impl = *r.m_impl;
+    }
+    return *this;
+}
+
+//------------------------------------------------------------------------------
+
 struct nsdbimpl
 {
     int refCount;
@@ -634,7 +678,7 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
 
     if (m_nsimpl->snapShotCount == 0)
     {
-        uint_td datalen = (bias == CONSISTENT_READ_WITH_BINLOG_POS) ? sizeof(binlogPos) : 0;
+        uint_td datalen = (bias == CONSISTENT_READ_WITH_BINLOG_POS) ? BINLOGPOS_SIZE : 0;
         m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, bpos, &datalen, NULL, 0, 0,
                              m_nsimpl->cidPtr);
 #ifdef TEST_RECONNECT
@@ -647,7 +691,27 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
         }
 #endif
         if (m_stat == 0)
+        {
+            if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
+            {
+                if (bpos->type == REPL_POSTYPE_MARIA_GTID)
+                    bpos->gtid = bpos->gtid_buf;
+                else if(bpos->type == REPL_POSTYPE_GTID)
+                {
+                    const blobHeader* hd;
+                    short stat = m_btrcallid(TD_GET_BLOB_BUF, NULL, &hd, NULL, NULL, 0, 0,
+                             m_nsimpl->cidPtr);
+                    if (stat == 0)
+                    {
+                        assert(hd->rows);
+                        const blobField* f = hd->nextField;
+                        bpos->setGtid(f->data());
+                    }else
+                        bpos->type = REPL_POSTYPE_POS;
+                }
+            }
             m_nsimpl->snapShotCount++;
+        }
     }
     else
         m_nsimpl->snapShotCount++;

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

@@ -57,12 +57,24 @@ DLLLIB BTRCALLID_PTR getTrnsctdEntryPoint();
 pragma_pack1
 #define BINLOGNAME_SIZE 119
 #define GTID_SIZE       64
-struct binlogPos
+#define BINLOGPOS_SIZE  192
+struct DLLLIB binlogPos
 {
+    friend class nsdatabase;
     unsigned long long pos;
     char type;
     char filename[BINLOGNAME_SIZE];
-    char gtid[GTID_SIZE];
+private:
+    char gtid_buf[GTID_SIZE];
+    struct bpimple* m_impl;
+    void setGtid(const char* p);
+public:
+    const char* gtid;
+    binlogPos();
+    binlogPos(const binlogPos& r);
+    ~binlogPos();
+    binlogPos& operator=(const binlogPos& r);
+
 };
 
 

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

@@ -832,6 +832,12 @@ bool table::isReadContinue(ushort_td& op)
         op = filter->isSeeksMode() ?
                 TD_KEY_SEEK_MULTI : (filter->direction() == table::findForword) ?
                         TD_KEY_NEXT_MULTI : TD_KEY_PREV_MULTI;
+
+        if (m_keynum < 0 && op == TD_KEY_NEXT_MULTI)
+            op = TD_POS_NEXT_MULTI;
+        else if (m_keynum < 0 && op == TD_KEY_PREV_MULTI)
+            op = TD_POS_PREV_MULTI;
+
         return true;
     }
     if (m_impl->mraPtr)
@@ -1123,49 +1129,94 @@ void table::find(eFindType type)
 
 void table::findFirst()
 {
-    seekFirst();
-    if (m_stat == 0)
+    if (m_keynum >= 0)
     {
-        if (m_impl->filterPtr)
+        seekFirst();
+        if (m_stat == 0)
+        {
+            if (m_impl->filterPtr)
+            {
+                m_impl->filterPtr->setPosTypeNext(false);
+                getRecords(TD_KEY_NEXT_MULTI);
+            }
+        }
+    }else
+    {
+        stepFirst();
+        if (m_stat == 0)
         {
-            m_impl->filterPtr->setPosTypeNext(false);
-            getRecords(TD_KEY_NEXT_MULTI);
+            if (m_impl->filterPtr)
+            {
+                m_impl->filterPtr->setPosTypeNext(false);
+                getRecords(TD_POS_NEXT_MULTI);
+            }
         }
     }
 }
 
 void table::findLast()
 {
-    seekLast();
-    if (m_stat == 0)
+    if (m_keynum >= 0)
     {
-        if (m_impl->filterPtr)
+        seekLast();
+        if (m_stat == 0)
         {
-            m_impl->filterPtr->setPosTypeNext(false);
-            getRecords(TD_KEY_PREV_MULTI);
+            if (m_impl->filterPtr)
+            {
+                m_impl->filterPtr->setPosTypeNext(false);
+                getRecords(TD_KEY_PREV_MULTI);
+            }
+        }
+    }else
+    {
+        stepLast();
+        if (m_stat == 0)
+        {
+            if (m_impl->filterPtr)
+            {
+                m_impl->filterPtr->setPosTypeNext(false);
+                getRecords(TD_POS_PREV_MULTI);
+            }
         }
     }
 }
 
 void table::findNext(bool notIncCurrent)
 {
-
-    if (m_impl->filterPtr)
+    if (m_keynum >= 0)
     {
-        short op = m_impl->filterPtr->isSeeksMode() ? TD_KEY_SEEK_MULTI
-                                                    : TD_KEY_NEXT_MULTI;
-        doFind(op, notIncCurrent);
+        if (m_impl->filterPtr)
+        {
+            short op = m_impl->filterPtr->isSeeksMode() ? TD_KEY_SEEK_MULTI
+                                                        : TD_KEY_NEXT_MULTI;
+            doFind(op, notIncCurrent);
+        }
+        else if (notIncCurrent == true)
+            seekNext();
+    }else
+    {
+        if (m_impl->filterPtr)
+            doFind(TD_POS_NEXT_MULTI, notIncCurrent);
+        else if (notIncCurrent == true)
+            stepNext();
     }
-    else if (notIncCurrent == true)
-        seekNext();
 }
 
 void table::findPrev(bool notIncCurrent)
 {
-    if (m_impl->filterPtr)
-        doFind(TD_KEY_PREV_MULTI, notIncCurrent);
-    else if (notIncCurrent == true)
-        seekPrev();
+    if (m_keynum >= 0)
+    {
+        if (m_impl->filterPtr)
+            doFind(TD_KEY_PREV_MULTI, notIncCurrent);
+        else if (notIncCurrent == true)
+            seekPrev();
+    }else
+    {
+        if (m_impl->filterPtr)
+            doFind(TD_POS_PREV_MULTI, notIncCurrent);
+        else if (notIncCurrent == true)
+            stepPrev();
+    }
 }
 
 void table::setPrepare(const pq_handle stmt)

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

@@ -1269,14 +1269,23 @@ typedef transaction<dbmanager_ptr> dbmTransaction;
 template <class DB> class snapshot
 {
     DB m_db;
+    bool m_started;
 
 public:
     snapshot(DB db, short bias = CONSISTENT_READ, binlogPos* bpos=NULL) : m_db(db)
     {
         m_db->beginSnapshot(bias, bpos);
+        m_started = true;
     }
 
-    ~snapshot() { m_db->endSnapshot(); }
+    void end()
+    {
+        if (m_started) 
+            m_db->endSnapshot();
+        m_started = false;
+    }
+
+    ~snapshot() { end(); }
 };
 
 /** snapshot for database */