transactd 2.4.0 → 2.4.2

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

@@ -367,7 +367,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(mgr, m_map.getTableName());
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -375,7 +375,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(db, m_map.getTableName(), mode);
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -383,7 +383,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(mgr, tableName);
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -400,7 +400,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(db, tableName, mode);
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -409,7 +409,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(db, tableName, mode);
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -418,7 +418,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(db, tableIndex, mode);
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -427,7 +427,7 @@ public:
         : m_fdi(createFdi((FDI*)0)), m_map(*m_fdi), m_option(0)
     {
         init(db, tableIndex, mode);
-        if (table() && m_fdi)
+        if (m_tb.get() && m_fdi)
             initFdi(m_fdi, m_tb.get());
     }
 
@@ -756,7 +756,7 @@ public:
                 (m_map.compKeyValue(mdlb, mdl, m_tb->keyNum()) == true))
             {
                 m_map.setKeyValues(mdl, fds, m_tb->keyNum());
-                keydef* kd = &m_tb->tableDef()->keyDefs[m_tb->keyNum()];
+                keydef* kd = &m_tb->tableDef()->keyDefs[(int)m_tb->keyNum()];
                 for (int i = 0; i < kd->segmentCount; ++i)
                     q.addSeekKeyValue(fds[kd->segments[i].fieldNum].c_str());
             }

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

@@ -55,6 +55,12 @@ template <class T> inline int compare(const char* l, const char* r)
     return 0;
 }
 
+template <class T> inline int bitMask(const char* l, const char* r)
+{
+    T v = *((T*)l) & *((T*)r);
+    return (int)(*((T*)r) - v);
+}
+
 template <class T> inline int compare(T l, T r)
 {
     if (l < r)

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

@@ -136,6 +136,21 @@ inline unsigned short position::packLen(const resultField* rf) const
     return m_tb->fieldDataLen(rf->fieldNum);
 }
 
+template <class T> inline 
+int bitMask(const char* l, const char* r)
+{
+    T v = *((T*)l) & *((T*)r);
+    return (int)(*((T*)r) - v);
+}
+
+inline int bitMask24(const char* l, const char* r)
+{
+    int lv = ((*((int*)l) & 0xFFFFFF) << 8) / 0x100;
+    int rv = ((*((int*)r) & 0xFFFFFF) << 8) / 0x100;
+    int v = lv & rv;
+    return rv - v;
+}
+
 inline int compareUint24(const char* l, const char* r)
 {
     unsigned int lv = *((unsigned int*)l) & 0xFFFFFF;
@@ -302,18 +317,36 @@ public:
         case ft_autoinc:
         case ft_currency:
         {
-            switch (len)
+            if (logType & 8)
             {
-            case 1:
-                return compare<char>(l, r);
-            case 2:
-                return compare<short>(l, r);
-            case 3:
-                return compareInt24(l, r);
-            case 4:
-                return compare<int>(l, r);
-            case 8:
-                return compare<__int64>(l, r);
+                switch (len)
+                {
+                case 1:
+                    return bitMask<char>(l, r);
+                case 2:
+                    return bitMask<short>(l, r);
+                case 3:
+                    return bitMask24(l, r);
+                case 4:
+                    return bitMask<int>(l, r);
+                case 8:
+                    return bitMask<__int64>(l, r);
+                }
+            }else
+            {
+                switch (len)
+                {
+                case 1:
+                    return compare<char>(l, r);
+                case 2:
+                    return compare<short>(l, r);
+                case 3:
+                    return compareInt24(l, r);
+                case 4:
+                    return compare<int>(l, r);
+                case 8:
+                    return compare<__int64>(l, r);
+                }
             }
         }
         case ft_mychar:
@@ -334,18 +367,36 @@ public:
         case ft_timestamp:
         case ft_mydate:
         {
-            switch (len)
+            if (logType & 8)
             {
-            case 1:
-                return compare<unsigned char>(l, r);
-            case 2:
-                return compare<unsigned short>(l, r);
-            case 3:
-                return compareUint24(l, r);
-            case 4:
-                return compare<unsigned int>(l, r);
-            case 8:
-                return compare<unsigned __int64>(l, r);
+                switch (len)
+                {
+                case 1:
+                    return bitMask<char>(l, r);
+                case 2:
+                    return bitMask<short>(l, r);
+                case 3:
+                    return bitMask24(l, r);
+                case 4:
+                    return bitMask<int>(l, r);
+                case 8:
+                    return bitMask<__int64>(l, r);
+                }
+            }else
+            {
+                switch (len)
+                {
+                case 1:
+                    return compare<unsigned char>(l, r);
+                case 2:
+                    return compare<unsigned short>(l, r);
+                case 3:
+                    return compareUint24(l, r);
+                case 4:
+                    return compare<unsigned int>(l, r);
+                case 8:
+                    return compare<unsigned __int64>(l, r);
+                }
             }
         }
 
@@ -391,6 +442,18 @@ public:
         return 0;
     };
 #else // COMP_USE_FUNCTION_POINTER
