transactd 2.3.0 → 2.4.0

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

@@ -269,6 +269,8 @@ int dbExecuter::errorCode(int ha_error)
         return STATUS_CANNOT_LOCK_TABLE;
     else if(ha_error == ER_BAD_DB_ERROR)
         return ERROR_NO_DATABASE;
+    else if(ha_error == ER_NO_SUCH_TABLE)
+        return STATUS_TABLE_NOTOPEN;
     return MYSQL_ERROR_OFFSET + ha_error;
 }
 
@@ -475,7 +477,7 @@ inline bool dbExecuter::doCreateTable(request& req)
 
 
 // open table and assign handle
-inline bool dbExecuter::doOpenTable(request& req)
+inline bool dbExecuter::doOpenTable(request& req, bool reconnect)
 {
     database* db;
     bool ret = getDatabaseWithAuth(req, &db);
@@ -494,7 +496,8 @@ inline bool dbExecuter::doOpenTable(request& req)
             }
              // if error occured that throw no exception
             tb = db->openTable(getTableName(req), req.keyNum, getOwnerName(req)); 
-            req.result = db->stat();
+            if (db->stat())
+                req.result = (short_td)errorCode(db->stat());
         }
         
         if (tb)
@@ -505,7 +508,16 @@ inline bool dbExecuter::doOpenTable(request& req)
                 uint hdl = addHandle(getDatabaseID(req.cid), tb->id());
                 m_tb = getTable(hdl);
                 req.pbk->handle = hdl;
