transactd 3.0.0 → 3.1.0

data/source/bzs/db/protocol/tdap/tdapSchema.cpp

@@ -808,10 +808,9 @@ bool tabledef::isNullKey(const keydef& key) const
         for (int j=0;j < key.segmentCount; ++j)
         {
             const fielddef& fd = fieldDefs[key.segments[j].fieldNum];
-            if (fd.nullValue != 0x00) 
-                return false;
+            if (fd.nullValue == 0x00)
+                return true;
         }
-        return true;
     }
     return false;
 }
@@ -833,7 +832,7 @@ bool tabledef::isNULLFieldFirstKeySegField(const keydef& key) const
     if ((key.segments[0].flags.bit3 || key.segments[0].flags.bit9) && key.segmentCount == 1)
     {
         const fielddef& fd = fieldDefs[key.segments[0].fieldNum];
-        return ((fd.len == 1) && (fd.type == ft_logical) && fd.nullValue == 0x00);
+        return fd.isNullKeysegType();
     }
     return false;
 }
@@ -1070,7 +1069,6 @@ uint_td tabledef::pack(char* ptr, size_t size) const
                 memmove(pos, pos + movelen, end - pos);
             }
         }
-        
     }
     return (uint_td)(pos - ptr);
 }
@@ -1079,8 +1077,6 @@ int tabledef::size() const
 {
     int len =  (int)(sizeof(tabledef) + (sizeof(fielddef) * fieldCount) +
                     (sizeof(keydef) * keyCount));
-    const ushort_td* p = &varSize;
-    *(const_cast<ushort_td*>(p)) = len - 4;
     return len;
 }
 

data/source/bzs/db/protocol/tdap/tdapSchema.h

@@ -596,6 +596,14 @@ struct PACKAGE fielddef : public fielddef_t_my
                 (type == ft_mydatetime) || (type == ft_mytimestamp));
     }
 
+    inline bool isNullKeysegType() const
+    {
+        return (nullValue == 0x00) && (len <= 8) &&
+                ((type == ft_logical) || (type == ft_integer) ||
+                 (type == ft_uinteger) || (type == ft_enum)|| (type == ft_set));
+
+    }
+
     /* Charctor numbers from charset.
      */
     unsigned int charNum() const;
@@ -728,7 +736,7 @@ private:
         return v;
     }
 