+    template <class T>
+    inline int compBitAnd(const char* l, const char* r, int sizeByte) const
+    {
+        return bitMask<T>(l, r);
+    }
+
+    inline int compBitAnd24(const char* l, const char* r, int sizeByte) const
+    {
+        int lv = ((*((int*)l) & 0xFFFFFF) << 8) / 0x100;
+        int rv = ((*((int*)r) & 0xFFFFFF) << 8) / 0x100;
+        return bitMask<int>((const char*)&lv, (const char*)&rv);
+    }
 
     template <class T>
     int compNumber(const char* l, const char* r, int sizeByte) const
@@ -450,7 +513,7 @@ public:
         return compareBlobType(l, r, type == ft_myblob, logType, sizeByte);
     }
 
-    compFunc getCompFunc(int sizeByte) const
+    compFunc getCompFunc(int sizeByte, char opr) const
     {
         switch (type)
         {
@@ -458,18 +521,36 @@ public:
         case ft_autoinc:
         case ft_currency:
         {
-            switch (len)
+            if (opr & 8)
             {
-            case 1:
-                return &logicalField::compNumber<char>;
-            case 2:
-                return &logicalField::compNumber<short>;
-            case 3:
-                return &logicalField::compNumber24;
-            case 4:
-                return &logicalField::compNumber<int>;
-            case 8:
-                return &logicalField::compNumber<__int64>;
+                switch (len)
+                {
+                case 1:
+                    return &logicalField::compBitAnd<char>;
+                case 2:
+                    return &logicalField::compBitAnd<short>;
+                case 3:
+                    return &logicalField::compBitAnd24;
+                case 4:
+                    return &logicalField::compBitAnd<int>;
+                case 8:
+                    return &logicalField::compBitAnd<__int64>;
+                }
+            }else
+            {
+                switch (len)
+                {
+                case 1:
+                    return &logicalField::compNumber<char>;
+                case 2:
+                    return &logicalField::compNumber<short>;
+                case 3:
+                    return &logicalField::compNumber24;
+                case 4:
+                    return &logicalField::compNumber<int>;
+                case 8:
+                    return &logicalField::compNumber<__int64>;
+                }
             }
         }
         case ft_mychar:
@@ -490,18 +571,36 @@ public:
         case ft_timestamp:
         case ft_mydate:
         {
-            switch (len)
+            if (opr & 8)
             {
-            case 1:
-                return &logicalField::compNumber<unsigned char>;
-            case 2:
-                return &logicalField::compNumber<unsigned short>;
-            case 3:
-                return &logicalField::compNumberU24;
-            case 4:
-                return &logicalField::compNumber<unsigned int>;
-            case 8:
-                return &logicalField::compNumber<unsigned __int64>;
+                switch (len)
+                {
+                case 1:
+                    return &logicalField::compBitAnd<char>;
+                case 2:
+                    return &logicalField::compBitAnd<short>;
+                case 3:
+                    return &logicalField::compBitAnd24;
+                case 4:
+                    return &logicalField::compBitAnd<int>;
+                case 8:
+                    return &logicalField::compBitAnd<__int64>;
+                }
+            }else
+            {
+                switch (len)
+                {
+                case 1:
+                    return &logicalField::compNumber<unsigned char>;
+                case 2:
+                    return &logicalField::compNumber<unsigned short>;
+                case 3:
+                    return &logicalField::compNumberU24;
+                case 4:
+                    return &logicalField::compNumber<unsigned int>;
+                case 8:
+                    return &logicalField::compNumber<unsigned __int64>;
+                }
             }
         }
         case ft_mytime:
@@ -668,7 +767,7 @@ public:
         if (m_placeHolderNum)
             const_cast<logicalField*>(fd)->opr &= ~FILTER_COMBINE_PREPARE;
 #ifdef COMP_USE_FUNCTION_POINTER
-        m_compFunc = fd->getCompFunc(m_sizeBytes);
+        m_compFunc = fd->getCompFunc(m_sizeBytes, fd->opr);
         setWstringCompLen();
 #endif
         if (fd->opr == 2)
@@ -794,6 +893,7 @@ public:
             switch (log)
             {
             case 1:
+            case 8:
                 fda.m_isMatchFunc = isMatch1;
                 break;
             case 2:
@@ -803,6 +903,7 @@ public:
                 fda.m_isMatchFunc = isMatch3;
                 break;
             case 4:
+            case 9:
                 fda.m_isMatchFunc = isMatch4;
                 break;
             case 5:

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

@@ -297,6 +297,80 @@ unsigned int fielddef::charNum(/* int index */) const
     return len;
 }
 
+uint_td tabledef::unPack(char* ptr, size_t size) const
+{
+    char* pos = ptr;
+    const char* end = pos + size;
+    const char* max = pos + maxRecordLen;
+    int movelen;
+    for (int i = 0; i < fieldCount; i++)
+    {
+        fielddef& fd = fieldDefs[i];
+        if (fd.type == ft_myfixedbinary)
+        {
+            int dl = *((unsigned short*)(pos));
+            memmove(pos, pos + 2, dl);
+            pos += fd.len - 2;
+            *((unsigned short*)(pos)) = 0x00;
+            ;
+            pos += 2;
+        }
+        else
+        {
+            int blen = fd.varLenBytes();
+            int dl = fd.len; // length
+            if (blen == 1)
+                dl = *((unsigned char*)(pos)) + blen;
+            else if (blen == 2)
+                dl = *((unsigned short*)(pos)) + blen;
+            if ((movelen = fd.len - dl) != 0)
+            {
+                if (max < end + movelen)
+                    return 0;
+                char* src = pos + dl;
+                memmove(pos + fd.len, src, end - src);
+                memset(src, 0, movelen);
+                end += movelen;
+            }
+            pos += fd.len;
+        }
+    }
+    return (uint_td)(pos - ptr);
+}
+
+uint_td tabledef::pack(char* ptr, size_t size) const
+{
+    char* pos = ptr;
+    char* end = pos + size;
+    int movelen;
+    for (int i = 0; i < fieldCount; i++)
+    {
+        fielddef& fd = fieldDefs[i];
+        if (fd.type == ft_myfixedbinary)
+        {
+            memmove(pos + 2, pos, fd.len - 2); // move as size pace in the field
+            *((unsigned short*)(pos)) = fd.len - 2; // fixed size
+            pos += fd.len;
+        }
+        else
+        {
+            int blen = fd.varLenBytes();
+            int dl = fd.len; // length
+            if (blen == 1)
+                dl = *((unsigned char*)(pos)) + blen;
+            else if (blen == 2)
+                dl = *((unsigned short*)(pos)) + blen;
+            pos += dl;
+            if ((movelen = fd.len - dl) != 0)
+            {
+                end -= movelen;
+                memmove(pos, pos + movelen, end - pos);
+            }
+        }
+    }
+    return (uint_td)(pos - ptr);
+}
+
 ushort_td lenByCharnum(uchar_td type, uchar_td charsetIndex, ushort_td charnum)
 {
     ushort_td len = charnum;
@@ -517,6 +591,10 @@ PACKAGE uchar_td getFilterLogicTypeCode(const _TCHAR* cmpstr)
         return (uchar_td)eLessEq;
     else if (_tcscmp(cmpstr, _T("<=")) == 0)
         return (uchar_td)eLessEq;
+    else if (_tcscmp(cmpstr, _T("&")) == 0)
+        return (uchar_td)eBitAnd;
+    else if (_tcscmp(cmpstr, _T("!&")) == 0)
+        return (uchar_td)eNotBitAnd;
     else if (_tcscmp(cmpstr, _T("=i")) == 0)
         return (uchar_td)eEqual | CMPLOGICAL_CASEINSENSITIVE;
     else if (_tcscmp(cmpstr, _T(">i")) == 0)

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

@@ -719,6 +719,9 @@ struct PACKAGE tabledef
         strncpy_s(m_tableName, TABLE_NAME_SIZE, s, sizeof(m_tableName) - 1);
     }
 
+    uint_td unPack(char* ptr, size_t size) const;
+    uint_td pack(char* ptr, size_t size) const;
+
     ushort_td id; // table id
 
 #ifdef SWIG
@@ -824,7 +827,9 @@ enum eCompType
     eLess = 3,
     eNotEq = 4,
     eGreaterEq = 5,
-    eLessEq = 6
+    eLessEq = 6,
+    eBitAnd = 8,
+    eNotBitAnd = 9
 };
 
 PACKAGE uchar_td getFilterLogicTypeCode(const _TCHAR* cmpstr);

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

@@ -503,7 +503,7 @@ struct handshale_t
  */
 #define C_INTERFACE_VER_MAJOR "2"//##1 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
+#define C_INTERFACE_VER_RELEASE "2"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -567,7 +567,7 @@ struct handshale_t
 
 #define CPP_INTERFACE_VER_MAJOR "2"//##4 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
+#define CPP_INTERFACE_VER_RELEASE "2"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -584,6 +584,6 @@ struct handshale_t
 
 #define TRANSACTD_VER_MAJOR 2//##7 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
+#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

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

@@ -344,7 +344,7 @@ static st_mysql_show_var g_statusVariables[] = {
     { "trnsctd_pipe_wait_threads", (char*)&pipe::g_waitThread, SHOW_INT },
 #endif
     { "trnsctd_cur_open_databases", (char*)&g_openDatabases, SHOW_INT },
-    { 0, 0, (enum_mysql_show_type)0 }
+    { NULL, NULL, (enum_mysql_show_type)0 }
 };
 
 /** plugin struct.

data/source/bzs/env/compiler.h

@@ -143,6 +143,14 @@
 
 
 // compiler name
+#if (_MSC_VER == 1400)
+#define COMPILER_VERSTR "vc80"
+#endif
+
+#if (_MSC_VER == 1500)
+#define COMPILER_VERSTR "vc90"
+#endif
+
 #if (_MSC_VER == 1600)
 #define COMPILER_VERSTR "vc100"
 #endif
@@ -155,6 +163,10 @@
 #define COMPILER_VERSTR "vc120"
 #endif
 
+#if (_MSC_VER == 1900)
+#define COMPILER_VERSTR "vc140"
+#endif
+
 #if (__BCPLUSPLUS__ >= 0x630 && (__BCPLUSPLUS__ < 0x640))
 #define COMPILER_VERSTR "bc150"
 #endif

data/source/bzs/env/tcharMinGW.h

@@ -40,6 +40,7 @@ typedef wchar_t _TUCHAR;
 #else // NOT _UNICODE
 
 #define _tcsncpy_s strncpy_s
+#define _tcsupr_s(a, b) (_strupr(a))
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) // 4.5 and lesser
 #define _tcscpy_s strcpy_s

data/source/bzs/netsvc/client/tcpClient.h

@@ -28,9 +28,11 @@
 #if (BOOST_VERSION > 104900)
 #include <boost/asio/deadline_timer.hpp>
 #else
-#ifdef __APPLE__
+#if (!defined(__BCPLUSPLUS__) || defined(__clang__) || (__BCPLUSPLUS__ > 0x0651))
 #include <boost/asio.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#else
+#define NO_CONNECT_TIMER
 #endif
 #endif
 
@@ -405,7 +407,7 @@ public:
 
 /** Implementation of The TCP connection.
  */
-#if defined(LINUX)
+#ifndef NO_CONNECT_TIMER
 #define USE_CONNECT_TIMER
 #endif
 

data/source/bzs/netsvc/server/serverCpt.cpp

@@ -200,6 +200,7 @@ public:
     {
         m_ios.reset();
         m_socket.set_option(boost::asio::ip::tcp::no_delay(true));
+        m_socket.set_option(boost::asio::socket_base::keep_alive(true));
         boost::system::error_code ec;
         m_socket.set_option(
             boost::asio::socket_base::receive_buffer_size(512 * 1024), ec);

data/source/bzs/netsvc/server/serverTpool.cpp

@@ -313,6 +313,9 @@ public:
         {
             const boost::asio::ip::tcp::no_delay nodelay(true);
             m_newConnection->socket().set_option(nodelay);
+            m_newConnection->socket().set_option(
+                        boost::asio::socket_base::keep_alive(true));
+
             boost::system::error_code ec;
             tcp::endpoint endpoint =
                 m_newConnection->socket().remote_endpoint(ec);

data/source/bzs/test/tdclphp/transactd_Test.php

@@ -1722,7 +1722,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $tb = $this->openTable($db);
         Bz\pooledDbManager::setMaxConnections(3);
         // Lock last record and insert to next of it
-        $w = new SeekLessThanWorker();
+        /*$w = new SeekLessThanWorker();
         $tb->setFV(FDI_ID, 300000);
         $tb->seekLessThan(false, Bz\transactd::ROW_LOCK_X);
         $this->assertEquals($tb->stat(), 0);
@@ -1755,7 +1755,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
                 $tb->del();
                 $this->assertEquals($tb->stat(), 0);
             }
-        }
+        }*/
         // Lock last record and delete it
         $w = new SeekLessThanWorker();
         $tb->setFV(FDI_ID, 300000);

data/source/bzs/test/tdclphp/transactd_pool_Test.php

@@ -130,4 +130,10 @@ class transactdPoolTest extends PHPUnit_Framework_TestCase
         }
         $this->assertEquals(true, true);
     }
+    
+    public function testReset()
+    {
+        $dbm1 = new Bz\pooledDbManager();
+        $dbm1->reset(0);
+    }
 }

