transactd 3.2.1 → 3.3.0

data/source/bzs/test/tdclrb/transactd_spec.rb

@@ -1805,12 +1805,14 @@ def testDelete()
   tb = testOpenTable(db)
   # estimate count
   count = tb.recordCount(true)
-  is_valid_count = ((count - expected_count).abs < 5000)
+  expect(tb.stat()).to eq 0
+  is_valid_count = ((count - expected_count).abs < 10000)
   expect(is_valid_count).to be true
   if !is_valid_count
     puts "true record count = #{expected_count.to_s} and estimate recordCount count = #{count.to_s}"
   end
   expect(tb.recordCount(false)).to eq expected_count # true count
+  expect(tb.stat()).to eq 0
   vv = TEST_COUNT * 3 / 4 + 1
   tb.clearBuffer()
   tb.setFV(FDI_ID, vv)

data/source/bzs/test/tdclrb/transactd_v3_spec.rb

@@ -844,11 +844,21 @@ describe Transactd, 'V3Features' do
     Transactd::ConnMgr::removeSystemDb(recs)
     expect(mgr.stat()).to eq 0
     expect(recs.size()).not_to eq size
+    # sysvar
+    recs = mgr.sysvars()
+    expect(mgr.stat()).to eq 0
+    expect(Transactd::ConnMgr::sysvarName(0)).to eq "database_version"
+    # statusvar
+    recs = mgr.statusvars()
+    expect(mgr.stat()).to eq 0
+    expect(Transactd::ConnMgr::statusvarName(0)).to eq "tcp_connections"
     # slaveStatus
     recs = mgr.slaveStatus()
     expect(mgr.stat()).to eq 0
+    expect(Transactd::ConnMgr::slaveStatusName(0)).to eq "Slave_IO_State"
+
     for i in 0...recs.size() do
-      puts (Transactd::ConnMgr::slaveStatusName(i) + "\t" + recs[i].value)
+      puts (Transactd::ConnMgr::slaveStatusName(i) + "\t:" + recs[i].value.to_s)
     end
     mgr.disconnect()
     expect(mgr.stat()).to eq 0

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

@@ -2156,7 +2156,8 @@ void testDelete(database* db)
 
     // estimate number
     int count = tb->recordCount(true);
-    bool c = (abs(count - 20002) < 5000);
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "recordCount");
+    bool c = (abs(count - 20002) < 10000);
     BOOST_CHECK_MESSAGE(c == true, "RecordCount1");
     if (!c)
     {
@@ -2169,6 +2170,7 @@ void testDelete(database* db)
     }
     // true number
     uint_td v = tb->recordCount(false);
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "recordCount2 " << tb->stat());
     BOOST_CHECK_MESSAGE(20002 == v,
                         "RecordCount2 count = " << v);
     int vv = 15001;

data/source/global/tdclatl/ConnMgr.cpp

@@ -147,6 +147,18 @@ STDMETHODIMP CConnMgr::Sysvars(IConnRecords** retVal)
     return S_OK;
 }
 
+STDMETHODIMP CConnMgr::Statusvars(IConnRecords** retVal)
+{
+    if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
+    CComObject<CConnRecords>* obj;
+    CComObject<CConnRecords>::CreateInstance(&obj);
+    if (!obj)
+        return Error("CreateInstance ConnRecords", IID_IConnMgr);
+    obj->m_recs = m_mgr->statusvars();
+    setResult(obj, retVal);
+    return S_OK;
+}
+
 STDMETHODIMP CConnMgr::SlaveStatus(IConnRecords** retVal)
 {
     if (m_mgr == NULL) Error(_T("No database error"), IID_IConnMgr);
@@ -282,4 +294,12 @@ STDMETHODIMP CConnMgr::SysvarName(int index, BSTR* retVal)
     return S_OK;
 }
 
+STDMETHODIMP CConnMgr::StatusvarName(int index, BSTR* retVal)
+{
+    CComBSTR ret= connMgr::statusvarName(index);
+    *retVal = ret.Copy();
+    return S_OK;
+}
+
+
 

data/source/global/tdclatl/ConnMgr.h

