transactd 3.0.0-x86-mswin32-100 → 3.1.0-x86-mswin32-100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f8a84256a3ffc4114ed1af3db447c0d562708f
-  data.tar.gz: 6bddf802000f968a6df0e6cad4977d1def1d94c2
+  metadata.gz: f4c734af1505593cbcb0ae5bd29b39f9cf8f43a0
+  data.tar.gz: 44495611def4f4b3ef3733c48d30cf77b1e0f424
 SHA512:
-  metadata.gz: fb21f6e1c49c1ce6f3204efac720810ee04bb768ec3064113c7fae864f6d137180d643f9e5e8e614c815a208fe81aab49388ebc95520c988aad0222c2735d8c5
-  data.tar.gz: 3323709b33bed8267122319b4cc7ff14611674ac09797791f7994d438d756f203d80517ad9e64b53b71cc1f2567c6857b9bc75d7938cedb7e77e01571a59a358
+  metadata.gz: d0c23d5b68233bd73be52d7af638c1a5dc9cae4137c9e267c53dd94451c7c0718cc854c20fa0d9cf8b9a1f038f959b48167ccc957b166a090307d020c8800eef
+  data.tar.gz: dd574553c439b058ec29444c87f7416e6cc4c9ffe0f776cf3a9e25d86e889a39cff686a4b82b22781047c6f69b3e8569fe998a4c60d71f83cb8e080ac9fe89f4

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

@@ -125,8 +125,8 @@ def Read(db, tb, start, endid, shapshot)
     for i in start..(endid - 1) do
         tb.setFV(FN_ID, i)
         tb.seek()
-        if ((tb.stat() != 0) || (tb.getFVlng(FN_ID) != i))
-            puts("GetEqual Error stat() = #{tb.stat().to_s}  Value #{i.to_s} = #{tb.getFVlng(FN_ID).to_s}")
+        if ((tb.stat() != 0) || (tb.getFVint(FN_ID) != i))
+            puts("GetEqual Error stat() = #{tb.stat().to_s}  Value #{i.to_s} = #{tb.getFVint(FN_ID).to_s}")
             ret = false
             break
         end
@@ -151,8 +151,8 @@ def Reads(db, tb, start, endid, unit, shapshot)
     while (en != endid)
         en = st + unit
         for i in st..(en - 1) do
-            if (tb.getFVlng(FN_ID) != i)
-                puts("findNext Error stat() = #{tb.stat().to_s}  Value #{i.to_s} = #{tb.getFVlng(FN_ID).to_s}")
+            if (tb.getFVint(FN_ID) != i)
+                puts("findNext Error stat() = #{tb.stat().to_s}  Value #{i.to_s} = #{tb.getFVint(FN_ID).to_s}")
                 ret = false
                 break
             end
@@ -220,7 +220,7 @@ def createTestDataBase(db, uri)
         fd = dbdef.insertField(td.id, 1)
         fd.setName('name')
         fd.type = Transactd::Ft_myvarchar
-        fd.len = 100
+        fd.setLenByCharnum(20)
         dbdef.updateTableDef(td.id)
         
         kd = dbdef.insertKey(td.id, 0)
@@ -295,9 +295,9 @@ def main(argv)
     if (!db.open(uri, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL, '', ''))
         puts("open table erorr No:#{db.stat().to_s}")
     else
-        tb = openTable(db, 'users', Transactd::TD_OPEN_NORMAL)
+        tb = openTable(db, 'user', Transactd::TD_OPEN_NORMAL)
         if tb == nil
-          puts "can not open table 'users'"
+          puts "can not open table 'user'"
           db.close()
           return
         end

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

@@ -1489,6 +1489,14 @@ def testConflict()
   db.close()
 end
 
+def isMySQL5_7(db)
+  vv = Transactd::BtrVersions.new()
+  db.getBtrVersion(vv)
+  return (db.stat() == 0) &&
+    ((vv.version(1).majorVersion == 5) &&
+     (vv.version(1).minorVersion == 7))
+end
+
 def testExclusive()
   # db mode exclusive
   db = Transactd::Database.new()
