transactd 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbc01b26f29b11d258e5b15a8c5a93536eee8902
-  data.tar.gz: 0b02c3794f9152c151abe01256fa5e6f89ddc8d2
+  metadata.gz: 9a6e37eded18240c277e6fea720199234c581837
+  data.tar.gz: 09541f409af08984f721440e6fec29506f5be58f
 SHA512:
-  metadata.gz: 9106821502f1a2ebe7ceb4ad334ee91a411a1ea96ac299bb29337438bfc04525da86c5c3bc968ec31eabbae3f1c1b1ea38500624c8954fb14a14a8ca1a68899c
-  data.tar.gz: 6c5bbe98ca9367edc34b83f5aedb3bab2292e5030d0650fe298614852573105651b6d3bbc959cda6bf182fd8921888ee08c09fbb114d773cd52ba8a8188618fa
+  metadata.gz: 17c2b64b4ab134dcc64de8b58da8f99afe0cf4c962d38c1ec38075a945c0a9def2455aeebfbd2f6fb6016f9e9899d1520211892e338cac4855025c4c28a6e820
+  data.tar.gz: ba3c67e98c394e2670026c19c6e2fbb3edb5d61a9013747040d1b649b6f7917e45509dc4883149eed70833ac907e668bd4230475971dabb8df25efafbf5bccb7

data/RELEASE_NOTE-JA.md

@@ -1,5 +1,12 @@
 リリースノート
 
+================================================================================
+Version 2.4.3 2015/08/31
+================================================================================
+修正と変更点 (Client only)
+--------------------------------------------------------------------------------
+* ユニオンされたレコードセットのJoinが正しく動作しない不具合を修正しました。
+
 ================================================================================
 Version 2.4.2 2015/08/31
 ================================================================================

data/RELEASE_NOTE.md

@@ -1,4 +1,12 @@
 Release note
+================================================================================
+Version 2.4.3 2015/08/31
+================================================================================
+Modifications (Client only)
+--------------------------------------------------------------------------------
+* Fix a bug that does not work correctly Join with Union record set.
+
+
 ================================================================================
 Version 2.4.2 2015/08/31
 ================================================================================

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,91
- PRODUCTVERSION 2,4,2,91
+ FILEVERSION 2,4,2,92
+ PRODUCTVERSION 2,4,2,92
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "2.4.2.91"
+            VALUE "FileVersion", "2.4.2.92"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.2.91"
+            VALUE "ProductVersion", "2.4.2.92"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,91
- PRODUCTVERSION 2,4,2,91
+ FILEVERSION 2,4,3,92
+ PRODUCTVERSION 2,4,3,92
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "2.4.2.91"
+            VALUE "FileVersion", "2.4.3.92"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.2.91"
+            VALUE "ProductVersion", "2.4.3.92"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,91
- PRODUCTVERSION 2,4,2,91
+ FILEVERSION 2,4,3,92
+ PRODUCTVERSION 2,4,3,92
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "2.4.2.91"
+            VALUE "FileVersion", "2.4.3.92"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.2.91"
+            VALUE "ProductVersion", "2.4.3.92"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -72,7 +72,7 @@ class multiRecordAlocatorImple : public multiRecordAlocator
     const std::vector<std::vector<int> >* m_joinRowMap;
     int m_rowOffset;
     int m_addType;
-    int m_curFirstFiled;
+    int m_curFirstField;
 
 public:
     inline multiRecordAlocatorImple(recordsetImple* rs);
@@ -83,7 +83,7 @@ public:
     inline void setRowOffset(int v) { m_rowOffset = v; }
     inline void setJoinType(int v) { m_addType = v; }
     inline void setInvalidRecord(size_t row, bool v);
