transactd 2.4.5 → 3.0.0

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

@@ -111,26 +111,26 @@ public:
 
     writableRecord& getWritableRecord();
 
-    activeTable& join(recordset& rs, queryBase& q, const _TCHAR* name1,
+    recordset& join(recordset& rs, queryBase& q, const _TCHAR* name1,
                       const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
                       const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
                       const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
                       const _TCHAR* name8 = NULL);
 
-    activeTable&
+    recordset&
     outerJoin(recordset& rs, queryBase& q, const _TCHAR* name1,
               const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
               const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
               const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
               const _TCHAR* name8 = NULL);
 
-    activeTable& join(recordset& rs, pq_handle& q, const _TCHAR* name1,
+    recordset& join(recordset& rs, pq_handle& q, const _TCHAR* name1,
                       const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
                       const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
                       const _TCHAR* name6 = NULL, const _TCHAR* name7 = NULL,
                       const _TCHAR* name8 = NULL);
 
-    activeTable&
+    recordset&
     outerJoin(recordset& rs, pq_handle& q, const _TCHAR* name1,
               const _TCHAR* name2 = NULL, const _TCHAR* name3 = NULL,
               const _TCHAR* name4 = NULL, const _TCHAR* name5 = NULL,
@@ -141,42 +141,42 @@ public:
     table_ptr table() const;
     activeTable& option(int v);
     pq_handle prepare(queryBase& q, bool serverPrepare = false);
-    activeTable& read(recordset& rs, queryBase& q);
-    activeTable& read(recordset& rs, queryBase& q, validationFunc func);
-    activeTable& read(recordset& rs, pq_handle& q);
-    activeTable& read(recordset& rs, pq_handle& q, validationFunc func);
-    activeTable& readMore(recordset& rs);
+    recordset& read(recordset& rs, queryBase& q);
+    recordset& read(recordset& rs, queryBase& q, validationFunc func);
+    recordset& read(recordset& rs, pq_handle& q);
+    recordset& read(recordset& rs, pq_handle& q, validationFunc func);
+    recordset& readMore(recordset& rs);
     /** @cond INTERNAL */
     template<class T0>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0)
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0)
     {
         _supplyValue(q, 0, v0);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1)
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1)
     {
         _supplyValue(q, 0, v0);
         _supplyValue(q, 1, v1);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1, class T2>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
                         const T2 v2)
     {
         _supplyValue(q, 0, v0);
         _supplyValue(q, 1, v1);
         _supplyValue(q, 2, v2);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1, class T2, class T3>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
                         const T2 v2, const T3 v3)
     {
         _supplyValue(q, 0, v0);
@@ -184,11 +184,11 @@ public:
         _supplyValue(q, 2, v2);
         _supplyValue(q, 3, v3);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1, class T2, class T3, class T4>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
                         const T2 v2, const T3 v3, const T4 v4)
     {
         _supplyValue(q, 0, v0);
@@ -197,11 +197,11 @@ public:
         _supplyValue(q, 3, v3);
         _supplyValue(q, 4, v4);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1, class T2, class T3, class T4, class T5>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
                         const T2 v2, const T3 v3, const T4 v4, const T5 v5)
     {
         _supplyValue(q, 0, v0);
@@ -211,11 +211,11 @@ public:
         _supplyValue(q, 4, v4);
         _supplyValue(q, 5, v5);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1, class T2, class T3, class T4, class T5, class T6>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
                         const T2 v2, const T3 v3, const T4 v4, const T5 v5,
                         const T6 v6)
     {
@@ -227,12 +227,12 @@ public:
         _supplyValue(q, 5, v5);
         _supplyValue(q, 6, v6);
         read(rs, q);
-        return *this;
+        return rs;
     }
 
     template<class T0, class T1, class T2, class T3, class T4, class T5, class T6,
                 class T7>
-    activeTable& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
+    recordset& read(recordset& rs, pq_handle& q, const T0 v0, const T1 v1,
                         const T2 v2, const T3 v3, const T4 v4, const T5 v5,
                         const T6 v6, const T7 v7)
     {
@@ -245,7 +245,7 @@ public:
         _supplyValue(q, 6, v6);
         _supplyValue(q, 7, v7);
         read(rs, q);
-        return *this;
+        return rs;
     }
     /** @endcond */
 

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

@@ -234,7 +234,8 @@ class activeTableImple : public activeObject<map_orm>
             }
             else if (joinFields[i].type == JOIN_KEYVALUE_TYPE_PTR)
             {
-                ptr[i] = (const uchar_td*)mdl[fieldIndexes[i]].ptr();
+                ptr[i] =  (mdl[fieldIndexes[i]].isNull()) ? NULL :
+                            (const uchar_td*)mdl[fieldIndexes[i]].ptr();
                 len[i] = joinFields[i].len;
             }
             else
@@ -242,10 +243,15 @@ class activeTableImple : public activeObject<map_orm>
                 // if target field type is different then we need convrt type
                 const fielddef& f = td->fieldDefs[kd->segments[i].fieldNum];
                 field fd(buf_ptr - f.pos, f, fds);
-                fd = mdl[fieldIndexes[i]].c_str();
-                ptr[i] = buf_ptr;
                 len[i] = f.isStringType() ? 0xff : f.len;
-                buf_ptr += f.len;
+                if (mdl[fieldIndexes[i]].isNull())
+                    ptr[i] = NULL;
+                else
+                {
+                    fd = mdl[fieldIndexes[i]].c_str();// operator=(const _TCHAR* p)
+                    ptr[i] = buf_ptr;
+                    buf_ptr += f.len;
+                }
             }
         }
     

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

@@ -63,6 +63,7 @@ short errorCode(const boost::system::error_code& e)
     case 32:    //write:brokn pipe
     case 111:   //connect: Connection refused
     case 10061:
+    case 10053:
         ret = ERROR_TD_CONNECTION_FAILURE;
         break;
     case 104:   //write: Connection reset by peer
@@ -95,15 +96,15 @@ int client::getServerCharsetIndex()
         
     request req = m_req;
     req.paramMask = P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN;
-    trdVersiton ver;
-    memset(&ver, 0, sizeof(trdVersiton));
-    ver.cherserServer[0] = 0x00;
+    trdVersiton vers;
+    memset(&vers, 0, sizeof(trdVersiton));
+    clsrv_ver& ver = vers.desc;
     ver.clMajor = (ushort_td)atoi(C_INTERFACE_VER_MAJOR);
     ver.clMinor = (ushort_td)atoi(C_INTERFACE_VER_MINOR);
     ver.clRelease = (ushort_td)atoi(C_INTERFACE_VER_RELEASE);
     uint_td len = sizeof(trdVersiton);
     req.op = TD_GETSERVER_CHARSET;
-    req.data = &ver;
+    req.data = &vers;
     req.datalen = &len;
 
     mutex::scoped_lock lck(m_mutex);
@@ -117,7 +118,7 @@ int client::getServerCharsetIndex()
         {
             if (!checkVersion(ver))
                 return -1;
-            c->setCharsetServer(mysql::charsetIndex(ver.cherserServer));
+            c->setCharsetServer(mysql::charsetIndex(vers.cherserServer));
             return  c->charsetServer();
         }
     }

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

@@ -82,7 +82,7 @@ class client
 
     std::vector<char> m_sendbuf;
 