-                req.paramMask = P_MASK_POSBLK;
+                if (!reconnect)
+                {
+                    ushort_td len = m_tb->posPtrLen();
+                    if ((m_tb->tableFlags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) && !m_tb->primaryKey())
+                        len = 0xFFFF;
+                    memcpy(req.data, &len , sizeof(ushort_td));
+                    req.resultLen = sizeof(ushort_td);
+                    req.paramMask = P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN;
+                }else
+                    req.paramMask = P_MASK_POSBLK;
             }
             catch (bzs::rtl::exception& e)
             {
@@ -686,7 +698,7 @@ inline int dbExecuter::doReadMulti(request& req, int op,
     bool execPrepared = (ereq->itype & FILTER_TYPE_SUPPLYVALUE) != 0;
 
     bool forword = (op == TD_KEY_NEXT_MULTI) || (op == TD_POS_NEXT_MULTI);
-    if (op == TD_KEY_SEEK_MULTI)
+    if (op == TD_KEY_SEEK_MULTI && !(ereq->itype & FILTER_TYPE_SEEKS_BOOKMARKS))
     {
         char keynum = m_tb->keyNumByMakeOrder(req.keyNum);
         if (!m_tb->setKeyNum(keynum))
@@ -713,8 +725,14 @@ inline int dbExecuter::doReadMulti(request& req, int op,
         if (req.result != 0)
             return ret;
         if (op == TD_KEY_SEEK_MULTI)
-            req.result =
-                errorCodeSht(seekEach((extRequestSeeks*)req.data, noBookmark));
+        {
+            if (ereq->itype & FILTER_TYPE_SEEKS_BOOKMARKS)
+                req.result =
+                    errorCodeSht(seekBookmarkEach((extRequestSeeks*)req.data, noBookmark));
+            else
+                req.result =
+                    errorCodeSht(seekEach((extRequestSeeks*)req.data, noBookmark));
+        }
         else
         {
             if (op == TD_KEY_NEXT_MULTI)
@@ -769,6 +787,34 @@ inline __int64 intValue(const unsigned char* p, int len)
     return 0;
 }
 
+//FILTER_TYPE_SEEKS_BOOKMARKS
+inline short dbExecuter::seekBookmarkEach(extRequestSeeks* ereq, bool noBookmark)
+{
+    short stat = 0;
+    seek* fd = &ereq->seekData;
+
+    for (int i = 0; i < ereq->logicalCount; ++i)
+    {
+        m_tb->movePos((uchar*)fd->ptr, -1);
+        if (m_tb->stat() == 0)
+        {
+            if (noBookmark)
+                stat = m_readHandler->write((const unsigned char *)_T("dummy"), 0);
+            else
+                stat =
+                    m_readHandler->write(m_tb->position(), m_tb->posPtrLen());
+        }
+        else
+            stat = m_readHandler->write(NULL, 0);
+        if (stat)
+            break;
+        fd = fd->next();
+    }
+    if (stat == 0)
+        stat = STATUS_REACHED_FILTER_COND;
+    return stat;
+}
+
 inline short dbExecuter::seekEach(extRequestSeeks* ereq, bool noBookmark)
 {
 
@@ -1184,7 +1230,7 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             break;
         case TD_RECONNECT:
 
-            if (!doOpenTable(req))
+            if (!doOpenTable(req, true))
             {
                 req.result = ERROR_TD_INVALID_CLINETHOST;
                 break;
@@ -1337,8 +1383,15 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             m_tb = getTable(req.pbk->handle);
             if (m_tb)
             {
+                std::string tbname = m_tb->name();
                 m_tb->close();
                 m_tb = NULL;
+                if ((req.keyNum == CR_SUBOP_DROP) && (tbname == TRANSACTD_SCHEMANAME))
+                {
+                    database* db = getDatabaseCid(req.cid);
+                    req.result = ddl_dropTable(db, tbname, db->name(), tbname);
+                }
+                
             }
             break;
         case TD_BUILD_INDEX:
@@ -1528,21 +1581,43 @@ connMgrExecuter::connMgrExecuter(request& req, unsigned __int64 parent)
 {
 }
 
+int serialize(request& req, char* buf, size_t& size, const connManager::records& records, short stat)
+{
+    req.reset();
+    req.paramMask = P_MASK_DATA | P_MASK_DATALEN;
+    if (records.size())
+        req.data = (void*)&records[0];
+    else
+        req.paramMask = P_MASK_DATALEN;
+    req.resultLen = (uint_td)(sizeof(record) * records.size());
+    req.result = stat;
+    size = req.serialize(NULL, buf);
+    return EXECUTE_RESULT_SUCCESS;
+}
+
 int connMgrExecuter::read(char* buf, size_t& size)
 {
     connManager st(m_modHandle);
     unsigned __int64* mod = (unsigned __int64*)m_req.keybuf;
+    return serialize(m_req, buf, size, st.getRecords(mod[0], (int)mod[1]), st.stat());
+}
 
-    const connManager::records& records = st.getRecords(mod[0], (int)mod[1]);
-    m_req.reset();
-    m_req.paramMask = P_MASK_DATA | P_MASK_DATALEN;
-    if (records.size())
-        m_req.data = (void*)&records[0];
-    else
-        m_req.paramMask = P_MASK_DATALEN;
-    m_req.resultLen = (uint_td)(sizeof(record) * records.size());
-    size = m_req.serialize(NULL, buf);
-    return EXECUTE_RESULT_SUCCESS;
+int connMgrExecuter::definedDatabaseList(char* buf, size_t& size)
+{
+    connManager st(m_modHandle);
+    return serialize(m_req, buf, size, st.getDefinedDatabaseList(), st.stat());
+}
+
+int connMgrExecuter::systemVariables(char* buf, size_t& size)
+{
+    connManager st(m_modHandle);
+    return serialize(m_req, buf, size, st.systemVariables(), st.stat());
+}
+
+int connMgrExecuter::schemaTableList(char* buf, size_t& size)
+{
+    connManager st(m_modHandle);
+    return serialize(m_req, buf, size, st.schemaTableList((const char*)m_req.keybuf), st.stat());
 }
 
 int connMgrExecuter::disconnectOne(char* buf, size_t& size)
@@ -1558,7 +1633,6 @@ int connMgrExecuter::disconnectOne(char* buf, size_t& size)
 int connMgrExecuter::disconnectAll(char* buf, size_t& size)
 {
     connManager st(m_modHandle);
-
     st.disconnectAll();
     m_req.reset();
     size = m_req.serialize(NULL, buf);
@@ -1573,6 +1647,12 @@ int connMgrExecuter::commandExec(netsvc::server::netWriter* nw)
         return disconnectOne(nw->ptr(), nw->datalen);
     else if (m_req.keyNum == TD_STSTCS_DISCONNECT_ALL)
         return disconnectAll(nw->ptr(), nw->datalen);
+    else if(m_req.keyNum == TD_STSTCS_DATABASE_LIST)
+        return definedDatabaseList(nw->ptr(), nw->datalen);
+    else if(m_req.keyNum == TD_STSTCS_SYSTEM_VARIABLES)
+        return systemVariables(nw->ptr(), nw->datalen);
+    else if(m_req.keyNum == TD_STSTCS_SCHEMA_TABLE_LIST)
+        return schemaTableList(nw->ptr(), nw->datalen);
     return 0;
 }
 

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

@@ -43,7 +43,6 @@ namespace db
 {
 class blobBuffer;
 namespace engine{namespace mysql{class database;}}
-
 namespace protocol
 {
 namespace tdap
@@ -72,7 +71,7 @@ class dbExecuter : public engine::mysql::dbManager
     std::string makeSQLcreateTable(const request& req);
     bool connect(request& req);
     inline bool doCreateTable(request& req);
-    inline bool doOpenTable(request& req);
+    inline bool doOpenTable(request& req, bool reconnect=false);
     inline void doSeekKey(request& req, int op, engine::mysql::rowLockMode* lock);
     inline void doMoveFirst(request& req, engine::mysql::rowLockMode* lock);
     inline void doMoveKey(request& req, int op, engine::mysql::rowLockMode* lock);
@@ -89,6 +88,7 @@ class dbExecuter : public engine::mysql::dbManager
     inline void doInsertBulk(request& req);
     inline void doStat(request& req);
     inline short seekEach(extRequestSeeks* ereq, bool noBookMark);
+    inline short seekBookmarkEach(extRequestSeeks* ereq, bool noBookmark);
     inline bool doAuthentication(request& req, engine::mysql::database* db);
     bool getDatabaseWithAuth(request& req, engine::mysql::database** db, bool connect=false);
 public:
@@ -97,7 +97,7 @@ public:
     int commandExec(request& req, netsvc::server::netWriter* nw);
     size_t getAcceptMessage(char* message, size_t size);
     int errorCode(int ha_error);
-    short_td errorCodeSht(int ha_error)
+    inline short_td errorCodeSht(int ha_error)
     {
         return (short_td)errorCode(ha_error);
     }
@@ -111,11 +111,14 @@ class connMgrExecuter
     request& m_req;
     __int64 m_modHandle;
 
-public:
-    connMgrExecuter(request& req, unsigned __int64 parent);
+    int definedDatabaseList(char* buf, size_t& size);
+    int schemaTableList(char* buf, size_t& size);
+    int systemVariables(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);
     int commandExec(netsvc::server::netWriter* nw);
 };
 
@@ -150,9 +153,11 @@ public:
 
     bool isShutDown() { return m_dbExec->isShutDown(); }
 
-    void cleanup(){};
+    void cleanup(){}
+
+    const engine::mysql::databases& dbs() const { return m_dbExec->dbs(); }
 
-    const engine::mysql::databases& dbs() const { return m_dbExec->dbs(); };
+    boost::mutex& mutex() { return m_dbExec->mutex(); }
 };
 
 } // namespace mysql

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

@@ -82,8 +82,6 @@ namespace client {class table;}
     P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYBUF
 #define P_MASK_INS_AUTOINC P_MASK_MOVPOS
 
-#pragma pack(push, 1)
-pragma_pack1;
 
 
 #define CLIENTID_SIZE                   2
@@ -99,6 +97,8 @@ typedef void*(__STDCALL* DDBA_PTR)(client::table* tb, uint_td size);
 
 /** tdap version info struct
  */
+#pragma pack(push, 1)
+pragma_pack1;
 
 struct version
 {
@@ -107,9 +107,6 @@ struct version
     uchar_td Type;
 };
 
-#pragma pack(push, 1)
-pragma_pack1;
-
 struct posblk
 {
     posblk() { memset(this, 0, sizeof(posblk)); }
@@ -120,9 +117,7 @@ struct posblk
     unsigned char lock;
     unsigned char bookmarkLen;
     char bookmark[1]; //dummy array
-};
-#pragma pack(pop)
-pragma_pop;
+};
 
 struct clientID
 {

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

@@ -275,15 +275,7 @@ const char* tabledef::toChar(char* buf, const char* s, int size)
 
 #endif // NOT _UNICODE
 
-bool isStringType(uchar_td type)
-{
-    return ((type == ft_string) || (type == ft_zstring) ||
-            (type == ft_wstring) || (type == ft_wzstring) ||
-            (type == ft_myvarchar) || (type == ft_myvarbinary) ||
-            (type == ft_mywvarchar) || (type == ft_mywvarbinary) ||
-            (type == ft_myblob) || (type == ft_mytext) || (type == ft_mychar) ||
-            (type == ft_mywchar) || (type == ft_lstring) || (type == ft_note));
-}
+
 
 bool fielddef::isStringType() const
 {

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

@@ -182,7 +182,37 @@ PACKAGE ushort_td
 #endif // MYSQL_DYNAMIC_PLUGIN
 
 /* Is field type string ? */
-PACKAGE bool isStringType(uchar_td type);
+inline bool isStringTypeForIndex(uchar_td type)
+{
+    switch (type)
+    {
+    case ft_string:
+    case ft_zstring:
+    case ft_wstring:
+    case ft_wzstring:
+    case ft_mychar:
+    case ft_mywchar:
+    case ft_myvarchar:
+    case ft_myvarbinary:
+    case ft_mywvarchar:
+    case ft_mywvarbinary:
+        return true;
+    }
+    return false;
+}
+
+inline bool isStringType(uchar_td type)
+{
+    switch (type)
+    {
+    case ft_myblob:
+    case ft_mytext:
+    case ft_lstring:
+    case ft_note:
+        return true;
+    }
+    return isStringTypeForIndex(type);
+}
 
 /** @cond INTERNAL */
 #define PAD_CHAR_OPTION_SAVED   1

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

@@ -29,11 +29,23 @@ typedef void           void_td;
 typedef short          short_td;
 typedef unsigned char  uchar_td;
 typedef char           char_td;
-typedef uint_td        bookmark_td;
 typedef int            percentage_td;
-
 typedef ushort_td      keylen_td;
 
+/* Wnen change MAX_BOOKMARK_SIZE, database.h REF_SIZE_MAX too */
+#define MAX_BOOKMARK_SIZE 112     // innodb unique key max 767 byte
+struct BOOKMARK
+{
+    uchar_td val[MAX_BOOKMARK_SIZE];
+    bool empty;
+    BOOKMARK():empty(true){}
+    bool isEmpty()
+    {
+        return empty;
+    }
+};
+typedef BOOKMARK bookmark_td;
+
 /** tdap c interface
  */
 #if (defined(__BORLANDC__) && !defined(__clang__))
@@ -64,6 +76,7 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 /** buffer size
  */
 #define POS_BLOCK_SIZE                  128
+#define BTRV_BOOKMARK_SIZE                4
 #ifndef MAX_KEYLEN
 #define MAX_KEYLEN                      0X3FF   // 1023
 #endif
@@ -167,7 +180,9 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define TD_STSTCS_READ                  0
 #define TD_STSTCS_DISCONNECT_ONE        1
 #define TD_STSTCS_DISCONNECT_ALL        2
-
+#define TD_STSTCS_DATABASE_LIST         3
+#define TD_STSTCS_SYSTEM_VARIABLES      4
+#define TD_STSTCS_SCHEMA_TABLE_LIST     5
 /** connect sub operation
  */
 
@@ -394,6 +409,13 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define ERROR_TD_C_CLIENT_UNKNOWN       3811
 #define ERROR_TD_RECONNECTED            3900
 
+inline bool canRecoverNetError(short code)
+{
+    return (code >= ERROR_TD_CONNECTION_FAILURE) &&
+        (code < ERROR_TD_RECONNECTED) &&
+        (code != ERROR_TD_NET_TOO_BIGDATA);
+}
+
 
 #define TRANSACTD_SCHEMANAME            _T("transactd_schema")
 #define TYPE_SCHEMA_BDF                 0
@@ -401,6 +423,7 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 
 #define FILTER_CURRENT_TYPE_NOTINC      0
 #define FILTER_CURRENT_TYPE_INC         1
+#define FILTER_TYPE_SEEKS_BOOKMARKS     1 //with FILTER_TYPE_SEEKS only 
 #define FILTER_CURRENT_TYPE_NOBOOKMARK  2
 #define FILTER_TYPE_SUPPLYVALUE         4
 #define FILTER_TYPE_FORWORD             4 //at preparing only 
@@ -453,13 +476,33 @@ struct handshale_t
 
 #define HST_OPTION_NO_SCRAMBLE 1
 
+/* server system variables index */
+#define TD_VER_DB                 0 
+#define TD_VER_SERVER             1
+#define TD_VAR_LISTENADDRESS      2
+#define TD_VAR_LISTENPORT         3
+#define TD_VAR_HOSTCHECKNAME      4
+#define TD_VAR_MAXTCPCONNECTIONS  5
+#define TD_VAR_TABLENAMELOWER     6
+#define TD_VAR_POOLTHREADS        7
+#define TD_VAR_TCPSERVERTYPE      8
+#define TD_VAR_LOCKWAITTIMEOUT    9
+#define TD_VAR_ISOLATION          10
+#define TD_VAR_AUTHTYPE           11
+#define TD_VAR_PIPESHAREMEMSIZE   12
+#define TD_VAR_MAXPIPECONNECTIONS 13
+#define TD_VAR_USEPIPE            14
+#define TD_VAR_HSLISTENPORT       15
+#define TD_VAR_USEHS              16
+#define TD_VAR_SIZE               17
+
 /** @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 "2"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "3"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "4"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -523,7 +566,7 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "2"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "3"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "4"//##5 Build marker! Don't remove
 #define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
@@ -540,7 +583,7 @@ struct handshale_t
 #endif
 
 #define TRANSACTD_VER_MAJOR 2//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 3//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 4//##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/protocol/tdap/uri.h

@@ -49,12 +49,14 @@ inline const _TCHAR* protocol(const _TCHAR* uri)
         st = _tcsstr(uri, _T("btrv://"));
         return _T("btrv");
     }
-    return _T("");
 }
 
-inline const _TCHAR* hostName(const _TCHAR* uri, _TCHAR* buf, size_t size)
+inline void endPoint(const _TCHAR* uri, 
+                                _TCHAR* host, size_t hostSize, 
+                                _TCHAR* port, size_t portSize)
 {
-    buf[0] = 0x00;
+    if (host) host[0] = 0x00;
+    if (port) port[0] = 0x00;
     const _TCHAR* st = _tcsstr(uri, _T("@"));
     if (st) 
         ++st;
@@ -65,13 +67,46 @@ inline const _TCHAR* hostName(const _TCHAR* uri, _TCHAR* buf, size_t size)
     }
     if (st)
     {
-        const _TCHAR* en = _tcsstr(st, _T("/"));
+        const _TCHAR* en = _tcsstr(st, _T(":"));
         if (en && en > st)
         {
-            _tcsncpy_s(buf, size, st, en - st);
-            buf[en - st] = 0x00;
+            if (host)
+            {
+                _tcsncpy_s(host, hostSize, st, en - st);
+                host[en - st] = 0x00;
+            }
+            if (port)
+            {
+                st = en + 1;
+                en = _tcsstr(st, _T("/"));
+                if (en && en > st)
+                {
+                    _tcsncpy_s(port, portSize, st, en - st);
+                    port[en - st] = 0x00;
+                }
+            }
+        }
+        else if (host)
+        {
+            en = _tcsstr(st, _T("/"));
+            if (en && en > st)
+            {
+                _tcsncpy_s(host, hostSize, st, en - st);
+                host[en - st] = 0x00;
+            }
         }
     }
+}
+
+inline const _TCHAR* hostName(const _TCHAR* uri, _TCHAR* buf, size_t size)
+{
+    endPoint(uri, buf, size, NULL, 0);
+    return buf;
+}
+
+inline const _TCHAR* port(const _TCHAR* uri, _TCHAR* buf, size_t size)
+{
+    endPoint(uri, NULL, 0, buf, size);
     return buf;
 }
 

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

@@ -442,7 +442,6 @@ int module::execute(netsvc::server::IResultBuffer& result, size_t& size,
 {
     m_commandExecuter->parse(m_readBuf, m_readSize);
     m_nw->reset(&result, optionalData);
-    boost::mutex::scoped_lock lck(m_mutex);
     int ret = m_commandExecuter->execute(m_nw);
     if (m_useThreadPool)
         cleanup();

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

@@ -41,7 +41,6 @@ namespace transactd
 class module : public netsvc::server::IAppModule, private boost::noncopyable
 {
     friend class connManager;
-    mutable boost::mutex m_mutex;
     boost::shared_ptr<protocol::ICommandExecuter> m_commandExecuter;
     const boost::asio::ip::tcp::endpoint m_endpoint;
     bzs::netsvc::server::iconnection* m_connection;
@@ -63,7 +62,6 @@ public:
     bool isShutDown() { return m_commandExecuter->isShutDown(); }
     bool checkHost(const char* hostCheckname, /*out*/char* hostName, int size);
     void disconnect();
-    boost::mutex& mutex() const { return m_mutex; };
 };
 
 } // namespace transactd