transactd 3.0.0-x64-mswin64-100 → 3.1.0-x64-mswin64-100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa0bfa8b692e733e2626d71fc1c6837555f8f52
-  data.tar.gz: 5d24f95bf6a23d2f38712b3dadded61afea44bd6
+  metadata.gz: 5e3d99d56e2a38c83b10e6af83bcec72f1df7921
+  data.tar.gz: 79f6e707ff472a6287b893bb746d51dab9e5ad4b
 SHA512:
-  metadata.gz: 331693bb64965e659633cb52c7aea7d4344e85ea50d65872b73a520fddd12170c493585f93518ac6ed3b4e280538c3651b4fb47131d2276e2a1c9790e40f6ccc
-  data.tar.gz: 63e31fd98df0013e77a700794295788458b06dcec473aea8364942563ce3d6108417924741fe5ddb513f89ac664937065e8a8750552f93b4e945aa3d6113ba7f
+  metadata.gz: cecf6221e5defef594ac75eb7efe81cec451566a614806e5912249fda46326068bb4fc6672721797e11b18fde558671d4d45b767cc00d55d3e7a45f28de0d5c0
+  data.tar.gz: 807b98ff609fdcde7c6754bd407139098c2f991f7d7d617757524d1418d97edfa059e781b770b189a56a5d58df6096a7391c9a9ffe5388a235994b1a91fbebfd

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: x64-mswin64-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
@@ -20,9 +20,10 @@ files:
 - 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_64mr_3_0.dll
-- bin/common/tdclc_64_3_0.dll
+- bin/common/tdclcpp_vc100_64mr_3_1.dll
+- bin/common/tdclc_64_3_1.dll
 - build/tdclrb/gem/detect.rb
 - build/tdclrb/gem/helper.rb
 - build/tdclrb/gem/INSTALLLOG.win32