transactd 2.3.0 → 2.4.0

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

@@ -519,6 +519,107 @@ function wirteRecord(atg)
 	rec.Del();
 }
 
+/*--------------------------------------------------------------------------------*/
+function testBookmarks(atg)
+{
+	var tb = atg.Table();
+	initQuery();
+	q.All();
+	q.BookmarkAlso(true);
+	tb.SetQuery(q, false);
+	var num = tb.RecordCount();
+	checkEqual(num, 100, "RecotdCount = 100 ");
+	
+	checkEqual(tb.BookmarksCount, 100, "BookmarkCount = 100 ");
+	
+	initQuery();
+
+    // Hold bookmark objects to reading.
+	var bm1 = tb.Bookmarks(0);
+	var bm2 = tb.Bookmarks(10);
+	var bm3 = tb.Bookmarks(20);
+	q.AddSeekBookmark(bm1);
+	q.AddSeekBookmark(bm2);
+	q.AddSeekBookmark(bm3);
+	var rs = atg.Read(q);
+
+	checkEqual(rs.Count, 3, "atg rs.Count = 3 ");
+	checkEqual(rs.Record(0).Field("code").Vlng, 1, "rs.Record(0).code = 1 ");
+	checkEqual(rs.Record(1).Field("code").Vlng, 11, "rs.Record(1).code = 11 ");
+	checkEqual(rs.Record(2).Field("code").Vlng, 21, "rs.Record(2).code = 21 ");
+	
+	//Read by table
+	tb.SetQuery(q, false);
+	tb.Find();
+	checkEqual(tb.Stat, 0, "tb.Stat = 0 ");
+	checkEqual(tb.Vlng("code"), 1, "First.code = 1 ");
+	tb.FindNext();
+	checkEqual(tb.Stat, 0, "tb.Stat = 0 ");
+	checkEqual(tb.Vlng("code"), 11, "Second.code = 11 ");
+	tb.FindNext();
+	checkEqual(tb.Stat, 0, "tb.Stat = 0 ");
+	checkEqual(tb.Vlng("code"), 21, "Third.code = 21 ");
+	tb.FindNext();
+	checkEqual(tb.Stat, 9, "tb.Stat = 9 ");
+}
+/*--------------------------------------------------------------------------------*/
+
+function testBookmarks2(db)
+{
+	var min_id = 5;
+	var max_id = 15;
+	var FDI_ID = 0;
+	
+	var tb = db.OpenTable("user");
+	checkEqual(db.Stat, 0, "");
+	tb.KeyNum = 0;
+	tb.ClearBuffer();
+
+	var qq = new ActiveXObject('transactd.query');
+	qq.Where('id', '>=', min_id).And('id', '<=', max_id).Reject(0xFFFF);
+	tb.setQuery(qq.BookmarkAlso(true));
+	
+	var cnt = tb.RecordCount();
+	checkEqual(tb.Stat, 0, "");
+	checkEqual(cnt, 11, "count ");
+	var bmCnt = tb.BookmarksCount;
+	checkEqual(cnt, bmCnt, "");
+
+	tb.MoveBookmarks(bmCnt - 1);
+	checkEqual(tb.Stat, 0, "");
+	checkEqual(tb.Vlng(FDI_ID), max_id);
+	tb.MoveBookmarks(0);
+	checkEqual(tb.Stat, 0, "");
+	checkEqual(tb.Vlng(FDI_ID), min_id);
+	
+	var qb = new ActiveXObject('transactd.query');
+	// Hold bookmark objects to reading.
+	var bm1 = tb.Bookmarks(0);
+	var bm2 = tb.Bookmarks(2);
+	var bm3 = tb.Bookmarks(4);
+	qb.AddSeekBookmark(bm1);
+	qb.AddSeekBookmark(bm2);
+	qb.AddSeekBookmark(bm3);bm1
+	
+	var atu = createActiveTable(db, "user");
+	var rs = atu.Read(qb);
+	checkEqual(rs.Size, 3);
+	
+	checkEqual(rs.Record(0).Field(FDI_ID).Vlng, 5);
+	checkEqual(rs.Record(1).Field(FDI_ID).Vlng, 7);
+	checkEqual(rs.Record(2).Field(FDI_ID).Vlng, 9);
+	
+	//read by wriableRecord
+	var rec = atu.GetWritableRecord();
+	rec.Read(tb.Bookmarks(1));
+	checkEqual(rec.Field(FDI_ID).Vlng, 6);
+	rec.Read(tb.Bookmarks(3));
+	checkEqual(rec.Field(FDI_ID).Vlng, 8);
+	rec.Read(tb.Bookmarks(5));
+	checkEqual(rec.Field(FDI_ID).Vlng, 10);
+	
+	tb.Close();
+}
 
 /*--------------------------------------------------------------------------------*/
 function test(atu, atg, ate, db)