-    inline int maxVarDatalen() const
+    inline uint_td maxVarDatalen() const
     {
         if (((type >= ft_myvarchar) && (type <= ft_mywvarbinary)) ||
             type == ft_lstring)

data/source/bzs/db/protocol/tdap/tdapcapi.h

@@ -324,8 +324,15 @@ enum combineType
 #define MULTILOCK_GAP                   MULTILOCK_REPEATABLE_READ + LOCK_MULTI_NOWAIT
 // Snapshot
 #define CONSISTENT_READ                 4000
+#define CONSISTENT_READ_WITH_BINLOG_POS 4200
 #define MULTILOCK_GAP_SHARE             TRN_ISO_REPEATABLE_READ
 #define MULTILOCK_NOGAP_SHARE           0
+#define REPL_POSTYPE_NONE               0  
+#define REPL_POSTYPE_MARIA_GTID         1  // like 0-1-50
+#define REPL_POSTYPE_POS                2  // 12345
+
+
+
 // Read row lock
 #define ROW_LOCK_X                      LOCK_SINGLE_NOWAIT
 #define ROW_LOCK_S                      5000 + LOCK_SINGLE_NOWAIT
@@ -403,6 +410,7 @@ enum combineType
 #define STATUS_FIELDTYPE_NOTSUPPORT     -42
 #define STATUS_INVALID_NULLMODE         -43
 #define STATUS_TOO_LARGE_VALUE          -44
+#define STATUS_SQL_PARSE_ERROR          -45
 
 #define STATUS_SUCCESS                  0
 #define STATUS_PROGRAM_ERROR            1
@@ -585,7 +593,7 @@ struct handshale_t
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "0"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "1"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -649,7 +657,7 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "0"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "1"//##5 Build marker! Don't remove
 #define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
@@ -686,7 +694,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 0//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 1//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/db/protocol/tdap/uri.h

@@ -49,8 +49,10 @@ inline const _TCHAR* protocol(const _TCHAR* uri)
     else
     {
         st = _tcsstr(uri, _T("btrv://"));
-        return _T("btrv");
+        if (st)
+            return _T("btrv");
     }
+    return NULL;
 }
 
 inline void endPoint(const _TCHAR* uri, 

data/source/bzs/env/crosscompile.h

@@ -183,6 +183,20 @@ typedef unsigned __int32 char32_t; // 32bit
 /* c c++ runtime library */
 #include <tchar.h>
 #if defined(__BORLANDC__) || defined(__MINGW32__)
+#  if defined(__MINGW32__)
+#    undef _ltow_s
+#    undef _ltoa_s
+#    undef _ltot_s
+#    undef _ultot_s
+#    undef _i64tot_s
+#    undef _i64toa_s
+#    undef _i64tow_s
+#    undef _ui64tot_s
+#    undef _ui64toa_s
+#    undef _ui64tow_s
+#    undef _strlwr_s
+#    undef _tcslwr_s
+#  endif //defined(__MINGW32__)
 
 #define _ltow_s(A, B, C, D) _ltow(A, B, D)
 #define _ltoa_s(A, B, C, D) _ltoa(A, B, D)
@@ -195,9 +209,9 @@ typedef unsigned __int32 char32_t; // 32bit
 #define _ui64toa_s(A, B, C, D) _ui64toa(A, B, D)
 #define _ui64tow_s(A, B, C, D) _ui64tow(A, B, D)
 #define _strlwr_s(A, B) strlwr(A)
-#ifndef _tcslwr_s
-#define _tcslwr_s(A, B) _tcslwr(A)
-#endif
+#  ifndef _tcslwr_s
+#    define _tcslwr_s(A, B) _tcslwr(A)
+#  endif
 #endif
 
 #if defined(__BORLANDC__)

data/source/bzs/test/tdclatl/test_v3.js

@@ -1,5 +1,5 @@
 /*=================================================================
-	 Copyright (C) 2015 BizStation Corp All rights reserved.
+	 Copyright (C) 2015-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
@@ -31,6 +31,16 @@ var M_NOWAIT_LOCK = 400;
 var CCURR_T_BIAS = 1000;
 var trans_bias = S_NOWAIT_LOCK + CCURR_T_BIAS;
 
+var MULTILOCK_NOGAP_SHARE           = 0;
+var MULTILOCK_GAP_SHARE             = 2000;
+var CONSISTENT_READ                 = 4000;
+var CONSISTENT_READ_WITH_BINLOG_POS = 4200;
+
+var REPL_POSTYPE_NONE       = 0;
+var REPL_POSTYPE_MARIA_GTID = 1;
+var REPL_POSTYPE_POS        = 2;
+
+
 // field type
 var ft_string       = 0;
 var ft_integer      = 1;
@@ -252,6 +262,18 @@ function checkNotEqual(a, b, on)
 	}else
 		WScript.StdOut.Write(".");
 }
+/*--------------------------------------------------------------------------------*/
+function checkNotNull(a, on)
+{
+	if (a == null)
+	{
+		WScript.Echo("error null obkect on " + on );	
+		return false;
+	}
+	WScript.StdOut.Write(".");
+	return true;
+}
+
 /*--------------------------------------------------------------------------------*/
 function isX86()
 {
@@ -317,6 +339,13 @@ function isMySQL5_5(db)
     var ver = db.GetBtrVersion(1);
     return (db.Stat == 0) && ((5 == ver.MajorVersion) && (5 == ver.MinorVersion));
 }
+/*--------------------------------------------------------------------------------*/
+function isMariaDbWithGtid(db)
+{
+    var ver = db.GetBtrVersion(1);
+    return (db.Stat == 0) && (ver.Type == MYSQL_TYPE_MARIA) &&  (10 == ver.MajorVersion);
+}
+
 /*--------------------------------------------------------------------------------*/
 function isLegacyTimeFormat(db)
 {
@@ -658,6 +687,23 @@ function test_decimal(fd)
 	checkEqual(fd.DefaultValue, '4');
 }
 
+function testBinlogPos(db)
+{
+	var bpos = db.beginSnapshot(CONSISTENT_READ_WITH_BINLOG_POS);
+	if (checkNotNull(bpos, "beginSnapshot result "))
+	{
+		if (isMariaDbWithGtid(db))
+			checkEqual(bpos.type, REPL_POSTYPE_MARIA_GTID,  "bpos.type");
+		else
+			checkEqual(bpos.type, REPL_POSTYPE_POS,  "bpos.type");
+		checkNotEqual(bpos.pos, 0,  "bpos.pos");
+		checkNotEqual(bpos.filename, "",  "bpos.filename");
+		WScript.Echo("\nBinlog pos = " + bpos.filename + ":" + bpos.pos);
+	}
+	db.endSnapshot();
+}
+
+
 /*--------------------------------------------------------------------------------*/
 function test(atu, ate, db)
 {
@@ -944,6 +990,10 @@ function test(atu, ate, db)
 	test_bit(ate, db);
 	test_bitset();
 	test_decimal(ate.TableDef.FieldDef(0));
+	
+	//binlogPos
+	testBinlogPos(db);
+	
 	//WScript.Echo(" -- End Test -- ");
 }
 /*--------------------------------------------------------------------------------*/
@@ -951,12 +1001,20 @@ function main()
 {
 	var isCreate = 1;
 	var host = "localhost";
+	var user = "root";
+	var pwd = "";
+
 	if (WScript.arguments.length > 0)
 		isCreate = 	parseInt(WScript.arguments(0), 10);
 
 	if (WScript.arguments.length > 1)
 		host = WScript.arguments(1);
-	var URI  = "tdap://" + host + "/test_v3?dbfile=test.bdf";
+	if (WScript.arguments.length > 2)
+		user = WScript.arguments(2);
+	if (WScript.arguments.length > 3)
+		pwd = WScript.arguments(3);
+
+	var URI  = "tdap://" + user + "@" + host + "/test_v3?dbfile=test.bdf&pwd=" + pwd;
 
 
 	WScript.Echo(URI);

data/source/bzs/test/tdclphp/transactd_Test.php

@@ -2086,6 +2086,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
             $db->open(URL_VAR);
             $this->assertEquals($db->stat(), 0);
         }
+        $db->close();
     }
     private function setGetVar($tb, $unicodeField, $varCharField)
     {
@@ -2267,6 +2268,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($db->stat(), 0);
         // utf8 varchar
         $this->setGetVar($tb, true, true);
+        $db->close();
     }
     private function doVarInsert($db, $name, $codePage, $str, $startid, $endid, $bulk)
     {
@@ -2321,6 +2323,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
             $this->doVarInsert($db, 'user4', Bz\transactd::CP_ACP,   '', $startid, $endid, $bulk);
             $this->doVarInsert($db, 'user5', Bz\transactd::CP_UTF8,  '', $startid, $endid, $bulk);
         }