@@ -77,6 +77,8 @@ public:
     STDMETHOD(RemoveSystemDb)(IConnRecords** retVal);
     STDMETHOD(SlaveStatusName)(int index, BSTR* retVal);
     STDMETHOD(SysvarName)(int index, BSTR* retVal);
+    STDMETHOD(Statusvars)(IConnRecords** retVal);
+    STDMETHOD(StatusvarName)(int index, BSTR* retVal);
 
 };
 

data/source/global/tdclatl/ConnRecord.cpp

@@ -74,7 +74,7 @@ STDMETHODIMP CConnRecord::get_Name(BSTR* retVal)
 {
     CComBSTR ret;
     wchar_t tmp[256];
-    ret = m_rec.nameW(tmp, 256);
+    ret = m_rec.t_name(tmp, 256);
     *retVal = ret.Copy();
     return S_OK;
 } 
@@ -83,15 +83,23 @@ STDMETHODIMP CConnRecord::get_Value(BSTR* retVal)
 {
     CComBSTR ret;
     wchar_t tmp[256];
-    if (m_rec.name[0] == 0x00 && m_rec.longValue)
-        _i64tot_s(m_rec.longValue, tmp, 256, 10);
-    else
-        m_rec.nameW(tmp, 256);
+    m_rec.value(tmp, 256);
     ret = tmp;
     *retVal = ret.Copy();
     return S_OK;
 }
 
+STDMETHODIMP CConnRecord::get_LongValue(BSTR* retVal)
+{
+    CComBSTR ret;
+    wchar_t tmp[256];
+    _i64tow_s(m_rec.longValue, tmp, 256, 10);
+    ret = tmp;
+    *retVal = ret.Copy();
+    return S_OK;
+}
+
+
 STDMETHODIMP CConnRecord::get_Status(short* retVal)
 {
     *retVal = m_rec.status;

data/source/global/tdclatl/ConnRecord.h

@@ -65,5 +65,6 @@ public:
     STDMETHOD (get_UpdCount)(int* retVal); 
     STDMETHOD (get_DelCount)(int* retVal); 
     STDMETHOD (get_InsCount)(int* retVal); 
+    STDMETHOD (get_LongValue)(BSTR* retVal); 
 };
 

data/source/global/tdclatl/ConnRecords.h

@@ -21,6 +21,7 @@
 
 #include "tdclatl_i.h"
 #include <bzs/db/transactd/connectionRecord.h>
+#include <bzs/db/protocol/tdap/client/connMgr.h>
 
 using namespace ATL;
 
@@ -35,7 +36,7 @@ class ATL_NO_VTABLE CConnRecords
 
 public:
     CConnRecords()  {}
-    bzs::db::transactd::connection::records m_recs;
+    bzs::db::protocol::tdap::client::connMgr::records m_recs;
 
     BEGIN_COM_MAP(CConnRecords)
     COM_INTERFACE_ENTRY(IConnRecords)

data/source/global/tdclatl/tdclatl.idl

@@ -1814,6 +1814,8 @@ interface IConnRecord : IDispatch{
     HRESULT _stdcall DelCount([out, retval] int* retVal); 
     [propget, id(0x000000B)]
     HRESULT _stdcall InsCount([out, retval] int* retVal); 
+    [propget, id(0x000000C)]
+    HRESULT _stdcall LongValue([out, retval] BSTR* retVal); 
 }
 
 [
@@ -1889,6 +1891,11 @@ interface IConnMgr : IDispatch{
     HRESULT _stdcall SlaveStatusName([in]int index, [out, retval] BSTR* retVal);
     [id(0x0000013)]
     HRESULT _stdcall SysvarName([in]int index, [out, retval] BSTR* retVal);
+    [id(0x0000014)]
+    HRESULT _stdcall Statusvars([out, retval] IConnRecords** retVal);
+    [id(0x0000015)]
+    HRESULT _stdcall StatusvarName([in]int index, [out, retval] BSTR* retVal);
+
 };
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-18 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_2.dll
-- bin/common/tdclc_64_3_2.dll
+- bin/common/tdclc_32_3_3.dll
+- bin/common/tdclc_64_3_3.dll
 - source/bzs/db/blobBuffer.h
 - source/bzs/db/blobStructs.h
 - source/bzs/db/engine/mysql/bookmark.h