@@ -647,6 +748,10 @@ function test(atu, atg, ate, db)
 	
 	// test wirteRecord
 	wirteRecord(atg);
+	
+	//test ver 2.4 added changed method
+	testBookmarks(atg);
+	testBookmarks2(db);
 
 	WScript.Echo(" -- End Test -- ");
 

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

@@ -216,6 +216,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         
         $dbdef->updateTableDef($tableid);
         $this->assertEquals($dbdef->stat(), 0);
+        $this->assertEquals($dbdef->validateTableDef($tableid), 0);
     }
     private function openTable($db)
     {
@@ -521,6 +522,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tb->stat(), 0);
         $this->assertTrue(abs(TEST_COUNT / 2 + 1 - $v) < FIVE_PERCENT_OF_TEST_COUNT);
     }
+    
     public function testGetEqual()
     {
         $db = new Bz\database();
@@ -1291,7 +1293,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         
         // cleanup
         $tb2->del(); // last id = 29999
-        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb2->stat(), 0);
         
         // ------------------------------------------------------
         // Test use shared lock option
@@ -1798,7 +1800,7 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $db = new Bz\database();
         $tb = $this->openTable($db);
         $this->assertNotEquals($tb, NULL);
-        $expected_count = 20003;
+        $expected_count = 20002;
         if(! class_exists('Thread'))
           $expected_count = $expected_count + 1;
         // estimate count
@@ -1906,9 +1908,9 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($db->stat(), 1);
     }
     
-    /* -----------------------------------------------------
-        transactd var tables
-    ----------------------------------------------------- */
+    //-----------------------------------------------------
+    //    transactd var tables
+    //----------------------------------------------------- 
     
     private function isWindows()
     {
@@ -2429,9 +2431,9 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($db->stat(), 0);
     }
     
-    /* -----------------------------------------------------
-        transactd StringFilter
-    ----------------------------------------------------- */
+    //-----------------------------------------------------
+    //    transactd StringFilter
+    //-----------------------------------------------------
     
     private function createTableStringFilter($db, $id, $name, $type, $type2)
     {
@@ -2815,9 +2817,9 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($q->toString(), "code = '&&abc'");
     }
     
-    /* -----------------------------------------------------
-        ActiveTable
-    ----------------------------------------------------- */
+    //-----------------------------------------------------
+    //    ActiveTable
+    //----------------------------------------------------- 
     
     private function createQTuser($db)
     {
@@ -3652,4 +3654,120 @@ class transactdTest extends PHPUnit_Framework_TestCase
         $ret = $rec->read();
         $this->assertEquals($ret, false);
     }
+    
+    public function testBookmark1()
+    {
+        $min_id = 5;
+        $max_id = 15;
+        $db = new Bz\database();
+        $db->open(URL_QT);
+        $this->assertEquals($db->stat(), 0);
+        $tb = $db->openTable('user');
+        $this->assertEquals($db->stat(), 0);
+
+        $tb->clearBuffer();
+        $tb->setKeyNum(0);
+        $tb->setFilter('id >= ' . $min_id . ' and id <= ' . $max_id, 0, 0);
+        $cnt = $tb->recordCount();
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($cnt, $tb->bookmarksCount());
+        $tb->moveBookmarks($cnt - 1);
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), $max_id);
+        $tb->moveBookmarks(0);
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), $min_id);
+        
+        $q = new Bz\query();
+        $q->where('id', '>=', $min_id)->and_('id', '<=', $max_id)->reject(0xFFFF);
+        $tb->clearBuffer();
+        $tb->setQuery($q->bookmarkAlso(true));
+        $cnt = $tb->recordCount();
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($cnt, $tb->bookmarksCount());
+        $tb->moveBookmarks($cnt - 1);
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), $max_id);
+        $tb->moveBookmarks(0);
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), $min_id);
+        
+        
+        $atu = new Bz\ActiveTable($db, 'user');
+        $qb = new Bz\query();
+        $len = $atu->table()->bookmarkLen();
+        // Hold bookmark objects to reading.
+        $bm1 = $tb->bookmarks(0);
+        $bm2 = $tb->bookmarks(2);
+        $bm3 = $tb->bookmarks(4);
+        
+        $qb->addSeekBookmark($bm1, $len);
+        $qb->addSeekBookmark($bm2, $len);
+        $qb->addSeekBookmark($bm3, $len);
+        $this->assertEquals($qb->isSeekByBookmarks(), true);
+        $rs = $atu->read($qb);
+        
+        $this->assertEquals($cnt, $tb->bookmarksCount());
+        $this->assertEquals(count($rs), 3);
+        $this->assertEquals($rs[0][FDI_ID], 5);
+        $this->assertEquals($rs[1][FDI_ID], 7);
+        $this->assertEquals($rs[2][FDI_ID], 9);
+
+        //read by WritableRecord
+        $rec = $atu->getWritableRecord();
+        $rec->read($tb->bookmarks($cnt - 1));
+        $this->assertEquals($rec[FDI_ID], $max_id);
+        $rec->read($tb->bookmarks(0));
+        $this->assertEquals($rec[FDI_ID], $min_id);
+
+        $db->close();
+    }
+    public function testBookmark2()
+    {
+        $db = new Bz\database();
+        $db->open(URL_QT);
+        $this->assertEquals($db->stat(), 0);
+        $atu = new Bz\ActiveTable($db, 'user');
+        
+        $tb = $atu->table();
+        $q = new Bz\query();
+        $tb->setQuery($q->all()->bookmarkAlso(true));
+        $num = $tb->recordCount();
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($num, $tb->bookmarksCount());
+        
+        $q->reset();
+        $len = $tb->bookmarkLen();
+        $this->assertEquals($len, 4);
+        
+        // Hold bookmark objects to reading.
+        $bm1 = $tb->bookmarks(0);
+        $bm2 = $tb->bookmarks(10);
+        $bm3 = $tb->bookmarks(20);
+
+        $q->addSeekBookmark($bm1, $len);
+        $q->addSeekBookmark($bm2, $len);
+        $q->addSeekBookmark($bm3, $len);
+        $rs = $atu->read($q);
+        $this->assertEquals($rs->count(), 3);
+        
+        $this->assertEquals($rs[0][FDI_ID], 1);
+        $this->assertEquals($rs[1][FDI_ID], 11);
+        $this->assertEquals($rs[2][FDI_ID], 21);
+        
+        //Read by table
+        $tb->setQuery($q, false);
+        $tb->find();
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), 1);
+        $tb->findNext();
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), 11);
+        $tb->findNext();
+        $this->assertEquals($tb->stat(), 0);
+        $this->assertEquals($tb->getFVint(FDI_ID), 21);
+        $tb->findNext();
+        $this->assertEquals($tb->stat(), 9);
+        
+    }
 }

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

@@ -175,6 +175,7 @@ def testCreateTable(db)
   kd.segmentCount = 1
   dbdef.updateTableDef(table_id)
   expect(dbdef.stat()).to eq 0
+  expect(dbdef.validateTableDef(td.id)).to eq 0
 end
 
 def testOpenTable(db)
@@ -1181,7 +1182,7 @@ def testTransactionLockReadCommited()
   
   # cleanup
   tb2.del() # last id = 29999
-  expect(tb.stat()).to eq 0
+  expect(tb2.stat()).to eq 0
   
   # ----------------------------------------------------
   # Abort test
@@ -1741,7 +1742,7 @@ def testInsert2()
 end
 
 def testDelete()
-  expected_count = 20003
+  expected_count = 20002
   db = Transactd::Database.new()
   tb = testOpenTable(db)
   # estimate count
@@ -3428,6 +3429,73 @@ def testWirtableRecord()
   db.close()
 end
 
+def testBookmark()
+  min_id = 5
+  max_id = 15
+  db = Transactd::Database.new()
+  db.open(URL_QT)
+  expect(db.stat()).to eq 0
+  tb = db.openTable('user')
+  expect(db.stat()).to eq 0
+  tb.setKeyNum(0)
+  
+  tb.clearBuffer()
+  tb.setFilter('id >= ' + min_id.to_s + ' and id <= ' + max_id.to_s, 0, 0)
+  cnt = tb.recordCount()
+  expect(tb.stat()).to eq 0
+  bmCnt = tb.bookmarksCount()
+  expect(cnt).to eq bmCnt
+  tb.moveBookmarks(bmCnt - 1)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVint(FDI_ID)).to eq max_id
+  tb.moveBookmarks(0)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVint(FDI_ID)).to eq min_id
+  
+  q = Transactd::Query.new()
+  q.where('id', '>=', min_id).and_('id', '<=', max_id).reject(0xFFFF)
+  
+  tb.setQuery(q.bookmarkAlso(true))
+  cnt = tb.recordCount()
+  expect(tb.stat()).to eq 0
+  bmCnt = tb.bookmarksCount()
+  expect(cnt).to eq bmCnt
+  tb.moveBookmarks(bmCnt - 1)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVint(FDI_ID)).to eq max_id
+  tb.moveBookmarks(0)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVint(FDI_ID)).to eq min_id
+  
+  qb = Transactd::Query.new()
+  atu = Transactd::ActiveTable.new(db, 'user')
+
+  # Hold bookmark objects to reading.
+  bm1 = tb.bookmarks(0)
+  bm2 = tb.bookmarks(2)
+  bm3 = tb.bookmarks(4)
+  
+  qb.addSeekBookmark(bm1, tb.bookmarkLen(), false)
+  qb.addSeekBookmark(bm2, tb.bookmarkLen(), false)
+  qb.addSeekBookmark(bm3, tb.bookmarkLen(), false)
+  rs = atu.read(qb)
+  
+  expect(rs.size()).to eq 3
+  expect(rs[0][FDI_ID]).to eq min_id
+  expect(rs[1][FDI_ID]).to eq min_id + 2
+  expect(rs[2][FDI_ID]).to eq min_id + 4
+  
+  rec = atu.index(0).getWritableRecord()
+  rec.read(tb.bookmarks(bmCnt - 1))
+  expect(rec[FDI_ID]).to eq max_id
+  rec.read(tb.bookmarks(0))
+  expect(rec[FDI_ID]).to eq min_id
+  
+  atu.release()
+  tb.close()
+  db.close()
+end
+
 describe Transactd do
   it 'create database' do
     db = Transactd::Database.new()
@@ -3567,6 +3635,10 @@ describe Transactd do
   it 'write with writableRecord' do
     testWirtableRecord()
   end
+  it 'bookmark' do
+    testBookmark()
+  end
+
 end
 
 describe Transactd, 'var tables' do

data/source/bzs/test/transactdBench/scaling_bench.cpp

@@ -123,7 +123,7 @@ void makeMysqlParam(bzs::test::worker::mysql::connectParam& param,
     param.port = 0;
 }
 
-#define BENCH_TIMER_SECONDS 2.0f
+#define BENCH_TIMER_SECONDS 5.0f
 double executeWorkers(const commandLineParam& cmd, const connectParams param,
                       const bzs::test::worker::mysql::connectParam& paramMysql,
                       int wn)

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

@@ -18,8 +18,16 @@
  ================================================================= */
 //#define BOOST_TEST_MODULE
 
-
+#if defined(__BCPLUSPLUS__)
+#pragma warn -8012
+#pragma warn -8022
+#endif
 #include <boost/test/included/unit_test.hpp>
+#if defined(__BCPLUSPLUS__)
+#pragma warn .8012
+#pragma warn .8022
+#endif
+
 #include <bzs/db/protocol/tdap/client/database.h>
 #include <bzs/db/protocol/tdap/client/table.h>
 #include <bzs/db/protocol/tdap/client/dbDef.h>
