transactd 3.7.3 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43c70f7ba625145762a498772fa4b02ba02e150
-  data.tar.gz: 71c277ba399849a65d6310d59ba37bad75325ce2
+  metadata.gz: c0a57f053d27928a7d9c43c519b041409148e84a
+  data.tar.gz: 3c5ab3051ac77819d4c49b29f99f1f7111bebc90
 SHA512:
-  metadata.gz: ea6b61172b73a0e7446ce90c1b01e848fbb09b14e527ae10a91c78d68e9920d308b8ae8f7cc987c300239048b96b6bdb3c67988e0ed4a22b623c7d20c641fb66
-  data.tar.gz: 46c7a9a28edef3f95a9e4dc4ec083862724cdb9b496d8e32ad973deff47ef1e01cc4f07913f93d046c38337ff5030d540cb9561b29c220c7e3b13fa87fa37d6a
+  metadata.gz: 09912b2aa99f706ee680e34793e4a3760a30544e40f09af573bd3dc832669149d2210d229b453b97a82ec4763602c39cf24e151981c9a9e4d694b3b3e8bed7c7
+  data.tar.gz: 31fb981b7c2dcbcf3433d0e318fe36680848a9c37c84e24404fb1298ad73ed65720c9727db444ee4daee4ddc14233ff82dc580fa713edbbd67e7fb73fd43a508

data/build/tdclc/tdclc.cbproj

@@ -62,7 +62,7 @@
         <VerInfo_Locale>1041</VerInfo_Locale>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_3_7</DllSuffix>
+        <DllSuffix>_3_8</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,3,252
- PRODUCTVERSION 3,7,3,252
+ FILEVERSION 3,8,0,256
+ PRODUCTVERSION 3,8,0,256
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "3.7.3.252"
+            VALUE "FileVersion", "3.8.0.256"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.7.3.252"
+            VALUE "ProductVersion", "3.8.0.256"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,3,252
- PRODUCTVERSION 3,7,3,252
+ FILEVERSION 3,8,0,256
+ PRODUCTVERSION 3,8,0,256
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "3.7.3.252"
+            VALUE "FileVersion", "3.8.0.256"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.7.3.252"
+            VALUE "ProductVersion", "3.8.0.256"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp_bc.cbproj

@@ -153,7 +153,7 @@
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <TD_VER_MAJOR>3</TD_VER_MAJOR>
-        <TD_VER_MINOR>7</TD_VER_MINOR>
+        <TD_VER_MINOR>8</TD_VER_MINOR>
         <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
         <TD_CPU>32</TD_CPU>
     </PropertyGroup>

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,3,252
- PRODUCTVERSION 3,7,3,252
+ FILEVERSION 3,8,0,256
+ PRODUCTVERSION 3,8,0,256
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "3.7.3.252"
+            VALUE "FileVersion", "3.8.0.256"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.7.3.252"
+            VALUE "ProductVersion", "3.8.0.256"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -796,6 +796,9 @@ struct innodb_prebuit
     
     void* dummy2; //mysql_row_templ_t* mysql_template
     void* dummy3; //mem_heap_t*	heap;
+#if (defined(MYSQL_5_7) && MYSQL_VERSION_ID >= 50719) || (defined(MYSQL_5_6) && MYSQL_VERSION_ID >= 50637)
+    void* dummy3b; //mem_heap_t*	cursor_heap;
+#endif
     void* dummy4; //ins_node_t*	ins_node;	
     void* dummy5; //byte* ins_upd_rec_buff	
     void* dummy6; //const byte*	default_rec;	

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

@@ -36,7 +36,7 @@ namespace client
 {
 
 autoMemory::autoMemory() : refarymem(), ptr(0), endFieldIndex(NULL), size(0),
-                            usedIndex(0), owner(false)
+                            owner(false)
 {
 }
 
@@ -45,7 +45,7 @@ void autoMemory::setParams(unsigned char* p, size_t s, short* endIndex, bool own
     if (owner)
     {
         delete[] ptr;
-        delete[] endFieldIndex;
+        delete endFieldIndex;
     }
 
     ptr = p;
@@ -59,24 +59,17 @@ void autoMemory::setParams(unsigned char* p, size_t s, short* endIndex, bool own
             memcpy(ptr, p, size);
         else
             memset(ptr, 0, size + 1);
-        endFieldIndex = new short[JOINLIMIT_PER_RECORD];
-        memset(endFieldIndex, 0, sizeof(short) * JOINLIMIT_PER_RECORD);
+        endFieldIndex = new short;
+        *endFieldIndex = 0;
         if (endIndex != NULL)
-            endFieldIndex[usedIndex] = *endIndex;
+            *endFieldIndex = *endIndex;
     }
 }
 
-short* autoMemory::appendEndFieldIndex(short value)
-{
-    assert(owner);
-    endFieldIndex[++usedIndex] = value;
-    return endFieldIndex + (usedIndex);
-}
-
 void autoMemory::assignEndFieldIndex(short* p)
 {
     assert(owner);
-    memcpy(endFieldIndex, p, sizeof(short) * JOINLIMIT_PER_RECORD);
+    *endFieldIndex = *p;
 }
 
 autoMemory::~autoMemory()
@@ -84,11 +77,10 @@ autoMemory::~autoMemory()
     if (owner)
     {
         delete[] ptr;
-        delete[] endFieldIndex;
+        delete endFieldIndex;
     }
 }
 