-    inline void setCurFirstFiled(int v) { m_curFirstFiled = v; }
+    inline void setCurFirstField(int v) { m_curFirstField = v; }
     inline void setJoinRowMap(const std::vector<std::vector<int> >* v)
     {
         m_joinRowMap = v;
@@ -103,7 +103,6 @@ class recordsetImple
     boost::shared_ptr<multiRecordAlocatorImple> m_mra;
     std::vector<row_ptr> m_recordset;
     std::vector<boost::shared_ptr<autoMemory> > m_memblock;
-    std::vector<boost::shared_ptr<fielddefs> > m_unionFds;
 
     /* for registerMemoryBlock temp data */
     size_t m_joinRows;
@@ -147,7 +146,7 @@ private:
         {
             m_joinRows = 0;
             m_mra->setRowOffset(0);
-            m_mra->setCurFirstFiled((int)m_fds->size());
+            m_mra->setCurFirstField((int)m_fds->size());
             if (tb)
                 m_fds->copyFrom(tb);
             if (tb && (addtype == mra_nojoin))
@@ -256,8 +255,8 @@ public:
 
     inline recordsetImple(const recordsetImple& r)
         : m_fds(r.m_fds),m_mra(r.m_mra), m_recordset(r.m_recordset),
-          m_memblock(r.m_memblock), m_unionFds(r.m_unionFds),
-          m_joinRows(r.m_joinRows), m_uniqueReadMaxField(r.m_uniqueReadMaxField)
+          m_memblock(r.m_memblock), m_joinRows(r.m_joinRows),
+          m_uniqueReadMaxField(r.m_uniqueReadMaxField)
     {
         for (size_t i = 0; i < m_recordset.size(); ++i)
             m_recordset[i]->addref();
@@ -279,7 +278,6 @@ public:
             m_mra = r.m_mra;
             m_recordset = r.m_recordset;
             m_memblock = r.m_memblock;
-            m_unionFds = r.m_unionFds;
             m_joinRows = r.m_joinRows;
             m_uniqueReadMaxField = r.m_uniqueReadMaxField;
             for (size_t i = 0; i < m_recordset.size(); ++i)
@@ -296,7 +294,6 @@ public:
         recordsetImple* p = new recordsetImple();
         p->m_joinRows = m_joinRows;
         p->m_uniqueReadMaxField = m_uniqueReadMaxField;
-        p->m_unionFds = m_unionFds;
         p->m_fds.reset(m_fds->clone(), boost::bind(&fielddefs::release, _1));
 
         std::vector<size_t> offsets;
@@ -391,7 +388,6 @@ public:
         {
             clearRecords();
             m_fds->clear();
-            m_unionFds.clear();
             m_memblock.clear();
         }
     }
@@ -480,8 +476,6 @@ public:
     inline void removeField(int index)
     {
         m_fds->remove(index);
-        for (int i = 0; i < (int)m_unionFds.size(); ++i)
-            m_unionFds[i]->remove(index);
 
         for (int i = 0; i < (int)m_memblock.size(); ++i)
         {
@@ -578,8 +572,6 @@ public:
         if (fd.blobLenBytes())
             THROW_BZS_ERROR_WITH_MSG(_T("Can not append Blob or Text field."));
         m_fds->push_back(&fd);
-        for (int i = 0; i < (int)m_unionFds.size(); ++i)
-            m_unionFds[i]->push_back(&fd);
         if (size())
             registerMemoryBlock(NULL, fd.len * size(), fd.len, mra_outerjoin);
     }
@@ -590,9 +582,11 @@ public:
             THROW_BZS_ERROR_WITH_MSG(_T("Recordsets are different format"));
 
         m_recordset.reserve(m_recordset.size() + r.size());
-        m_unionFds.push_back(r.m_fds);
         for (size_t i = 0; i < r.size(); ++i)
+        {
             push_back(r.m_recordset[i]);
+            r.m_recordset[i]->setFielddefs(m_fds.get());
+        }
         for (size_t i = 0; i < r.m_memblock.size(); ++i)
             m_memblock.push_back(r.m_memblock[i]);
         return *this;
@@ -622,7 +616,7 @@ public:
 
 inline multiRecordAlocatorImple::multiRecordAlocatorImple(recordsetImple* rs)
     : m_rs(rs), m_joinRowMap(NULL), m_rowOffset(0), m_addType(0),
-      m_curFirstFiled(0)
+      m_curFirstField(0)
 {
 }
 
@@ -640,7 +634,7 @@ unsigned char* multiRecordAlocatorImple::allocBlobBlock(size_t size)
 
 inline unsigned char* multiRecordAlocatorImple::ptr(size_t row, int stat)
 {
-    int col = (stat == mra_current_block) ? m_curFirstFiled : 0;
+    int col = (stat == mra_current_block) ? m_curFirstField : 0;
     size_t rowNum = m_joinRowMap ? (*m_joinRowMap)[row + m_rowOffset][0]
                                  : row + m_rowOffset;
     return (*m_rs)[rowNum].ptr(col);

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

@@ -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 "2"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "3"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp