transactd 3.0.0 → 3.1.0

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

@@ -1044,7 +1044,14 @@ BOOST_AUTO_TEST_CASE(field_comp)
     testCompBlob();
     testCompDecimal();
 }
+BOOST_AUTO_TEST_SUITE_END()
 
+BOOST_AUTO_TEST_SUITE(snapshot)
+BOOST_AUTO_TEST_CASE(snapshot_binlog)
+{
+    testSnapshotWithbinlog();
+}
 BOOST_AUTO_TEST_SUITE_END()
 
+
 // ------------------------------------------------------------------------

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

@@ -42,9 +42,9 @@ public:
         if (m_db)
         {
             // Test for SWIG interface
-            m_db->release();
+            //m_db->release();
             // Test for c++
-            // database::destroy(m_db);
+            database::destroy(m_db);
         }
     }
 
@@ -68,8 +68,9 @@ public:
 
     ~fixtureKanji()
     {
-        if (m_db)
-            m_db->release();
+        //if (m_db)
+        //    m_db->release();
+        database::destroy(m_db);
     }
     ::database* db() const { return m_db; }
 };
@@ -541,8 +542,8 @@ void testFindIn(database* db)
     i = 0;
     while (0 == tb->stat())
     {
-
-        BOOST_CHECK_MESSAGE(++i == tb->getFVint(fdi_id), "findNext in value");
+        int v = tb->getFVint(fdi_id);
+        BOOST_CHECK_MESSAGE(++i == v, "findNext in value " << i << ": bad = " << v);
         tb->findNext(true);
     }
     BOOST_CHECK_MESSAGE(i == 10000, "findNext in count");
@@ -1847,8 +1848,6 @@ void testExclusive()
     BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat(),
                         "open db2->stat = " << db2->stat());
     dbdef* def = db->dbDef();
-    tabledef* td = def->tableDefs(1);
-    td->iconIndex = 3;
     def->updateTableDef(1);
     BOOST_CHECK_MESSAGE(0 == def->stat(), "updateTableDef");
     tb->release();

data/source/global/tdclatl/Database.cpp

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2013-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
@@ -21,6 +21,7 @@
 #include "DbDef.h"
 #include "Table.h"
 #include "TdVersion.h"
+#include "BinlogPos.h"
 
 using namespace bzs::db::protocol::tdap::client;
 STDMETHODIMP CDatabase::InterfaceSupportsErrorInfo(REFIID riid)
@@ -178,9 +179,25 @@ STDMETHODIMP CDatabase::get_NativeDatabase(__int64** Value)
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::BeginSnapshot(eStLockType bias)
+STDMETHODIMP CDatabase::BeginSnapshot(eStLockType bias, IBinlogPos** bpos)
 {
-    m_db->beginSnapshot(bias);
+    binlogPos pos;
+    m_db->beginSnapshot(bias, &pos);
+    *bpos = NULL;
+    if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
+    {
+        CComObject<CBinlogPos>* bposObj;
+        CComObject<CBinlogPos>::CreateInstance(&bposObj);
+        if (bposObj)
+        {
+            bposObj->m_pos = pos;
+        
+            IBinlogPos* ipos;
+            bposObj->QueryInterface(IID_IBinlogPos, (void**)&ipos);
+            _ASSERTE(ipos);
+            *bpos = ipos;
+        }
+    }
     return S_OK;
 }
 
@@ -190,9 +207,9 @@ STDMETHODIMP CDatabase::EndSnapshot()
     return S_OK;
 }
 
-STDMETHODIMP CDatabase::Drop()
+STDMETHODIMP CDatabase::Drop(BSTR Uri)
 {
-    m_db->drop();
+    m_db->drop(Uri);
     return S_OK;
 }
 
@@ -217,7 +234,6 @@ STDMETHODIMP CDatabase::Close(VARIANT_BOOL withDropDefaultSchema)
 
 STDMETHODIMP CDatabase::Connect(BSTR URI, VARIANT_BOOL newConnection,
                                 VARIANT_BOOL* Value)