-    bool checkVersion(trdVersiton& ver)
+    bool checkVersion(clsrv_ver& ver)
     {
         if ((ver.srvMajor < 2) || ((ver.srvMajor == 2) && (ver.srvMinor < 3)))
             return false;
@@ -150,13 +150,16 @@ class client
         handshale_t* hst  = (handshale_t*)c->read();
         if (c->error()) return false;
         bool auth = (hst->size == sizeof(handshale_t));
-        bool min = (hst->size == (sizeof(handshale_t) 
-         									-  sizeof(hst->scramble)));
-        
+        bool min = (hst->size == (sizeof(handshale_t) -  sizeof(hst->scramble)));
+        memcpy(c->versions(), &hst->ver.desc, sizeof(clsrv_ver));
+
         if (min || auth)
         {
-            if (!checkVersion(hst->ver))
+            if (!checkVersion(hst->ver.desc))
+            {
+                m_preResult = SERVER_CLIENT_NOT_COMPATIBLE; 
                 return false;
+            }
             c->setCharsetServer(mysql::charsetIndex(hst->ver.cherserServer));
             m_req.cid->lock_wait_timeout = hst->lock_wait_timeout;
             m_req.cid->transaction_isolation = hst->transaction_isolation;
@@ -190,7 +193,10 @@ class client
     }
 
 public:
-    client() : m_cryptPwd(NULL), m_disconnected(true), m_connecting(false) {}
+    client() : m_cryptPwd(NULL), m_disconnected(false), m_connecting(false)
+    {
+    }
+
     ~client()
     {
         if (m_cryptPwd)
@@ -216,6 +222,23 @@ public:
 
     inline request& req() { return m_req; }
 
+    inline const clsrv_ver* ver()
+    { 
+        if (m_req.cid->con)
+            return (clsrv_ver*)m_req.cid->con->versions();
+        return NULL; 
+    }
+    inline bool isSupportFunction(short op)
+    {
+        if (op == TD_GET_SCHEMA)
+        {
+            const clsrv_ver* v = ver();
+            if (!v) return false;
+            return (v->srvMajor > 2) || ((v->srvMajor == 2) && (v->srvMinor >= 6));
+        }
+        return false;
+    }
+
     inline void setParam(ushort_td op, posblk* pbk, void_td* data,
                          uint_td* datalen, void_td* keybuf, keylen_td keylen,
                          char_td keyNum, clientID* cid)
@@ -253,6 +276,7 @@ public:
     {
         if (!m_req.cid->con)
         {
+            m_preResult = 0;
             endpoint_t ep;
             endPoint((const char*)m_req.keybuf, &ep);
             if (ep.host[0] == 0x00)
@@ -264,7 +288,7 @@ public:
                 setCon(c);
                 m_connecting = true;
             }
-            else
+            else if (m_preResult == 0)
                 m_preResult = ERROR_TD_HOSTNAME_NOT_FOUND;
         }
         m_disconnected = !m_req.cid->con;
@@ -272,19 +296,47 @@ public:
 
     inline void createIndex()
     {
+        if (!ver())
+        {
+            m_preResult = ERROR_TD_NOT_CONNECTED;
+            return; 
+        }
         m_req.paramMask = P_MASK_NOKEYBUF;
         int charsetIndexServer =  getServerCharsetIndex();
         unsigned char keynum = m_req.keyNum;
         bool specifyKeyNum = (keynum >= 0x80);
         if (keynum >= 0x80)
             keynum -= 0x80;
-        m_sql = sqlCreateIndex((tabledef*)m_req.data, keynum, 
-                            specifyKeyNum, charsetIndexServer);
+        m_sql = sqlBuilder::sqlCreateIndex((tabledef*)m_req.data, keynum, 
+                            specifyKeyNum, charsetIndexServer, ver());
         m_req.data = (ushort_td*)m_sql.c_str();
         m_tmplen = (uint_td)(m_sql.size() + 1);
         m_req.datalen = &m_tmplen;
     }
 
+    inline void getSqlCreate()
+    {
+        if (!ver())
+        {
+            m_req.result = ERROR_TD_NOT_CONNECTED;
+            return; 
+        }
+        _TCHAR tmp[MAX_PATH*2]={0};
+        stripAuth((const char*)m_req.keybuf, tmp, MAX_PATH);
+        std::string name = getTableName(tmp);
+        int charsetIndexServer =  getServerCharsetIndex();
+        std::string sql = sqlBuilder::sqlCreateTable(name.c_str(), (tabledef*)m_req.data,
+                                       charsetIndexServer, ver());
+        uint_td  datalen = *m_req.datalen;
+        *m_req.datalen = (uint_td)(sql.size() + 1);
+        if (datalen <= sql.size())
+        {
+            m_req.result = STATUS_BUFFERTOOSMALL;
+            return;
+        }
+        strcpy_s((char*)m_req.data, *m_req.datalen, sql.c_str());
+    }
+
     inline void create()
     {
         m_req.paramMask = P_MASK_ALL;
@@ -298,15 +350,27 @@ public:
             m_req.paramMask &= ~P_MASK_POSBLK;
             std::string name = getTableName(tmp);
             int charsetIndexServer =  getServerCharsetIndex();
-            if ((m_req.keyNum == 1) || (m_req.keyNum == 2)) // make by tabledef
+            if (!ver())
+            {
+                m_preResult = ERROR_TD_NOT_CONNECTED;
+                return; 
+            }
+            if ((m_req.keyNum == CR_SUBOP_BY_TABLEDEF) || 
+                    (m_req.keyNum == CR_SUBOP_BY_TABLEDEF_NOCKECK)) // make by tabledef
             {
-                m_sql = sqlCreateTable(name.c_str(), (tabledef*)m_req.data,
-                                       charsetIndexServer);
-                m_req.keyNum -= 2; // 1= exists check 2 = no exists check
+                m_sql = sqlBuilder::sqlCreateTable(name.c_str(), (tabledef*)m_req.data,
+                                       charsetIndexServer, ver());
+                m_req.keyNum -= 2; // -1= exists check 0 = no exists check
+            }
+            else if ((m_req.keyNum == CR_SUBOP_BY_SQL) || 
+                    (m_req.keyNum == CR_SUBOP_BY_SQL_NOCKECK)) // make by sql
+            {
+                m_sql = (char*)m_req.data;
+                m_req.keyNum -= 4; // -1= exists check 0 = no exists check
             }
             else
-                m_sql = sqlCreateTable(name.c_str(), (fileSpec*)m_req.data,
-                                       charsetIndexServer);
+                m_sql = sqlBuilder::sqlCreateTable(name.c_str(), (fileSpec*)m_req.data,
+                                       charsetIndexServer, ver());
             m_req.data = (ushort_td*)m_sql.c_str();
             m_tmplen = (uint_td)(m_sql.size() + 1);
             m_req.datalen = &m_tmplen;
@@ -379,7 +443,10 @@ public:
                         m_preResult = SERVER_CLIENT_NOT_COMPATIBLE;
                 }
                 else
+                {
                     buildDualChasetKeybuf();
+                    m_disconnected = false;
+                }
             }
             else
                 m_preResult = errorCode(m_cons->connectError());