data/source/bzs/test/trdclengn/test_trdclengn.cpp

@@ -113,7 +113,7 @@ const _TCHAR* makeUri(const _TCHAR* protocol, const _TCHAR* host,
                       const _TCHAR* dbname, const _TCHAR* dbfile=_T(""))
 {
     connectParams cp(protocol, host, dbname, dbfile, g_userName, g_password);
-    _tcscpy(g_uri, cp.uri());
+    _tcscpy_s(g_uri, 260, cp.uri());
     /*if (dbfile)
         _stprintf_s(g_uri, MAX_PATH, _T("%s://%s/%s?dbfile=%s"), protocol, host,
                     dbname, dbfile);
@@ -3648,7 +3648,7 @@ void testGetEqualKanji(database* db)
 void testResultField(database* db)
 {
     table* tb = openTable(db);
-    resultField rf;
+    resultField rf = {0, 0};
     rf.setParam(tb, _T("name"));
 
     BOOST_CHECK_MESSAGE(rf.len == 33, " resultField.setParam");

data/source/global/ormsrcgen/srcgen.cpp

@@ -533,8 +533,7 @@ string cppSrcGen::makeMapWriteString()
 string cppSrcGen::makeMapKeyCompString()
 {
     string ret;
-    if ((m_tabledef->primaryKeyNum >= 0) &&
-        (m_tabledef->primaryKeyNum < m_tabledef->keyCount))
+    if (m_tabledef->primaryKeyNum < m_tabledef->keyCount)
     {
         keydef* kd = &m_tabledef->keyDefs[m_tabledef->primaryKeyNum];
         string idt = "\t";

data/source/linux/tchar.h

@@ -333,6 +333,7 @@ typedef char _TUCHAR;
 #define _tcsset _strset
 #define _tcslwr _strlwr
 #define _tcsupr _strupr
+#define _tcsupr_s(a, b) (_strupr(a))
 #define _tcsxfrm strxfrm
 #define _tcscoll strcoll
 #define _tcsicoll _stricoll

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp
@@ -328,8 +328,8 @@ files:
 - ./README.md
 - ./README_ORMSRCGEN-JA.md
 - ./README_ORMSRCGEN.md
-- ./RELEASE_NOTE
-- ./RELEASE_NOTE-JA
+- ./RELEASE_NOTE-JA.md
+- ./RELEASE_NOTE.md
 - ./transactd.gemspec
 homepage: http://www.bizstation.jp/ja/transactd
 licenses: