transactd 3.1.0 → 3.2.0

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 <bzs/db/protocol/tdap/uri.h>
 
 #ifdef LINUX
 #include <dlfcn.h>
@@ -146,27 +147,31 @@ struct nsdbimpl
     short snapShotCount;
     nstable* tables[nsdatabase::maxtables];
     uchar_td cidPtr[16];
-    uchar_td* cid() { return cidPtr; }
     _TCHAR bdfPath[MAX_PATH];
     short tableCount;
     short lockWaitCount;
     short lockWaitTime;
-    bool uriMode;
-    bool uselongFilename;
-    bool localSharing;
-    bool ignoreTestPtr;
-    bool reconnected;
+    short enginIndex;
+    struct
+    {
+        bool uriMode : 1;
+        bool uselongFilename : 1;
+        bool localSharing : 1;
+        bool ignoreTestPtr : 1;
+        bool reconnected : 1;
+        bool associateMode : 1;
+    };
     nsdbimpl()
         : refCount(1), tranCount(0), id(0), snapShotCount(0), tableCount(0),
-          lockWaitCount(10), lockWaitTime(100), uriMode(false),
+          lockWaitCount(10), lockWaitTime(100), enginIndex(0), uriMode(false),
           uselongFilename(false), localSharing(false), ignoreTestPtr(false),
-          reconnected(false)
+          reconnected(false), associateMode(false)
     {
     }
 
     void setId(unsigned short id_)
     {
-        id = id_;
+        id = enginIndex = id_;
 
         // make client id
         memset(cidPtr, 0, 12);
@@ -184,6 +189,7 @@ struct nsdbimpl
             lockWaitTime = rt.lockWaitCount;
             uselongFilename = rt.uselongFilename;
             uriMode = rt.uriMode;
+            associateMode = rt.associateMode;
         }
         return *this;
     }
@@ -241,6 +247,11 @@ nsdatabase::nsdatabase() : m_stat(0)
     m_nsimpl->setId((unsigned short)index + 1);
 }
 
+void nsdatabase::setAssociate()
+{
+    m_nsimpl->associateMode = true;
+}
+
 int nsdatabase::refCount() const
 {
     return m_nsimpl->refCount;
@@ -262,8 +273,8 @@ nsdatabase::~nsdatabase()
     reset();
 
     boost::mutex::scoped_lock lck(g_mutex);
-    if (m_nsimpl->id != 0)
-        engins()[m_nsimpl->id - 1] = NULL;
+    if (m_nsimpl->enginIndex != 0)
+        engins()[m_nsimpl->enginIndex - 1] = NULL;
     delete m_nsimpl;
     m_nsimpl = 0x00;
 #ifdef _WIN32
@@ -593,6 +604,21 @@ void nsdatabase::reset()
         m_btrcallid = getBtrvEntryPoint();
 }
 
+bool nsdatabase::checkAssociate()
+{
+    if (m_nsimpl->associateMode)
+    {
+        m_stat = STATUS_NOSUPPORT_OP;
+        return false;
+    }
+    return true;
+}
+
+bool nsdatabase::isAssociate() const
+{
+    return m_nsimpl->associateMode;
+}
+
 void nsdatabase::resetSnapshot()
 {
     if (m_nsimpl->snapShotCount)
@@ -604,6 +630,8 @@ void nsdatabase::resetSnapshot()
 
 void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
 {
+    if (!checkAssociate()) return;
+
     if (m_nsimpl->snapShotCount == 0)
     {
         uint_td datalen = (bias == CONSISTENT_READ_WITH_BINLOG_POS) ? sizeof(binlogPos) : 0;
@@ -637,6 +665,7 @@ void nsdatabase::endSnapshot()
 
 void nsdatabase::beginTrn(short BIAS)
 {
+    if (!checkAssociate()) return;
     if (m_nsimpl->tranCount == 0)
     {
         m_stat = m_btrcallid((ushort_td)(BIAS + TD_BEGIN_TRANSACTION), NULL,
@@ -737,6 +766,28 @@ void nsdatabase::getBtrVersion(btrVersions* Vers, uchar_td* posblk)
     }
 }
 
+char* nsdatabase::getCreateViewSql(const _TCHAR* name , char* retbuf, uint_td* size)
+{
+    if (isUseTransactd() == false)
+    {
+        m_stat = STATUS_NOSUPPORT_OP;
+        return retbuf;
+    }
+    _TCHAR tmp[MAX_PATH];
+    stripParam(uri(), tmp, MAX_PATH);
+    _tcscat(tmp, _T("?dbfile="));
+    _tcscat(tmp, name);
+
+    char Uri[MAX_PATH] = { 0x00 };
+    const char* p = nsdatabase::toServerUri(Uri, MAX_PATH, tmp, true);
+    keylen_td keylen = (keylen_td)strlen(p) + 1;
+    m_stat = m_btrcallid(TD_GET_SCHEMA, NULL, retbuf, size, (void*)p, keylen,
+                             SC_SUBOP_VIEW_BY_SQL, m_nsimpl->cidPtr);
+    if (m_stat != STATUS_SUCCESS)
+        retbuf[0] = 0x00;
+    return retbuf;
+}
+
 bool nsdatabase::useLongFilename()
 {
     return m_nsimpl->uselongFilename;
@@ -782,6 +833,13 @@ void nsdatabase::readDatabaseDirectory(_TCHAR* retbuf, uchar_td buflen)
 
 bool nsdatabase::connect(const _TCHAR* URI, bool newConnection)
 {
+    if (!checkAssociate()) return false;
+    if (isOpened())
+    {
+        m_stat = STATUS_DB_YET_OPEN;
+        return false;
+    }
+
     if (isTransactdUri(URI))
     {
         if (!setUseTransactd())
@@ -806,6 +864,8 @@ bool nsdatabase::connect(const _TCHAR* URI, bool newConnection)
 
 bool nsdatabase::disconnect(const _TCHAR* URI)
 {
+    if (!checkAssociate()) return false;
+
     if (!URI || (URI[0] == 0x00) || isTransactdUri(URI))
         if (!setUseTransactd())
             return false;
@@ -820,7 +880,6 @@ bool nsdatabase::disconnect(const _TCHAR* URI)
     return true;
 }
 
-
 bool nsdatabase::disconnectForReconnectTest()
 {
     //Transactd only

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

@@ -99,6 +99,8 @@ protected:
     void addref();
     void internalRelease() { nsdatabase::release(); }
     void doReconnect(nstable* tb);
+    void setAssociate();
+    bool checkAssociate();
     virtual bool doReopenDatabaseSchema(){ return true; }
     virtual void* getExtendBufferForOpen(uint_td& size){ return NULL; };
 public:
@@ -152,8 +154,11 @@ public:
     bool disconnectForReconnectTest(); //for connection brokn emulate
 	bool reconnect();
     bool isReconnected() const;
+    bool isAssociate() const;
+    virtual bool isOpened() const { return false;}
+    char* getCreateViewSql(const _TCHAR* name, char* retbuf, uint_td* size);
 
-    static const int maxtables = 50;
+    static const int maxtables = 150;
     static bool trnsactionFlushWaitStatus();
     static void setExecCodePage(unsigned int codepage);
     static unsigned int execCodePage();
@@ -163,6 +168,7 @@ public:
     static WIN_TPOOL_SHUTDOWN_PTR getWinTPoolShutdownFunc();
     static bool testTablePtr(nstable* ptr);
     static void setCheckTablePtr(bool v);
+
     /** @endcond */
 };
 

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

@@ -762,6 +762,40 @@ void nstable::clearOwnerName()
     tdap(TD_CLEAR_OWNERNAME);
 }
 
+char* nstable::getCreateSql(char* retbuf, uint_td* size /* in out */)
+{
+    if (isUseTransactd() == false)
+    {
+        m_stat = STATUS_NOSUPPORT_OP;
+        return retbuf;
+    }
+
+    void* tmp = m_keybuf;
+    char_td keynum = m_keynum;
+    void* pdata = m_pdata;
+
+    char tmpName[MAX_PATH] = { 0x00 };
+    const char* p = nsdatabase::toServerUri(tmpName, MAX_PATH, uri(), true);
+    m_keybuf = (void*)p;
+    m_keylen = (keylen_td)strlen(p) + 1;
+    m_pdata = retbuf;
+    m_datalen = *size;
+    m_keynum = SC_SUBOP_BY_SQL;
+
+    tdap((ushort_td)TD_GET_SCHEMA);
+    if (m_stat != STATUS_SUCCESS)
+    {
+        retbuf[0] = 0x00;
+        *size = 0;
+    }else
+        *size = m_datalen;
+
+    m_keybuf = tmp;
+    m_keynum = keynum;
+    m_pdata = pdata;
+    return retbuf;
+}
+
 void nstable::stats(void* dataBuf, uint_td len, bool estimate)
 {
     void* svm_pdata = m_pdata;
@@ -811,7 +845,6 @@ ushort_td nstable::recordLength()
 
 void nstable::doCreateIndex(bool specifyKeyNum)
 {
-
     if (specifyKeyNum)
         m_keynum += ((uchar_td)0x80);
     tdap(TD_BUILD_INDEX);
@@ -965,7 +998,7 @@ _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
         else
             p2 = NULL;
     }
-    if (p)
+    if (p && (uri == false))
         *p = 0x00;
     if (p2)
         *(p2 + 1) = 0x00;

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

@@ -222,6 +222,7 @@ public:
     void clearOwnerName();
     ushort_td recordLength();
     void stats(void* databuffer, uint_td buflen, bool estimate = true);
+    char* getCreateSql(char* retbuf, uint_td* size);
     void unlock(bookmark_td& bm);
     void unlock();
     char_td mode() const;

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

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2014 BizStation Corp All rights reserved.
+   Copyright (C) 2014-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
@@ -208,6 +208,10 @@ void recordset::dump()
 {
     m_imple->dump();
 }
+void recordset::dump(std::tostream& os)
+{
+    m_imple->dump(os);
+}
 #endif
 
 } // namespace client

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

@@ -19,6 +19,10 @@
    02111-1307, USA.
 =================================================================*/
 #include "groupQuery.h"
+#ifdef _DEBUG
+    #include <iostream>
+    #include <bzs/env/tstring.h>
+#endif
 
 namespace bzs
 {
@@ -74,6 +78,17 @@ public:
 
 #ifdef _DEBUG
     void dump();
+    void dump(std::tostream& os);
+
+    /*
+      Output to file.
+
+      #include <fstream>
+      std::locale::global(std::locale("japanese"));
+      std::wofstream ost("temp.txt");
+      rs.dump(ost);
+    */
+
 #endif
 };
 

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

@@ -81,14 +81,14 @@ class dumpRecordset
         return s;
     }
 
-    void printValue(size_t width, std::ios::fmtflags f, const _TCHAR* value)
+    void printValue(std::tostream& os, size_t width, std::ios::fmtflags f, const _TCHAR* value)
     {
-        std::tcout.setf(f, std::ios::adjustfield);
-        std::tcout << _T(" ")  << std::setw(width) << value << _T(" |");
+        os.setf(f, std::ios::adjustfield);
+        os << _T(" ")  << std::setw(width) << value << _T(" |");
     }
 
     const _TCHAR* value(const fielddef& fd) {return fd.name();}
-    const _TCHAR* value(const field& fd) 
+    const _TCHAR* value(const field& fd)
     {
         if (fd.isNull())
             return _T("NULL");
@@ -96,31 +96,31 @@ class dumpRecordset
     }
 
     template <class T>
-    void printRecord(const T& coll)
+    void printRecord(std::tostream& os, const T& coll)
     {
-        std::tcout  << _T("|");
+        os  << _T("|");
         for (size_t col = 0; col < m_widths.size(); ++col)
-            printValue(m_widths[col], m_ailgns[col], value(coll[(short)col]));
-        std::tcout << std::endl;
+            printValue(os, m_widths[col], m_ailgns[col], value(coll[(short)col]));
+        os << std::endl;
     }
 public:
-    void operator()(RS& rs)
+    void operator()(std::tostream& os, RS& rs)
     {
         if (rs.size())
         {
             cacheWidthAndAlign(rs);
             std::_tstring line = makeLine();
             //header
-            std::tcout << line;
-            printRecord(*rs.fieldDefs());
-            std::tcout << line;
+            os << line;
+            printRecord(os, *rs.fieldDefs());
+            os << line;
 
             //field value
             for(size_t i = 0; i < rs.size(); ++i)
-                printRecord(rs[i]);
-            std::tcout << line;
+                printRecord(os, rs[i]);
+            os << line;
         }else
-            std::tcout << _T("Empty set ") << std::endl;
+            os << _T("Empty set ") << std::endl;
     }
 };
 #endif
@@ -697,7 +697,12 @@ public:
     void dump()
     {
         dumpRecordset<recordsetImple> dumpRs;
-        dumpRs(*this);
+        dumpRs(std::tcout, *this);
+    }
+    void dump(std::tostream& os)
+    {
+        dumpRecordset<recordsetImple> dumpRs;
+        dumpRs(os, *this);
     }
 #endif
 };

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

@@ -66,8 +66,14 @@ BOOST_CLASS_EXPORT_GUID(bzs::db::protocol::tdap::client::reverseOrderStatement,
 
 BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::groupFuncBase, 1)
 BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::queryBase, 1)
-BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::readStatement, 1)
 BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::readHasMany, 1)
+BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::executable, 2)
+BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::readStatement, 2)
+BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::groupByStatement, 2)
+BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::matchByStatement, 2)
+BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::orderByStatement, 2)
+BOOST_CLASS_VERSION(bzs::db::protocol::tdap::client::reverseOrderStatement, 2)
+
 namespace bzs
 {
 namespace db
@@ -117,8 +123,15 @@ void serialize_string(Archive& ar, const char* name, std::_tstring& v)
 }
 
 template <class Archive>
-void serialize(Archive&, executable&, const unsigned int)
+void serializeExecutable(Archive& ar, executable& exec, const unsigned int version)
 {
+    if (version >= 2)
+    {
+        int v = (int)exec.isEnabled();
+        ar& make_nvp("enabled", v);
+        if (Archive::is_loading::value)
+            exec.setEnabled(v);
+    }
 }
 
 template <class Archive>
@@ -148,40 +161,45 @@ void serialize(Archive& ar, sortFields& q, const unsigned int)
 }
 
 template <class Archive>
-void serialize(Archive& ar, groupByStatement& q, const unsigned int /*version*/)
+void serialize(Archive& ar, groupByStatement& q, const unsigned int version)
 {
     boost::serialization::base_object<executable>(q);
+    serializeExecutable(ar, q, version);
     ar& boost::serialization::make_nvp(
         "keyFields", boost::serialization::base_object<fieldNames>(q));
     ar& boost::serialization::make_nvp("functions", *q.m_statements);
 }
 
 template <class Archive>
-void serialize(Archive& ar, matchByStatement& q, const unsigned int /*version*/)
+void serialize(Archive& ar, matchByStatement& q, const unsigned int version)
 {
     boost::serialization::base_object<executable>(q);
+    serializeExecutable(ar, q, version);
     ar& make_nvp("matchByStatement",
                  boost::serialization::base_object<recordsetQuery>(q));
 }
 
 template <class Archive>
-void serialize(Archive& ar, orderByStatement& q, const unsigned int /*version*/)
+void serialize(Archive& ar, orderByStatement& q, const unsigned int version)
 {
     boost::serialization::base_object<executable>(q);
+    serializeExecutable(ar, q, version);
     ar& boost::serialization::make_nvp("sortFields", *q.m_sortFields);
 }
 
 template <class Archive>
-void serialize(Archive& /*ar*/, reverseOrderStatement& q,
-               const unsigned int /*version*/)
+void serialize(Archive& ar, reverseOrderStatement& q,
+               const unsigned int version)
 {
     boost::serialization::base_object<executable>(q);
+    serializeExecutable(ar, q, version);
 }
 
 template <class Archive>
 void serialize(Archive& ar, readStatement& q, const unsigned int version)
 {
     boost::serialization::base_object<executable>(q);
+    serializeExecutable(ar, q, version);
     if (version < 1)
         ar& boost::serialization::make_nvp(
             "keyFields", boost::serialization::base_object<fieldNames>(q));
@@ -440,7 +458,7 @@ void serialize(Archive& ar, alias_type& q, const unsigned int /*version*/)
 void executable::release()
 {
     delete this;
-};
+}
 
 //---------------------------------------------------------------------------
 //   class groupByStatement
@@ -673,9 +691,12 @@ struct queryStatementsImple
     {
         for (size_t i = 0; i < statements.size(); ++i)
         {
-            statements[i]->execute(rs);
-            if (listner)
-                listner->onExecuted(statements[i], rs);
+            if (statements[i]->isEnabled())
+            {
+                statements[i]->execute(rs);
+                if (listner)
+                    listner->onExecuted(statements[i], rs);
+            }
         }
     }
 

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

@@ -60,11 +60,14 @@ namespace client
 class DLLLIBSTMT executable
 {
     friend struct queryStatementsImple;
-
+    bool m_enabled;
 public:
+    executable() : m_enabled(true){}
     virtual ~executable(){};
     virtual void execute(recordset& rs) = 0;
     void release();
+    void setEnabled(bool v) { m_enabled = v; }
+    bool isEnabled() const { return m_enabled; }
     virtual const int typeID() const = 0;
 };
 

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

@@ -281,7 +281,8 @@ std::string sqlBuilder::getFieldList(const tabledef* table, std::vector<std::str
         s += fdl[i];
         s += "` ";
         len = fd.len - fd.varLenBytes();
-
+        if (fd.type == ft_myfixedbinary)
+            len -= 2;
         /*
          Although len is a number of bytes in BDF, it becomes the number of
          characters in MySQL.
@@ -489,7 +490,7 @@ std::string sqlBuilder::getKeyList(const tabledef* table, std::vector<std::strin
     return s;
 }
 
-std::string convertString(unsigned int toPage, unsigned int fromPage,
+std::string sqlBuilder::convertString(unsigned int toPage, unsigned int fromPage,
                           const char* p)
 {
     std::string s;

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

@@ -54,6 +54,9 @@ public:
 
     static std::string sqlCreateIndex(const tabledef* table, int keyNum,
                       bool specifyKeyNum, uchar_td charsetIndexServer, const clsrv_ver* ver);
+
+    static std::string convertString(unsigned int toPage, unsigned int fromPage,
+                          const char* p);
 };
 
 } // namespace client

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

@@ -351,7 +351,7 @@ public:
                         else
                             memcpy(m_tmpPtr, m_ptr, m_len);
                         if (bd)
-                            bd = m_tb->setBlobFieldPointer((char*)m_tmpPtr, m_hd, bd);
+                            bd = m_tb->setBlobFieldPointer(((char*)m_tmpPtr) + td->nullbytes(), m_hd, bd);
                     }
                 }
                 ++m_row;
@@ -444,7 +444,7 @@ public:
             else
                 m_tmpPtr = m_ptr;
 
-            m_tb->setBlobFieldPointer((char*)m_tmpPtr, m_hd);
+            m_tb->setBlobFieldPointer((char*)m_tmpPtr + td->nullbytes(), m_hd);
             return m_tmpPtr;
         }
     }
@@ -1509,7 +1509,7 @@ keylen_td table::writeKeyDataTo(uchar_td* to, int keySize)
             if ((f.bit9 | f.bit3) && (transactd == true))
                 isNull = false;
             fielddef& fd = (*m_tableDef)->fieldDefs[fdnum];
-            to = fd.keyCopy(to, (uchar_td*)fieldPtr(fdnum), 0xff, isNull);
+            to = fd.keyCopy(to, (uchar_td*)fieldPtr(fdnum), 0xff, isNull, transactd);
         }
         return (keylen_td)(to - start);
     }
@@ -1548,7 +1548,7 @@ uint_td table::doGetWriteImageLen()
             uint_td bytes = fd.blobLenBytes();
             if (bytes)
             {
-                uchar_td* fdptr = (uchar_td*)m_pdata + fd.pos;
+                uchar_td* fdptr = (uchar_td*)m_pdata + fd.pos + td->nullbytes();
                 blob b(fd.blobDataLen(fdptr), i, fd.blobDataPtr(fdptr));
                 addSendBlob(&b);
             }
@@ -1648,16 +1648,20 @@ unsigned char* table::setBlobFieldPointer(char* ptr, const blobHeader* hd, unsig
 
             //copy size byte
             memcpy(fdptr, &f->size, sizeByte);
-            const char* data = f->data();
-            //copy data
-            if (to)
+            if (f->size)
             {
-                memcpy(to, data, f->size);
-                data = (char*)to;
-                to += f->size;
-            }
-            //copy address
-            memcpy(fdptr + sizeByte, &data, sizeof(char*));
+                const char* data = f->data();
+                //copy data
+                if (to)
+                {
+                    memcpy(to, data, f->size);
+                    data = (char*)to;
+                    to += f->size;
+                }
+                //copy address
+                memcpy(fdptr + sizeByte, &data, sizeof(char*));
+            }else
+                memset(fdptr + sizeByte, 0, sizeof(char*));
             f = f->next();
         }
         ++hd->curRow;
@@ -1678,7 +1682,7 @@ void table::onReadAfter()
     if (blobFieldUsed())
     {
         const blobHeader* hd = getBlobHeader();
-        setBlobFieldPointer((char*)m_pdata, hd);
+        setBlobFieldPointer((char*)m_pdata + (*m_tableDef)->nullbytes(), hd);
     }
     if ((*m_tableDef)->recordlen() - m_datalen > 0)
         memset((char*)m_pdata + m_datalen, 0, (*m_tableDef)->recordlen() - m_datalen);

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

@@ -807,6 +807,12 @@ inline database_ptr createDatabaseObject()
     return p;
 }
 
+inline database_ptr createAssociateObject(database_ptr db)
+{
+    database_ptr p(db->createAssociate(), releaseDatabase);
+    return p;
+}
+
 template <class Database_Ptr>
 inline void disconnect(Database_Ptr db, const connectParams& connPrams)
 {
@@ -889,9 +895,8 @@ inline void connectOpen(Database_Ptr db, const connectParams& connPrams,
 template <class Database_Ptr> inline void dropDatabase(Database_Ptr db, const _TCHAR* uri=NULL)
 {
     db->drop(uri);
-    if (db->stat())
-        nstable::throwError(std::_tstring(_T("Drop database ")).c_str(),
-                            db->stat());
+    if (db->stat() && (db->stat() != ERROR_NO_DATABASE))
+        throwDbError(db, _T("Drop database : "), uri ? uri : _T(""));
 }
 
 template <class Database_Ptr>

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

@@ -158,6 +158,7 @@ unsigned int charsetIndex(const char* name)
 
 unsigned int charsetIndex(unsigned short codePage)
 {
+    if (codePage == 932) return CHARSET_CP932;
     for (int i = 1; i < MAX_CHAR_INFO; ++i)
     {
         if (charsetInfo[i].codePage == codePage)