@@ -1507,6 +1515,10 @@ def testExclusive()
   db2.open(URL, Transactd::TYPE_SCHEMA_BDF)
   # database open error. Check database::stat()
   expect(db2.stat()).to eq Transactd::STATUS_CANNOT_LOCK_TABLE
+  dd = db.dbDef()
+  td = dd.tableDefs(1)
+  dd.updateTableDef(1)
+  expect(dd.stat()).to eq 0
   tb.close()
   db.close()
   db2.close()
@@ -1519,15 +1531,24 @@ def testExclusive()
   tb = db.openTable(TABLENAME, Transactd::TD_OPEN_READONLY_EXCLUSIVE)
   expect(db.stat()).to eq 0
   
+  # read mysql version
+  mySQL5_7 = isMySQL5_7(db)
+  
   # Read only open
   db2.open(URL, Transactd::TYPE_SCHEMA_BDF)
   expect(db2.stat()).to eq 0
   db2.close()
   
   # Normal open
+  #  Since MySQL 5.7 : D_OPEN_READONLY_EXCLUSIVE + TD_OPEN_NORMAL is fail,
+  #  It's correct.
   db2.connect(URL_DB, true)
   db2.open(URL, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL)
-  expect(db2.stat()).to eq 0
+  if (mySQL5_7)
+    expect(db2.stat()).to eq Transactd::STATUS_CANNOT_LOCK_TABLE
+  else
+    expect(db2.stat()).to eq 0
+  end
   db2.close()
   
   # Write Exclusive open

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

@@ -111,9 +111,10 @@ INSERT_SEB_TABLE_SQL = <<'EOS'
 EOS
 
 def dropDatabase(db)
-  db.open(URL)
-  expect(db.stat()).to eq 0
-  db.drop()
+  #db.open(URL)
+  #expect(db.stat()).to eq 0
+  #db.drop()
+  db.drop(URL)
   expect(db.stat()).to eq 0
 end
 
@@ -143,6 +144,16 @@ def isMySQL5_5(db)
     (5 == server_ver.minorVersion)
 end
 
+def isMariaDBWithGtid(db)
+  vv = Transactd::BtrVersions.new()
+  db.getBtrVersion(vv)
+  server_ver = vv.version(1)
+  return (db.stat() == 0) &&
+    (10 == server_ver.majorVersion) &&
+    (server_ver.type == Transactd::MYSQL_TYPE_MARIA)
+end
+
+
 def isLegacyTimeFormat(db)
   vv = Transactd::BtrVersions.new()
   db.getBtrVersion(vv)
@@ -745,4 +756,19 @@ describe Transactd, 'V3Features' do
     ats.release()
     db.close()
   end
+  it 'snapshot' do
+    db = Transactd::Database.new()
+    openDatabase(db)
+    bpos = db.beginSnapshot(Transactd::CONSISTENT_READ_WITH_BINLOG_POS)
+    if (isMariaDBWithGtid(db))
+      expect(bpos.type).to eq Transactd::REPL_POSTYPE_MARIA_GTID
+    else
+      expect(bpos.type).to eq Transactd::REPL_POSTYPE_POS
+    end
+    expect(bpos.pos).not_to eq  0
+    expect(bpos.filename).not_to eq ""
+    print "\nbinlog pos = ", bpos.filename, ":", bpos.pos, "\n"
+    db.endSnapshot();
+    db.close()
+  end
 end

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: x86-mswin32-100
 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
@@ -17,13 +17,13 @@ extensions:
 - build/tdclrb/bldgem/extconf.rb
 extra_rdoc_files: []
 files:
-- bin/1.9/transactd.so
 - bin/2.0/transactd.so
 - bin/2.1/transactd.so
 - bin/2.2/transactd.so
+- bin/2.3/transactd.so
 - build/tdclrb/bldgem/extconf.rb
-- bin/common/tdclcpp_vc100_32mr_3_0.dll
-- bin/common/tdclc_32_3_0.dll
+- bin/common/tdclcpp_vc100_32mr_3_1.dll
+- bin/common/tdclc_32_3_1.dll
 - build/tdclrb/gem/detect.rb
 - build/tdclrb/gem/helper.rb
 - build/tdclrb/gem/INSTALLLOG.win32