-
 autoMemory& autoMemory::operator=(const autoMemory& p)
 {
     if (owner)

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

@@ -44,12 +44,10 @@ public:
     void setParams(unsigned char* p, size_t s, short* endIndex, bool own);
 
     autoMemory& operator=(const bzs::db::protocol::tdap::client::autoMemory& p);
-    short* appendEndFieldIndex(short value);
     void assignEndFieldIndex(short* p);
     unsigned char* ptr;
     short* endFieldIndex;
     unsigned int size;
-    unsigned char usedIndex;
     bool owner ;
     static autoMemory* create(int n);
     static autoMemory* create();

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

@@ -693,6 +693,7 @@ void nsdatabase::resetSnapshot()
 
 void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
 {
+    if (!isUseTransactd()) return;
     if (!checkAssociate()) return;
 
     if (m_nsimpl->snapShotCount == 0)
@@ -727,6 +728,7 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
 
 void nsdatabase::endSnapshot()
 {
+    if (!isUseTransactd()) return;
     m_nsimpl->snapShotCount--;
     if (m_nsimpl->snapShotCount == 0)
         m_stat = tdap(TD_END_SNAPSHOT, NULL, NULL, NULL, NULL, 0, 0);

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

@@ -182,13 +182,17 @@ recordset& recordset::reverse()
 
 recordset& recordset::join(const recordset& rs, recordsetQuery& rq)
 {
-    m_imple->nestedLoopJoin(*rs.m_imple, rq, true);
+    recordset* rst = rs.clone();
+    m_imple->nestedLoopJoin(*rst->m_imple, rq, true);
+    rst->release();
     return *this;
 }
 
 recordset& recordset::outerJoin(const recordset& rs, recordsetQuery& rq)
 {
-    m_imple->nestedLoopJoin(*rs.m_imple, rq, false);
+    recordset* rst = rs.clone();
+    m_imple->nestedLoopJoin(*rst->m_imple, rq, false);
+    rst->release();
     return *this;
 }
 

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

@@ -341,12 +341,10 @@ private:
         m_fds->append(r.m_fds.get());
         
         // append memblock
-        std::vector<short*> endIndex;
         for (size_t i = 0;i < r.m_memblock.size(); ++i)
         {
             m_memblock.push_back(r.m_memblock[i]);
-            short* ei = r.m_memblock[i]->appendEndFieldIndex(*r.m_memblock[i]->endFieldIndex + fieldCount);
-            endIndex.push_back(ei);
+            *(r.m_memblock[i]->endFieldIndex) = *(r.m_memblock[i]->endFieldIndex) + fieldCount;
         }
 
         if (r.size() == 0) return;
@@ -360,17 +358,18 @@ private:
         autoMemory* nullRecordAm = 0;
         for (int i = 0; i < (int)m_recordset.size(); ++i)
         {
+            // each row
             memoryRecord* row = dynamic_cast<memoryRecord*>(m_recordset[i]);
             for (int j = 0; j < (int)rblockSize; ++j)
             {
+                // each memory block
                 autoMemory* mb = amar + amsize;
                 if (indexes[i] != -1)
                 {
                     memoryRecord* srow = dynamic_cast<memoryRecord*>(r.m_recordset[indexes[i]]);
                     assert(srow->memBlockSize() == rblockSize);
                     const autoMemory& smb = srow->memBlock(j);
-                    int index = r.getMemBlockIndex(smb.ptr);
-                    row->setRecordData(mb, smb.ptr, 0, endIndex[index], false);
+                    row->setRecordData(mb, smb.ptr, 0, smb.endFieldIndex, false);
                 }else
                 {
                     // Alloc data buffer for not found record.
@@ -378,7 +377,7 @@ private:
                     {
                         nullRecordAm = autoMemory::create();
                         nullRecordAm->addref();
-                        short endIndex = (short)m_fds->size();
+                        short endIndex = (short)(m_fds->size());
                         nullRecordAm->setParams(0, r.m_fds->totalFieldLen(), &endIndex, true);
                         m_memblock.push_back(boost::shared_ptr<autoMemory>(nullRecordAm, boost::bind(&autoMemory::release, _1)));
                     }                    
@@ -620,14 +619,11 @@ public:
     inline void removeField(int index)
     {
         m_fds->remove(index);
-
         for (int i = 0; i < (int)m_memblock.size(); ++i)
         {
-            if (*(m_memblock[i]->endFieldIndex) > index)
-            {
-                short v = *(m_memblock[i]->endFieldIndex) - 1;
-                *(m_memblock[i]->endFieldIndex) = v;
-            }
+            short v = *(m_memblock[i]->endFieldIndex);
+            if (v > index)
+                *(m_memblock[i]->endFieldIndex) = v - 1;
         }
     }
 

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

@@ -240,7 +240,7 @@ public:
     {
         len = *((unsigned short*)ptr);
         ptr += DATASIZE_BYTE;
-        sqnum = *((int*)(ptr));
+        sqnum = len ? *((int*)(ptr)) : -1;
         ptr += sizeof(int);
         ptr += len;
         return ptr;

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

@@ -669,8 +669,8 @@ struct handshale_t
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "7"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "3"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "8"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -733,8 +733,8 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "7"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "3"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "8"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -770,7 +770,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 7//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 3//##9 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 8//##8 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.8.0
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - CMakeLists.txt
 - build/tdclrb/bldgem/extconf.rb
-- bin/common/tdclc_32_3_7.dll
-- bin/common/tdclc_64_3_7.dll
+- bin/common/tdclc_32_3_8.dll
+- bin/common/tdclc_64_3_8.dll
 - source/bzs/db/blobBuffer.h
 - source/bzs/db/blobStructs.h
 - source/bzs/db/engine/mysql/bookmark.h