-
 {
     *Value = m_db->connect(URI, newConnection);
     return S_OK;
@@ -562,22 +578,30 @@ STDMETHODIMP CDatabase::GetSqlStringForCreateTable(BSTR tableName, BSTR* retVal)
 {
     uint_td size = 65000;
     char* tmp = new char[size];
-    CComBSTR ret;
+    wchar_t* tmpw = new wchar_t[size];
 
-    ret = m_db->getSqlStringForCreateTable(tableName, tmp, &size);
+    m_db->getSqlStringForCreateTable(tableName, tmp, &size);
+    MultiByteToWideChar(CP_UTF8, 0, tmp, -1, tmpw, size);
+    CComBSTR ret = tmpw;
     *retVal = ret.Copy();
     delete [] tmp;
+    delete [] tmpw;
     return S_OK;
 }
 
-void __stdcall onCopyData(database* db, int recordCount, int count,
+void __stdcall onCopyData(database* db, table* tb, int recordCount, int count,
                           bool& cancel)
 {
     CDatabase* cdb = reinterpret_cast<CDatabase*>(db->optionalData());
     IDatabase* dbPtr = dynamic_cast<IDatabase*>(cdb);
     _ASSERTE(dbPtr);
+
+     CTableTd* ctb = reinterpret_cast<CTableTd*>(tb->optionalData());
+    ITable* tbPtr = dynamic_cast<ITable*>(ctb);
+    _ASSERTE(tbPtr);
+
     VARIANT_BOOL tmp = 0;
-    cdb->Fire_OnCopyData(dbPtr, recordCount, count, &tmp);
+    cdb->Fire_OnCopyData(dbPtr, tbPtr, recordCount, count, &tmp);
     if (tmp)
         cancel = true;
 }

data/source/global/tdclatl/Database.h

@@ -1,6 +1,6 @@
 #pragma once
 /*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2013-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
@@ -27,7 +27,8 @@ using namespace ATL;
 class CDbDef;
 
 void __stdcall onCopyData(bzs::db::protocol::tdap::client::database* db,
-                          int recordCount, int count, bool& cancel);
+                              bzs::db::protocol::tdap::client::table* tb,
+                              int recordCount, int count, bool& cancel);
 bool __stdcall onDeleteRecord(bzs::db::protocol::tdap::client::database* db,
                               bzs::db::protocol::tdap::client::table* tb,
                               bool inkey);
@@ -98,11 +99,10 @@ public:
     STDMETHOD(AbortTrn)();
     STDMETHOD(BeginTrn)(eLockType bias);
     STDMETHOD(EndTrn)();
-    STDMETHOD(BeginSnapshot)(eStLockType bias);
+    STDMETHOD(BeginSnapshot)(eStLockType bias, IBinlogPos** bpos);
     STDMETHOD(EndSnapshot)();
     STDMETHOD(get_NativeDatabase)(__int64** Value);
-
-    STDMETHOD(Drop)();
+    STDMETHOD(Drop)(BSTR Uri);
     STDMETHOD(DropTable)(BSTR TableName);
     STDMETHOD(Create)(BSTR URI, int type);
     STDMETHOD(Close)(VARIANT_BOOL withDropDefaultSchema = 0);

data/source/global/tdclatl/PooledDbManager.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
@@ -21,6 +21,7 @@
 #include "ConnectParams.h"
 #include "Table.h"
 #include "Database.h"
+#include "BinlogPos.h"
 
 using namespace bzs::db::protocol::tdap::client;
 
@@ -103,9 +104,25 @@ STDMETHODIMP CPooledDbManager::AbortTrn(void)
     return S_OK;
 }
 
-STDMETHODIMP CPooledDbManager::BeginSnapshot(eStLockType bias)
+STDMETHODIMP CPooledDbManager::BeginSnapshot(eStLockType bias, IBinlogPos** bpos)
 {
-    m_mgr.beginSnapshot(bias);
+    binlogPos pos;
+    m_mgr.beginSnapshot(bias, &pos);
+    *bpos = NULL;
+    if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
+    {
+        CComObject<CBinlogPos>* bposObj;
+        CComObject<CBinlogPos>::CreateInstance(&bposObj);
+        if (bposObj)
+        {
+            bposObj->m_pos = pos;
+        
+            IBinlogPos* ipos;
+            bposObj->QueryInterface(IID_IBinlogPos, (void**)&ipos);
+            _ASSERTE(ipos);
+            *bpos = ipos;
+        }
+    }
     return S_OK;
 }
 

data/source/global/tdclatl/PooledDbManager.h

@@ -1,6 +1,6 @@
 #pragma once
 /*=================================================================
-   Copyright (C) 2014 BizStation Corp All rights reserved.
+   Copyright (C) 2014 2016BizStation 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
@@ -62,7 +62,7 @@ public:
     STDMETHOD(BeginTrn)(eLockType Bias);
     STDMETHOD(EndTrn)(void);
     STDMETHOD(AbortTrn)(void);
-    STDMETHOD(BeginSnapshot)(eStLockType bias);
+    STDMETHOD(BeginSnapshot)(eStLockType bias, IBinlogPos** bpos);
     STDMETHOD(EndSnapshot)(void);
     STDMETHOD(Use)(VARIANT Uri);
     STDMETHOD(Unuse)();

data/source/global/tdclatl/_IDatabaseEvents_CP.h

@@ -1,6 +1,6 @@
 #pragma once
 /*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2013 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
@@ -23,7 +23,7 @@ class CProxy_IDatabaseEvents
     : public ATL::IConnectionPointImpl<T, &__uuidof(_IDatabaseEvents)>
 {
 public:
-    HRESULT Fire_OnCopyData(IDatabase* db, int recordCount, int count,
+    HRESULT Fire_OnCopyData(IDatabase* db, ITable* tb, int recordCount, int count,
                             VARIANT_BOOL* cancel)
     {
         HRESULT hr = S_OK;
@@ -40,8 +40,9 @@ public:
 
             if (pConnection)
             {
-                CComVariant avarParams[4];
-                avarParams[3] = db;
+                CComVariant avarParams[5];
+                avarParams[4] = db;
+                avarParams[3] = tb;
                 avarParams[2] = recordCount;
                 avarParams[1] = count;
                 avarParams[0].byref = cancel;

data/source/global/tdclatl/tdclatl.idl

@@ -1,5 +1,5 @@
 /*=================================================================
-   Copyright (C) 2013 BizStation Corp All rights reserved.
+   Copyright (C) 2013-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
@@ -47,6 +47,8 @@ interface IPooledDbManager;
 interface IPreparedQuery;
 interface IBookmark;
 interface IBitset;
+interface IBinlogPos;
+
 
 typedef
 [
@@ -149,6 +151,7 @@ enum eStatus
 	STATUS_FIELDTYPE_NOTSUPPORT = -42,
     STATUS_INVALID_NULLMODE     = -43,
     STATUS_TOO_LARGE_VALUE      = -44,
+    STATUS_SQL_PARSE_ERROR      = -45,
 	STATUS_SUCCESS				= 0,
 	STATUS_PROGRAM_ERROR		= 1,
 	STATUS_IO_ERROR				= 2,
@@ -326,9 +329,10 @@ typedef
 ]
 enum eStLockType
 {
-  MULTILOCK_NOGAP_SHARE   = 0,
-  MULTILOCK_GAP_SHARE     = 2000,
-  CONSISTENT_READ         = 4000
+  MULTILOCK_NOGAP_SHARE           = 0,
+  MULTILOCK_GAP_SHARE             = 2000,
+  CONSISTENT_READ                 = 4000,
+  CONSISTENT_READ_WITH_BINLOG_POS = 4200
 }eStLockType;
 
 typedef
@@ -450,11 +454,11 @@ interface IDatabase : IDispatch
   [propget, id(0x0000000A)]
   HRESULT _stdcall NativeDatabase([out, retval] hyper** Value);
   [id(0x000000C9)]
-  HRESULT _stdcall BeginSnapshot([in, defaultvalue(CONSISTENT_READ)] eStLockType Bias);
+  HRESULT _stdcall BeginSnapshot([in, defaultvalue(CONSISTENT_READ)] eStLockType Bias, [out, retval]IBinlogPos** bpos);
   [id(0x000000CA)]
   HRESULT _stdcall EndSnapshot(void);
   [id(0x000000CB)]
-  HRESULT _stdcall Drop(void);
+  HRESULT _stdcall Drop([in, defaultvalue("")] BSTR Uri);
   [id(0x000000CC)]
   HRESULT _stdcall DropTable([in] BSTR TableName);
   [id(0x000000CD)]
@@ -1640,7 +1644,7 @@ interface IPooledDbManager : IDispatch
   [id(0x00000004)]
   HRESULT _stdcall AbortTrn(void);
   [id(0x00000005)]
-  HRESULT _stdcall BeginSnapshot([in, defaultvalue(CONSISTENT_READ)] eStLockType Bias);
+  HRESULT _stdcall BeginSnapshot([in, defaultvalue(CONSISTENT_READ)] eStLockType Bias, [out, retval]IBinlogPos** bpos);
   [id(0x00000006)]
   HRESULT _stdcall EndSnapshot(void);
   [id(0x00000007)]
@@ -1747,126 +1751,151 @@ interface IBitset : IDispatch{
 
 };
 
+[
+	object,
+	uuid(316D0314-638E-4DCF-B68B-2F98624D02E4),
+	dual,
+	nonextensible,
+	pointer_default(unique)
+]
+interface IBinlogPos : IDispatch{
+
+  [propget, id(0)]
+#ifdef _WIN64
+  HRESULT _stdcall Pos([out, retval] __int64* retVal);
+#else
+  HRESULT _stdcall Pos([out, retval] int* retVal);
+#endif
+  [propget, id(1)]
+  HRESULT _stdcall Type([out, retval] short* retVal);
+  [propget, id(2)]
+  HRESULT _stdcall Filename([out, retval] BSTR* retVal);
+  [propget, id(3)]
+  HRESULT _stdcall Gtid([out, retval] BSTR* retVal);
+};
+
 [
 	uuid(3B712514-E2EF-4040-8A3C-BCACB839EB3E),
 	version(1.0),
 ]
 library transactd
 {
-  importlib("stdole2.tlb");
-  [
-	uuid(530AC521-AB85-4139-8F78-CA56F8B7722F)		
-  ]
-  dispinterface _IDatabaseEvents
-  {	
-	properties:
-	methods:
-		[id(1)] 
-		HRESULT OnCopyData(IDatabase* db, int recordCount, int count, VARIANT_BOOL* cancel);
-		[id(2)] 
-		HRESULT OnDeleteRecord(IDatabase* db, ITable* tb, VARIANT_BOOL* Value);
-		[id(3)] 
-		HRESULT OnSchemaMgrFn(IDatabase* db, short* Value);
-  };
-
-  [
-	uuid(439578EB-226B-41EB-9FDB-AB27915298C7)		
-  ]
-  dispinterface _ITableEvents
-  {	
-	properties:
-	methods:
-		[id(1)] 
-		HRESULT OnRecordCount(ITable* tb, int count, VARIANT_BOOL* cancel);
-  };
-
-  [
-    uuid(1DF73F19-D216-47A4-847D-8CD1279E1077)
-  ]
-  coclass Database
-  {
-    [default] interface IDatabase;
-	[default, source] dispinterface _IDatabaseEvents;
-	
-  };
+    importlib("stdole2.tlb");
+    [
+        uuid(530AC521-AB85-4139-8F78-CA56F8B7722F)		
+    ]
+    dispinterface _IDatabaseEvents
+    {	
+        properties:
+        methods:
+	    [id(1)] 
+	    HRESULT OnCopyData(IDatabase* db, ITable* tb, int recordCount, int count, VARIANT_BOOL* cancel);
+	    [id(2)] 
+	    HRESULT OnDeleteRecord(IDatabase* db, ITable* tb, VARIANT_BOOL* Value);
+	    [id(3)] 
+	    HRESULT OnSchemaMgrFn(IDatabase* db, short* Value);
+    };
+
+    [
+        uuid(439578EB-226B-41EB-9FDB-AB27915298C7)		
+    ]
+    dispinterface _ITableEvents
+    {	
+        properties:
+        methods:
+	    [id(1)] 
+	    HRESULT OnRecordCount(ITable* tb, int count, VARIANT_BOOL* cancel);
+    };
+
+    [
+        uuid(1DF73F19-D216-47A4-847D-8CD1279E1077)
+    ]
+    coclass Database
+    {
+        [default] interface IDatabase;
+        [default, source] dispinterface _IDatabaseEvents;
+    };
   
-  [
-    uuid(9B3CAC13-FCB8-42E1-993C-D81645B40FEF)
-    ,noncreatable
-  ]
-  coclass DbDef
-  {
-    [default] interface IDbDef;
-  };
-  [
-    uuid(4B8E64CA-F963-408C-AC4E-C1F9556738D4)
-    ,noncreatable
-  ]
-  coclass Table
-  {
-    [default] interface ITable;
-  };
-  [
-    uuid(D2115BB4-48CE-461C-A1C1-324DD12C37EE)
-    ,noncreatable
-  ]
-  coclass TableDef
-  {
-    [default] interface ITableDef;
-  };
-  [
-    uuid(42AE202D-A721-45A6-BB5C-2074101A8751)
-    ,noncreatable
-  ]
-  coclass FieldDef
-  {
-    [default] interface IFieldDef;
-
-  };
-  [
-    uuid(38DDBD32-27D5-41C5-AAE6-B6D2D4CF0F0D)
-    ,noncreatable
-  ]
-  coclass KeyDef
-  {
-    [default] interface IKeyDef;
-  };
-  [
-    uuid(27968808-D981-4DEC-9937-A8E6A71714A8)
-    ,noncreatable
-  ]
-  coclass Flags
-  {
-    [default] interface IFlags;
-  };
-
-
-  [
-    uuid(DEC4DD3C-C661-4C41-8F6C-F579187CF2C9)
-    ,noncreatable
-  ]
-  coclass KeySegment
-  {
-    [default] interface IKeySegment;
-  };
-  [
-    uuid(692ADBB5-B156-48A6-8A32-3A6C31586698)
-    ,noncreatable
-  ]
-  coclass Field
-  {
-    [default] interface IField;
-
-  };
+    [
+        uuid(9B3CAC13-FCB8-42E1-993C-D81645B40FEF)
+        ,noncreatable
+    ]
+    coclass DbDef
+    {
+        [default] interface IDbDef;
+    };
+
+    [
+        uuid(4B8E64CA-F963-408C-AC4E-C1F9556738D4)
+        ,noncreatable
+    ]
+    coclass Table
+    {
+        [default] interface ITable;
+    };
+
+    [
+        uuid(D2115BB4-48CE-461C-A1C1-324DD12C37EE)
+        ,noncreatable
+    ]
+    coclass TableDef
+    {
+        [default] interface ITableDef;
+    };
+
+    [
+        uuid(42AE202D-A721-45A6-BB5C-2074101A8751)
+        ,noncreatable
+    ]
+    coclass FieldDef
+    {
+        [default] interface IFieldDef;
+    };
+
+    [
+        uuid(38DDBD32-27D5-41C5-AAE6-B6D2D4CF0F0D)
+        ,noncreatable
+    ]
+    coclass KeyDef
+    {
+        [default] interface IKeyDef;
+    };
+
+    [
+        uuid(27968808-D981-4DEC-9937-A8E6A71714A8)
+        ,noncreatable
+    ]
+    coclass Flags
+    {
+        [default] interface IFlags;
+    };
+
+    [
+        uuid(DEC4DD3C-C661-4C41-8F6C-F579187CF2C9)
+        ,noncreatable
+    ]
+    coclass KeySegment
+    {
+        [default] interface IKeySegment;
+    };
+
+    [
+        uuid(692ADBB5-B156-48A6-8A32-3A6C31586698)
+        ,noncreatable
+    ]
+    coclass Field
+    {
+        [default] interface IField;
+    };
 	
-  [
-    uuid(692ADBB5-B156-48A6-8A32-3A6C31586699)
-    ,noncreatable
-  ]
-  coclass TdVersion
-  {
-    [default] interface ITdVersion;
-  };
+    [
+        uuid(692ADBB5-B156-48A6-8A32-3A6C31586699)
+        ,noncreatable
+    ]
+    coclass TdVersion
+    {
+        [default] interface ITdVersion;
+    };
   
 	[
 		uuid(CA076B05-541B-48EF-AC55-33323FB052F3)		
@@ -2005,6 +2034,15 @@ library transactd
 	{
 		[default] interface IBitset;
 	};
+
+    [
+        uuid(86301596-1546-442E-BAA4-FDB656834F41)
+		,noncreatable
+	]
+	coclass BinlogPos
+	{
+		[default] interface IBinlogPos;
+	};
    
 };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-03-09 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_0.dll
-- bin/common/tdclc_64_3_0.dll
+- bin/common/tdclc_32_3_1.dll
+- bin/common/tdclc_64_3_1.dll
 - source/bzs/db/blobBuffer.h
 - source/bzs/db/blobStructs.h
 - source/bzs/db/engine/mysql/bookmark.h