transactd 3.7.3 → 3.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/common/{tdclc_32_3_7.dll → tdclc_32_3_8.dll} +0 -0
- data/bin/common/{tdclc_64_3_7.dll → tdclc_64_3_8.dll} +0 -0
- data/build/tdclc/tdclc.cbproj +1 -1
- data/build/tdclc/tdclc.rc +4 -4
- data/build/tdclcpp/tdclcpp.rc +4 -4
- data/build/tdclcpp/tdclcpp_bc.cbproj +1 -1
- data/build/tdclrb/tdclrb.rc +4 -4
- data/source/bzs/db/engine/mysql/mysqlInternal.h +3 -0
- data/source/bzs/db/protocol/tdap/client/memRecord.cpp +7 -15
- data/source/bzs/db/protocol/tdap/client/memRecord.h +0 -2
- data/source/bzs/db/protocol/tdap/client/nsDatabase.cpp +2 -0
- data/source/bzs/db/protocol/tdap/client/recordset.cpp +6 -2
- data/source/bzs/db/protocol/tdap/client/recordsetImple.h +8 -12
- data/source/bzs/db/protocol/tdap/client/table.cpp +1 -1
- data/source/bzs/db/protocol/tdap/tdapcapi.h +6 -6
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c0a57f053d27928a7d9c43c519b041409148e84a
|
4
|
+
data.tar.gz: 3c5ab3051ac77819d4c49b29f99f1f7111bebc90
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 09912b2aa99f706ee680e34793e4a3760a30544e40f09af573bd3dc832669149d2210d229b453b97a82ec4763602c39cf24e151981c9a9e4d694b3b3e8bed7c7
|
7
|
+
data.tar.gz: 31fb981b7c2dcbcf3433d0e318fe36680848a9c37c84e24404fb1298ad73ed65720c9727db444ee4daee4ddc14233ff82dc580fa713edbbd67e7fb73fd43a508
|
Binary file
|
Binary file
|
data/build/tdclc/tdclc.cbproj
CHANGED
@@ -62,7 +62,7 @@
|
|
62
62
|
<VerInfo_Locale>1041</VerInfo_Locale>
|
63
63
|
<BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
|
64
64
|
<BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
|
65
|
-
<DllSuffix>
|
65
|
+
<DllSuffix>_3_8</DllSuffix>
|
66
66
|
<DynamicRTL>false</DynamicRTL>
|
67
67
|
<BPILibOutputDir>..\..\lib</BPILibOutputDir>
|
68
68
|
<BCC_PCHUsage>None</BCC_PCHUsage>
|
data/build/tdclc/tdclc.rc
CHANGED
@@ -29,8 +29,8 @@
|
|
29
29
|
//
|
30
30
|
|
31
31
|
VS_VERSION_INFO VERSIONINFO
|
32
|
-
FILEVERSION 3,
|
33
|
-
PRODUCTVERSION 3,
|
32
|
+
FILEVERSION 3,8,0,256
|
33
|
+
PRODUCTVERSION 3,8,0,256
|
34
34
|
FILEFLAGSMASK 0x3fL
|
35
35
|
#ifdef _DEBUG
|
36
36
|
FILEFLAGS 0x1L
|
@@ -47,9 +47,9 @@ BEGIN
|
|
47
47
|
BEGIN
|
48
48
|
VALUE "CompanyName", "BizStation Corp."
|
49
49
|
VALUE "FileDescription", "Transactd C client"
|
50
|
-
VALUE "FileVersion", "3.
|
50
|
+
VALUE "FileVersion", "3.8.0.256"
|
51
51
|
VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
|
52
|
-
VALUE "ProductVersion", "3.
|
52
|
+
VALUE "ProductVersion", "3.8.0.256"
|
53
53
|
VALUE "ProductName", "Transactd Client (GPL V2)"
|
54
54
|
END
|
55
55
|
END
|
data/build/tdclcpp/tdclcpp.rc
CHANGED
@@ -29,8 +29,8 @@
|
|
29
29
|
//
|
30
30
|
|
31
31
|
VS_VERSION_INFO VERSIONINFO
|
32
|
-
FILEVERSION 3,
|
33
|
-
PRODUCTVERSION 3,
|
32
|
+
FILEVERSION 3,8,0,256
|
33
|
+
PRODUCTVERSION 3,8,0,256
|
34
34
|
FILEFLAGSMASK 0x3fL
|
35
35
|
#ifdef _DEBUG
|
36
36
|
FILEFLAGS 0x1L
|
@@ -47,9 +47,9 @@ BEGIN
|
|
47
47
|
BEGIN
|
48
48
|
VALUE "CompanyName", "BizStation Corp."
|
49
49
|
VALUE "FileDescription", "Transactd C++ client"
|
50
|
-
VALUE "FileVersion", "3.
|
50
|
+
VALUE "FileVersion", "3.8.0.256"
|
51
51
|
VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
|
52
|
-
VALUE "ProductVersion", "3.
|
52
|
+
VALUE "ProductVersion", "3.8.0.256"
|
53
53
|
VALUE "ProductName", "Transactd Client (GPL V2)"
|
54
54
|
END
|
55
55
|
END
|
@@ -153,7 +153,7 @@
|
|
153
153
|
<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
|
154
154
|
<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
|
155
155
|
<TD_VER_MAJOR>3</TD_VER_MAJOR>
|
156
|
-
<TD_VER_MINOR>
|
156
|
+
<TD_VER_MINOR>8</TD_VER_MINOR>
|
157
157
|
<DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
|
158
158
|
<TD_CPU>32</TD_CPU>
|
159
159
|
</PropertyGroup>
|
data/build/tdclrb/tdclrb.rc
CHANGED
@@ -29,8 +29,8 @@
|
|
29
29
|
//
|
30
30
|
|
31
31
|
VS_VERSION_INFO VERSIONINFO
|
32
|
-
FILEVERSION 3,
|
33
|
-
PRODUCTVERSION 3,
|
32
|
+
FILEVERSION 3,8,0,256
|
33
|
+
PRODUCTVERSION 3,8,0,256
|
34
34
|
FILEFLAGSMASK 0x3fL
|
35
35
|
#ifdef _DEBUG
|
36
36
|
FILEFLAGS 0x1L
|
@@ -47,9 +47,9 @@ BEGIN
|
|
47
47
|
BEGIN
|
48
48
|
VALUE "CompanyName", "BizStation Corp."
|
49
49
|
VALUE "FileDescription", "Transactd Ruby client"
|
50
|
-
VALUE "FileVersion", "3.
|
50
|
+
VALUE "FileVersion", "3.8.0.256"
|
51
51
|
VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
|
52
|
-
VALUE "ProductVersion", "3.
|
52
|
+
VALUE "ProductVersion", "3.8.0.256"
|
53
53
|
VALUE "ProductName", "Transactd Client (GPL V2)"
|
54
54
|
END
|
55
55
|
END
|
@@ -796,6 +796,9 @@ struct innodb_prebuit
|
|
796
796
|
|
797
797
|
void* dummy2; //mysql_row_templ_t* mysql_template
|
798
798
|
void* dummy3; //mem_heap_t* heap;
|
799
|
+
#if (defined(MYSQL_5_7) && MYSQL_VERSION_ID >= 50719) || (defined(MYSQL_5_6) && MYSQL_VERSION_ID >= 50637)
|
800
|
+
void* dummy3b; //mem_heap_t* cursor_heap;
|
801
|
+
#endif
|
799
802
|
void* dummy4; //ins_node_t* ins_node;
|
800
803
|
void* dummy5; //byte* ins_upd_rec_buff
|
801
804
|
void* dummy6; //const byte* default_rec;
|
@@ -36,7 +36,7 @@ namespace client
|
|
36
36
|
{
|
37
37
|
|
38
38
|
autoMemory::autoMemory() : refarymem(), ptr(0), endFieldIndex(NULL), size(0),
|
39
|
-
|
39
|
+
owner(false)
|
40
40
|
{
|
41
41
|
}
|
42
42
|
|
@@ -45,7 +45,7 @@ void autoMemory::setParams(unsigned char* p, size_t s, short* endIndex, bool own
|
|
45
45
|
if (owner)
|
46
46
|
{
|
47
47
|
delete[] ptr;
|
48
|
-
delete
|
48
|
+
delete endFieldIndex;
|
49
49
|
}
|
50
50
|
|
51
51
|
ptr = p;
|
@@ -59,24 +59,17 @@ void autoMemory::setParams(unsigned char* p, size_t s, short* endIndex, bool own
|
|
59
59
|
memcpy(ptr, p, size);
|
60
60
|
else
|
61
61
|
memset(ptr, 0, size + 1);
|
62
|
-
endFieldIndex = new short
|
63
|
-
|
62
|
+
endFieldIndex = new short;
|
63
|
+
*endFieldIndex = 0;
|
64
64
|
if (endIndex != NULL)
|
65
|
-
endFieldIndex
|
65
|
+
*endFieldIndex = *endIndex;
|
66
66
|
}
|
67
67
|
}
|
68
68
|
|
69
|
-
short* autoMemory::appendEndFieldIndex(short value)
|
70
|
-
{
|
71
|
-
assert(owner);
|
72
|
-
endFieldIndex[++usedIndex] = value;
|
73
|
-
return endFieldIndex + (usedIndex);
|
74
|
-
}
|
75
|
-
|
76
69
|
void autoMemory::assignEndFieldIndex(short* p)
|
77
70
|
{
|
78
71
|
assert(owner);
|
79
|
-
|
72
|
+
*endFieldIndex = *p;
|
80
73
|
}
|
81
74
|
|
82
75
|
autoMemory::~autoMemory()
|
@@ -84,11 +77,10 @@ autoMemory::~autoMemory()
|
|
84
77
|
if (owner)
|
85
78
|
{
|
86
79
|
delete[] ptr;
|
87
|
-
delete
|
80
|
+
delete endFieldIndex;
|
88
81
|
}
|
89
82
|
}
|
90
83
|
|
91
|
-
|
92
84
|
autoMemory& autoMemory::operator=(const autoMemory& p)
|
93
85
|
{
|
94
86
|
if (owner)
|
@@ -44,12 +44,10 @@ public:
|
|
44
44
|
void setParams(unsigned char* p, size_t s, short* endIndex, bool own);
|
45
45
|
|
46
46
|
autoMemory& operator=(const bzs::db::protocol::tdap::client::autoMemory& p);
|
47
|
-
short* appendEndFieldIndex(short value);
|
48
47
|
void assignEndFieldIndex(short* p);
|
49
48
|
unsigned char* ptr;
|
50
49
|
short* endFieldIndex;
|
51
50
|
unsigned int size;
|
52
|
-
unsigned char usedIndex;
|
53
51
|
bool owner ;
|
54
52
|
static autoMemory* create(int n);
|
55
53
|
static autoMemory* create();
|
@@ -693,6 +693,7 @@ void nsdatabase::resetSnapshot()
|
|
693
693
|
|
694
694
|
void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
|
695
695
|
{
|
696
|
+
if (!isUseTransactd()) return;
|
696
697
|
if (!checkAssociate()) return;
|
697
698
|
|
698
699
|
if (m_nsimpl->snapShotCount == 0)
|
@@ -727,6 +728,7 @@ void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
|
|
727
728
|
|
728
729
|
void nsdatabase::endSnapshot()
|
729
730
|
{
|
731
|
+
if (!isUseTransactd()) return;
|
730
732
|
m_nsimpl->snapShotCount--;
|
731
733
|
if (m_nsimpl->snapShotCount == 0)
|
732
734
|
m_stat = tdap(TD_END_SNAPSHOT, NULL, NULL, NULL, NULL, 0, 0);
|
@@ -182,13 +182,17 @@ recordset& recordset::reverse()
|
|
182
182
|
|
183
183
|
recordset& recordset::join(const recordset& rs, recordsetQuery& rq)
|
184
184
|
{
|
185
|
-
|
185
|
+
recordset* rst = rs.clone();
|
186
|
+
m_imple->nestedLoopJoin(*rst->m_imple, rq, true);
|
187
|
+
rst->release();
|
186
188
|
return *this;
|
187
189
|
}
|
188
190
|
|
189
191
|
recordset& recordset::outerJoin(const recordset& rs, recordsetQuery& rq)
|
190
192
|
{
|
191
|
-
|
193
|
+
recordset* rst = rs.clone();
|
194
|
+
m_imple->nestedLoopJoin(*rst->m_imple, rq, false);
|
195
|
+
rst->release();
|
192
196
|
return *this;
|
193
197
|
}
|
194
198
|
|
@@ -341,12 +341,10 @@ private:
|
|
341
341
|
m_fds->append(r.m_fds.get());
|
342
342
|
|
343
343
|
// append memblock
|
344
|
-
std::vector<short*> endIndex;
|
345
344
|
for (size_t i = 0;i < r.m_memblock.size(); ++i)
|
346
345
|
{
|
347
346
|
m_memblock.push_back(r.m_memblock[i]);
|
348
|
-
|
349
|
-
endIndex.push_back(ei);
|
347
|
+
*(r.m_memblock[i]->endFieldIndex) = *(r.m_memblock[i]->endFieldIndex) + fieldCount;
|
350
348
|
}
|
351
349
|
|
352
350
|
if (r.size() == 0) return;
|
@@ -360,17 +358,18 @@ private:
|
|
360
358
|
autoMemory* nullRecordAm = 0;
|
361
359
|
for (int i = 0; i < (int)m_recordset.size(); ++i)
|
362
360
|
{
|
361
|
+
// each row
|
363
362
|
memoryRecord* row = dynamic_cast<memoryRecord*>(m_recordset[i]);
|
364
363
|
for (int j = 0; j < (int)rblockSize; ++j)
|
365
364
|
{
|
365
|
+
// each memory block
|
366
366
|
autoMemory* mb = amar + amsize;
|
367
367
|
if (indexes[i] != -1)
|
368
368
|
{
|
369
369
|
memoryRecord* srow = dynamic_cast<memoryRecord*>(r.m_recordset[indexes[i]]);
|
370
370
|
assert(srow->memBlockSize() == rblockSize);
|
371
371
|
const autoMemory& smb = srow->memBlock(j);
|
372
|
-
|
373
|
-
row->setRecordData(mb, smb.ptr, 0, endIndex[index], false);
|
372
|
+
row->setRecordData(mb, smb.ptr, 0, smb.endFieldIndex, false);
|
374
373
|
}else
|
375
374
|
{
|
376
375
|
// Alloc data buffer for not found record.
|
@@ -378,7 +377,7 @@ private:
|
|
378
377
|
{
|
379
378
|
nullRecordAm = autoMemory::create();
|
380
379
|
nullRecordAm->addref();
|
381
|
-
short endIndex = (short)m_fds->size();
|
380
|
+
short endIndex = (short)(m_fds->size());
|
382
381
|
nullRecordAm->setParams(0, r.m_fds->totalFieldLen(), &endIndex, true);
|
383
382
|
m_memblock.push_back(boost::shared_ptr<autoMemory>(nullRecordAm, boost::bind(&autoMemory::release, _1)));
|
384
383
|
}
|
@@ -620,14 +619,11 @@ public:
|
|
620
619
|
inline void removeField(int index)
|
621
620
|
{
|
622
621
|
m_fds->remove(index);
|
623
|
-
|
624
622
|
for (int i = 0; i < (int)m_memblock.size(); ++i)
|
625
623
|
{
|
626
|
-
|
627
|
-
|
628
|
-
|
629
|
-
*(m_memblock[i]->endFieldIndex) = v;
|
630
|
-
}
|
624
|
+
short v = *(m_memblock[i]->endFieldIndex);
|
625
|
+
if (v > index)
|
626
|
+
*(m_memblock[i]->endFieldIndex) = v - 1;
|
631
627
|
}
|
632
628
|
}
|
633
629
|
|
@@ -669,8 +669,8 @@ struct handshale_t
|
|
669
669
|
If you change this version then you need change The ($TargetName) project options too.
|
670
670
|
*/
|
671
671
|
#define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
|
672
|
-
#define C_INTERFACE_VER_MINOR "
|
673
|
-
#define C_INTERFACE_VER_RELEASE "
|
672
|
+
#define C_INTERFACE_VER_MINOR "8"//##2 Build marker! Don't remove
|
673
|
+
#define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
|
674
674
|
|
675
675
|
/* dnamic load library name.
|
676
676
|
The default extention of Mac is ".boudle", Therefore ".so" is popular. */
|
@@ -733,8 +733,8 @@ struct handshale_t
|
|
733
733
|
*/
|
734
734
|
|
735
735
|
#define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
|
736
|
-
#define CPP_INTERFACE_VER_MINOR "
|
737
|
-
#define CPP_INTERFACE_VER_RELEASE "
|
736
|
+
#define CPP_INTERFACE_VER_MINOR "8"//##5 Build marker! Don't remove
|
737
|
+
#define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
|
738
738
|
|
739
739
|
/* use autolink tdclcpp */
|
740
740
|
#if (__BCPLUSPLUS__ || _MSC_VER)
|
@@ -770,7 +770,7 @@ struct handshale_t
|
|
770
770
|
|
771
771
|
|
772
772
|
#define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
|
773
|
-
#define TRANSACTD_VER_MINOR
|
774
|
-
#define TRANSACTD_VER_RELEASE
|
773
|
+
#define TRANSACTD_VER_MINOR 8//##8 Build marker! Don't remove
|
774
|
+
#define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
|
775
775
|
|
776
776
|
#endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: transactd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- BizStation Corp.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-08-24 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: Transactd client for ruby gem
|
14
14
|
email: transactd@bizstation.jp
|
@@ -19,8 +19,8 @@ extra_rdoc_files: []
|
|
19
19
|
files:
|
20
20
|
- CMakeLists.txt
|
21
21
|
- build/tdclrb/bldgem/extconf.rb
|
22
|
-
- bin/common/
|
23
|
-
- bin/common/
|
22
|
+
- bin/common/tdclc_32_3_8.dll
|
23
|
+
- bin/common/tdclc_64_3_8.dll
|
24
24
|
- source/bzs/db/blobBuffer.h
|
25
25
|
- source/bzs/db/blobStructs.h
|
26
26
|
- source/bzs/db/engine/mysql/bookmark.h
|