+        $db->close();
     }
     private function doVarRead($db, $name, $codePage, $str, $num, $ky)
     {
@@ -2383,6 +2386,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
             $this->doVarRead($db, 'user4', Bz\transactd::CP_ACP,   '120', 120, $ky);
             $this->doVarRead($db, 'user5', Bz\transactd::CP_UTF8,  '120', 120, $ky);
         }
+        $db->close();
     }
     private function doVarFilter($db, $name, $codePage, $str, $num, $ky)
     {
@@ -2472,6 +2476,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
             $this->doVarFilter($db, 'user4', Bz\transactd::CP_ACP,   '120', 120, $ky);
             $this->doVarFilter($db, 'user5', Bz\transactd::CP_UTF8,  '120', 120, $ky);
         }
+        $db->close();
     }
     public function testDropDatabaseVar()
     {
@@ -2480,6 +2485,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($db->stat(), 0);
         $db->drop();
         $this->assertEquals($db->stat(), 0);
+        $db->close();
     }
     
     //-----------------------------------------------------
@@ -2753,6 +2759,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         else
             $this->doTestStringFilter($db, 2, 'myvarchar', Bz\transactd::ft_myvarchar, Bz\transactd::ft_myvarchar);
         $this->doTestStringFilter($db, 3, 'mytext', Bz\transactd::ft_mytext, Bz\transactd::ft_myblob);
+        $db->close();
     }
     
     public function testDropDatabaseStringFilter()
@@ -2762,6 +2769,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($db->stat(), 0);
         $db->drop();
         $this->assertEquals($db->stat(), 0);
+        $db->close();
     }
     
     public function testQuery()

data/source/bzs/test/tdclphp/transactd_blob_Test.php

@@ -52,9 +52,9 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
 {
     private function dropDatabase($db, $url)
     {
-        $db->open($url);
-        $this->assertEquals($db->stat(), 0);
-        $db->drop();
+        //$db->open($url);
+        //$this->assertEquals($db->stat(), 0);
+        $db->drop($url);
         $this->assertEquals($db->stat(), 0);
     }
     private function createDatabase($db, $url)
@@ -64,6 +64,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         {
             $this->dropDatabase($db, $url);
             $db->create($url);
+            $this->assertEquals($db->stat(), 0);
         }
         $this->assertEquals($db->stat(), 0);
     }
@@ -145,6 +146,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->openDatabase($db, URL);
         $this->createTable($db, 1, TABLENAME);
         $tb = $this->openTable($db, TABLENAME);
+        $db->close();
     }
     public function testInsert()
     {
@@ -176,6 +178,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $tb->setFV(FDI_IMAGE, $str, strlen($str));
         $tb->insert();
         $this->assertEquals($tb->stat(), 0);
+        $db->close();
     }
     public function testSeek()
     {
@@ -210,6 +213,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVint(FDI_USER_ID), 1);
         $this->assertEquals($tb->getFVstr(FDI_BODY), "2\ntest\nテスト\n\nあいうえおあいうえお");
         $this->assertEquals($tb->getFVbin(FDI_IMAGE), "2\ntest\nテスト\n\nあいうえおあいうえお");
+        $db->close();
     }
     public function testFind()
     {
@@ -237,6 +241,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         // 3... but not found because filtered
         $tb->findNext(true);
         $this->assertEquals($tb->stat(), Bz\transactd::STATUS_EOF);
+        $db->close();
     }
     public function testUpdate()
     {
@@ -274,6 +279,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->getFVint(FDI_ID), 2);
         $this->assertEquals($tb->getFVint(FDI_USER_ID), 1);
         $this->assertEquals($tb->getFVstr(FDI_BODY), "2\nテスト\ntest\n\nABCDEFG");