@@ -452,9 +460,13 @@ void testInsert(database* db)
         tb->insert();
     }
     tb->commitBulkInsert();
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "Insert2");
     db->endTrn();
 
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "Insert2");
+    uint_td v = tb->recordCount(false);
+    BOOST_CHECK_MESSAGE(20002 == v,
+                        "RecordCount count = " << v);
+
     tb->release();
 }
 
@@ -1662,7 +1674,7 @@ void testTransactionLockReadCommited(database* db)
     
     //insert test row
     tb2->setFV(fdi_id, 29999);
-    tb2->insert();
+    tb2->insert(false);
     BOOST_CHECK_MESSAGE(0 == tb2->stat(), "tb2->insert stat = " << tb2->stat());
 
     tb->seekLast();  
@@ -1675,7 +1687,7 @@ void testTransactionLockReadCommited(database* db)
     
     //cleanup
     tb2->del(); // last id = 29999
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "tb->del");
+    BOOST_CHECK_MESSAGE(0 == tb2->stat(), "tb->del");
 
     /* -------------------------------------------------*/
     /* TAbort test                                      */
@@ -1907,7 +1919,9 @@ bool isMySQL5_7(database* db)
         (7 == vv.versions[1].minorVersion));
   
 }
-
+#if defined(__BCPLUSPLUS__)
+#pragma warn -8004
+#endif
 void testExclusive()
 {
    
@@ -1983,12 +1997,17 @@ void testExclusive()
     /* -------------------------------------------------*/
     tb = openTable(db, TD_OPEN_NORMAL);
     db2->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF);
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "db2 open stat = " << db2->stat());
             
     table* tb2 = db->openTable(_T("group"), TD_OPEN_EXCLUSIVE);
     //Check tb2 Exclusive
     table* tb3 = db2->openTable(_T("group"), TD_OPEN_NORMAL);
-    BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat()
-                                    , "Write Exclusive open");
+    if (tb3) //For don't use tb3;
+        BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat()
+                                    , "Write Exclusive open" << db2->stat());
+    else
+        BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat()
+                                    , "Write Exclusive open" << db2->stat());
     //if (tb2->recordCount(false) == 0)
     {
         for (int i = 1 ; i < 5 ; ++i)
@@ -2037,7 +2056,9 @@ void testExclusive()
     tb2 = db->openTable(_T("group"), TD_OPEN_EXCLUSIVE);
     BOOST_CHECK_MESSAGE(0 == db->stat(), "open group stat = " << db->stat()) ;
     //Check tb2 Exclusive
+
     tb3 = db2->openTable(_T("group"), TD_OPEN_NORMAL);
+
     BOOST_CHECK_MESSAGE(STATUS_CANNOT_LOCK_TABLE == db2->stat()
                                     , "Write Exclusive open");
     db->beginTrn();
@@ -2068,8 +2089,9 @@ void testExclusive()
     database::destroy(db);
     database::destroy(db2);
 }
-
-
+#if defined(__BCPLUSPLUS__)
+#pragma warn .8004
+#endif
 /* Multi database */
 void testMultiDatabase(database* db)
 {
@@ -2121,11 +2143,12 @@ void testMissingUpdate(database* db)
     db2->connect(makeUri(PROTOCOL, HOSTNAME, DBNAME), true);
     BOOST_CHECK_MESSAGE(0 == db2->stat(), "connect");
     db2->open(makeUri(PROTOCOL, HOSTNAME, DBNAME, BDFNAME), TYPE_SCHEMA_BDF); 
-    BOOST_CHECK_MESSAGE(0 == db2->stat(), "db2->open");
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "db2->open stat = " << db2->stat());
     table* tb2 = db2->openTable(_T("user"));
     {
+
         boost::scoped_ptr<worker> w(new worker(tb2));
-    
+#ifdef TEST_SEEK_RETRY    
         // Inserting  target, The InnoDB is good!
         tb->setFV(fdi_id, 300000);
         tb2->setFV(fdi_id, 300000);
@@ -2172,6 +2195,7 @@ void testMissingUpdate(database* db)
                     
             tb2->unlock();
         }
+#endif
         
         // Deleting  target, The InnoDB is good!
         tb->setFV(fdi_id, 300000);
@@ -2225,20 +2249,21 @@ void testDelete(database* db)
 
     // estimate number
     int count = tb->recordCount(true);
-    bool c = (abs(count - 20003) < 5000);
+    bool c = (abs(count - 20002) < 5000);
     BOOST_CHECK_MESSAGE(c == true, "RecordCount1");
     if (!c)
     {
         char tmp[256];
         sprintf_s(
             tmp, 256,
-            "true record count = 20003 as estimate recordCount count = %d ",
+            "true record count = 20002 as estimate recordCount count = %d ",
             count);
         BOOST_CHECK_MESSAGE(false, tmp);
     }
     // true number
-    BOOST_CHECK_MESSAGE((uint_td)20003 == tb->recordCount(false),
-                        "RecordCount2");
+    uint_td v = tb->recordCount(false);
+    BOOST_CHECK_MESSAGE(20002 == v,
+                        "RecordCount2 count = " << v);
     int vv = 15001;
     tb->clearBuffer();
     tb->setFV(fdi_id, vv);
@@ -2472,7 +2497,7 @@ void doCreateVarTable(database* db, int id, const _TCHAR* name, char fieldType,
     td.charsetIndex = charset;
 
     def->insertTable(&td);
-    BOOST_CHECK_MESSAGE(0 == def->stat(), "insertTable");
+    BOOST_CHECK_MESSAGE(0 == def->stat(), "insertTable stat = " << def->stat());
 
     fielddef* fd = def->insertField(id, 0);
     fd->setName(_T("id"));
@@ -3206,7 +3231,7 @@ void doInsertStringFileter(table* tb)
     tb->setFV(_T("name"), _T("あいうえおかきくこ"));
     tb->setFV(_T("namew"), _T("あいうえおかきくこ"));
     tb->insert();
-    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 1");
+    BOOST_CHECK_MESSAGE(0 == tb->stat(), "InsertStringFileter 1 stst = " << tb->stat());
 
     tb->clearBuffer();
     id = 2;
@@ -4537,7 +4562,7 @@ void testServerPrepareJoin(database* db)
     BOOST_CHECK_MESSAGE(rs.size() == 100, "hasManyJoin  rs.size()== 100");
     q.all().optimize(queryBase::joinHasOneOrHasMany);
     atu.index(1).join(rs, q, _T("code"));
-    BOOST_CHECK_MESSAGE(rs.size() == 20000, "hasManyJoin  rs.size()== 20000");
+    BOOST_CHECK_MESSAGE(rs.size() == 20000, "hasManyJoin  rs.size()== 20000 size = " << rs.size());
 
     //hasManyJoin outer
     rs.clear();
@@ -4546,7 +4571,7 @@ void testServerPrepareJoin(database* db)
     BOOST_CHECK_MESSAGE(rs.size() == 100, "hasManyJoin  rs.size()== 100");
     q.all().optimize(queryBase::joinHasOneOrHasMany);
     atu.index(1).outerJoin(rs, q, _T("code"));
-    BOOST_CHECK_MESSAGE(rs.size() == 20095, "hasManyJoin  rs.size()== 20095");
+    BOOST_CHECK_MESSAGE(rs.size() == 20095, "hasManyJoin  rs.size()== 20095 size = " << rs.size());
 
 
     // restore record
@@ -5539,7 +5564,7 @@ BOOST_FIXTURE_TEST_CASE(new_delete, fixtureQuery)
 BOOST_FIXTURE_TEST_CASE(join, fixtureQuery)
 {
     testJoin(db());
-    testRecordsetClone(db());
+    //testRecordsetClone(db());
     testPrepareJoin(db());
     testServerPrepareJoin(db());
     testWirtableRecord(db());

data/source/global/tdclatl/Bookmark.cpp

@@ -0,0 +1,28 @@
+/*=================================================================
+   Copyright (C) 2015 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
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+#include "stdafx.h"
+#include "Bookmark.h"
+
+
+
+STDMETHODIMP CBookmark::get_IsEmpty(VARIANT_BOOL* retVal)
+{
+    *retVal = m_bm.isEmpty();
+    return S_OK;
+}