+        $db->close();
     }
     public function testDelete()
     {
@@ -303,6 +309,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         // eof
         $tb->seekNext();
         $this->assertEquals($tb->stat(), Bz\transactd::STATUS_EOF);
+        $db->close();
     }
     public function testRecord()
     {
@@ -316,6 +323,7 @@ class transactdBlobTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(count($rs), 1);
         $f = $rs[0]->getField(FDI_IMAGE);
         $this->assertEquals($f->getBin(), $image);
+        $db->close();
     }
     public function testDrop()
     {

data/source/bzs/test/tdclphp/transactd_v3_Test.php

@@ -46,7 +46,7 @@ define("DBNAME", "test_v3");
 define("TABLENAME", "user");
 define("PROTOCOL", "tdap://");
 define("BDFNAME", "?dbfile=test.bdf");
-define("URL", PROTOCOL . USERPART . HOSTNAME . DBNAME . BDFNAME . PASSPART);
+define("URI", PROTOCOL . USERPART . HOSTNAME . DBNAME . BDFNAME . PASSPART);
 
 // multi thread test if `php_pthreads` exists.
 if(class_exists('Thread')){
@@ -58,7 +58,7 @@ if(class_exists('Thread')){
         }
         public function run()
         {
-            $dbm = new bz\pooledDbManager(new bz\connectParams(URL));
+            $dbm = new bz\pooledDbManager(new bz\connectParams(URI));
             $tb = $dbm->table('user');
             $tb->setFV(FDI_ID, 300000);
             $tb->seekLessThan(false, bz\transactd::ROW_LOCK_X);
@@ -78,24 +78,25 @@ class transactdTest extends PHPUnit_Framework_TestCase
 {
     private function dropDatabase($db)
     {
-        $db->open(URL);
-        $this->assertEquals($db->stat(), 0);
-        $db->drop();
+        // Version 3.1 or later is support drop by uri.
+        //$db->open(URI);
+        //$this->assertEquals($db->stat(), 0);
+        $db->drop(URI);
         $this->assertEquals($db->stat(), 0);
     }
     private function createDatabase($db)
     {
-        $db->create(URL);
+        $db->create(URI);
         if ($db->stat() == bz\transactd::STATUS_TABLE_EXISTS_ERROR)
         {
             $this->dropDatabase($db);
-            $db->create(URL);
+            $db->create(URI);
         }
         $this->assertEquals($db->stat(), 0);
     }
     private function openDatabase($db)
     {
-        return $db->open(URL, bz\transactd::TYPE_SCHEMA_BDF, bz\transactd::TD_OPEN_NORMAL);
+        return $db->open(URI, bz\transactd::TYPE_SCHEMA_BDF, bz\transactd::TD_OPEN_NORMAL);
     }
     private function isMySQL5_5($db)
     {
@@ -106,6 +107,15 @@ class transactdTest extends PHPUnit_Framework_TestCase
             ((5 == $server_ver->majorVersion) &&
             (5 == $server_ver->minorVersion));
     }
+    private function isMariaDBWithGtid($db)
+    {
+        $vv = new bz\btrVersions();
+        $db->getBtrVersion($vv);
+        $server_ver = $vv->version(1);
+        return ($db->stat() == 0) && 
+            (10 == $server_ver->majorVersion) &&
+            ($server_ver->type == bz\transactd::MYSQL_TYPE_MARIA);
+    }
     private function isLegacyTimeFormat($db)
     {
         $vv = new bz\btrVersions();
@@ -740,4 +750,18 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $fd->setDefaultValue($bits1);
         $this->assertEquals($fd->defaultValue(), '4');
     }
+    public function test_snapshot()
+    {
+        $db = new bz\database();
+        $this->openDatabase($db);
+        $bpos = $db->beginSnapshot(bz\transactd::CONSISTENT_READ_WITH_BINLOG_POS);
+        if ($this->isMariaDBWithGtid($db))
+          $this->assertEquals($bpos->type, bz\transactd::REPL_POSTYPE_MARIA_GTID);
+        else
+          $this->assertEquals($bpos->type, bz\transactd::REPL_POSTYPE_POS);
+        $this->assertNotEquals($bpos->pos, 0);
+        $this->assertNotEquals($bpos->filename, "");
+        echo PHP_EOL.'binlog pos = '.$bpos->filename.':'.$bpos->pos.PHP_EOL;
+        $db->endSnapshot();
+    }
 }

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

data/source/bzs/test/trdclengn/testField.h

@@ -3300,6 +3300,40 @@ void testCompDecimal()
 
 }
 
+void testSnapshotWithbinlog()
+{
+    nsdatabase::setCheckTablePtr(true);
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF,TD_OPEN_READONLY);
+    BOOST_CHECK(db->stat() == 0);
+    table* tb = db->openTable(1, TD_OPEN_READONLY);
+    BOOST_CHECK(db->stat() == 0);
+
+    btrVersions vs;
+    db->getBtrVersion(&vs);
+    BOOST_CHECK(db->stat() == 0);
+    btrVersion ver = vs.versions[1];
+
+    binlogPos bpos;
+    db->beginSnapshot(CONSISTENT_READ_WITH_BINLOG_POS, &bpos);
+    BOOST_CHECK_MESSAGE(db->stat() == 0, "stat = " << db->stat());
+    BOOST_CHECK(strlen(bpos.filename) >= 5);
+    BOOST_CHECK(bpos.pos != 0);
+    if (ver.isMariaDB() && ver.majorVersion > 5)
+    {
+        BOOST_CHECK(bpos.type == REPL_POSTYPE_MARIA_GTID);
+        BOOST_CHECK(strlen(bpos.gtid) >= 5);
+    }
+    else
+        BOOST_CHECK(bpos.type == REPL_POSTYPE_POS);
+    
+    //Test invalid close 
+    tb->close();
+    BOOST_CHECK(tb->stat() == STATUS_ALREADY_INSNAPSHOT);
+
+    db->endSnapshot();
+}
+
 #pragma warning(default : 4996) 
 
 #endif // BZS_TEST_TRDCLENGN_TESTFIELD_H