transactd 2.2.0 → 2.3.0

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

@@ -23,16 +23,24 @@ require 'transactd'
 require 'rbconfig'
 IS_WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 
+def getEnv(valuename)
+  return ENV[valuename] if ENV[valuename] != nil
+  return ''
+end
+
 def getHost()
-  hostname = 'localhost/'
-  if (ENV['TRANSACTD_RSPEC_HOST'] != nil && ENV['TRANSACTD_RSPEC_HOST'] != '')
-    hostname = ENV['TRANSACTD_RSPEC_HOST']
-  end
+  hostname = getEnv('TRANSACTD_RSPEC_HOST')
+  hostname = '127.0.0.1/' if hostname == ''
   hostname = hostname + '/' unless (hostname =~ /\/$/)
   return hostname
 end
 
 HOSTNAME = getHost()
+USERNAME = getEnv('TRANSACTD_RSPEC_USER')
+USERPART = USERNAME == '' ? '' : USERNAME + '@'
+PASSWORD = getEnv('TRANSACTD_RSPEC_PASS')
+PASSPART = PASSWORD == '' ? '' : '&pwd=' + PASSWORD
+PASSPART2 = PASSWORD == '' ? '' : '?pwd=' + PASSWORD
 DBNAME = 'test'
 DBNAME_VAR = 'testvar'
 DBNAME_SF = 'testString'
@@ -40,10 +48,12 @@ DBNAME_QT = 'querytest'
 TABLENAME = 'user'
 PROTOCOL = 'tdap://'
 BDFNAME = '?dbfile=test.bdf'
-URL = PROTOCOL + HOSTNAME + DBNAME + BDFNAME
-URL_VAR = PROTOCOL + HOSTNAME + DBNAME_VAR + BDFNAME
-URL_SF = PROTOCOL + HOSTNAME + DBNAME_SF + BDFNAME
-URL_QT = PROTOCOL + HOSTNAME + DBNAME_QT + BDFNAME
+URL = PROTOCOL + USERPART + HOSTNAME + DBNAME + BDFNAME + PASSPART
+URL_VAR = PROTOCOL + USERPART + HOSTNAME + DBNAME_VAR + BDFNAME + PASSPART
+URL_SF = PROTOCOL + USERPART + HOSTNAME + DBNAME_SF + BDFNAME + PASSPART
+URL_QT = PROTOCOL + USERPART + HOSTNAME + DBNAME_QT + BDFNAME + PASSPART
+URL_HOST = PROTOCOL + USERPART + HOSTNAME + PASSPART2
+URL_DB = PROTOCOL + USERPART + HOSTNAME + DBNAME + PASSPART2
 FDI_ID = 0
 FDI_NAME = 1
 FDI_GROUP = 2
@@ -97,8 +107,18 @@ def testCreateTable(db)
   
   fd = dbdef.insertField(1, 1)
   fd.setName('name')
-  fd.type = Transactd::Ft_zstring
   fd.len = 33
+  
+  #test padChar
+  fd.type = Transactd::Ft_string
+  fd.setPadCharSettings(true, false)
+  expect(fd.usePadChar()).to eq true;
+  expect(fd.trimPadChar()).to eq false;
+  fd.setPadCharSettings(false, true)
+  expect(fd.usePadChar()).to eq false;
+  expect(fd.trimPadChar()).to eq true;
+  
+  fd.type = Transactd::Ft_zstring
   dbdef.updateTableDef(1)
   expect(dbdef.stat()).to eq 0
   
@@ -183,7 +203,7 @@ end
 
 def testVersion()
   db = Transactd::Database.new()
-  db.connect(PROTOCOL + HOSTNAME)
+  db.connect(URL_HOST)
   expect(db.stat()).to eq 0
   vv = Transactd::BtrVersions.new()
   db.getBtrVersion(vv)
@@ -623,7 +643,7 @@ def testSnapshot()
   expect(db.stat()).to eq 0
   expect(tbg).not_to be nil
   db2 = Transactd::Database.new()
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME , true)
+  db2.connect(URL_DB, true)
   expect(db2.stat()).to eq 0
   tb2 = testOpenTable(db2)
   expect(tb2).not_to be nil
@@ -753,7 +773,7 @@ def testTransactionLockRepeatable()
   tb = testOpenTable(db)
   expect(tb).not_to be nil
   db2 = Transactd::Database.new()
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+  db2.connect(URL_DB, true)
   expect(db2.stat()).to eq 0
   tb2 = testOpenTable(db2)
   expect(tb2).not_to be nil
@@ -984,7 +1004,7 @@ def testTransactionLockReadCommited()
   tb = testOpenTable(db)
   expect(tb).not_to be nil
   db2 = Transactd::Database.new()
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+  db2.connect(URL_DB, true)
   expect(db2.stat()).to eq 0
   tb2 = testOpenTable(db2)
   expect(tb2).not_to be nil
@@ -1249,7 +1269,7 @@ def testRecordLock()
   tb = testOpenTable(db)
   expect(tb).not_to be nil
   db2 = Transactd::Database.new()
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+  db2.connect(URL_DB, true)
   expect(db2.stat()).to eq 0
   tb2 = testOpenTable(db2)
   expect(tb2).not_to be nil
@@ -1385,7 +1405,7 @@ def testConflict()
   db = Transactd::Database.new()
   tb = testOpenTable(db)
   db2 = Transactd::Database.new()
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME , true)
+  db2.connect(URL_DB, true)
   expect(db2.stat()).to eq 0
   expect(tb).not_to be nil
   tb2 = testOpenTable(db2)
@@ -1444,7 +1464,7 @@ def testExclusive()
   
   # Can not open database from other connections.
   db2 = Transactd::Database.new()
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+  db2.connect(URL_DB, true)
   expect(db2.stat()).to eq 0
   db2.open(URL, Transactd::TYPE_SCHEMA_BDF)
   # database open error. Check database::stat()
@@ -1467,7 +1487,7 @@ def testExclusive()
   db2.close()
   
   # Normal open
-  db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+  db2.connect(URL_DB, true)
   db2.open(URL, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL)
   expect(db2.stat()).to eq 0
   db2.close()
@@ -1629,7 +1649,7 @@ def testMissingUpdate()
     # Get lock(X) same record in parallel.
     w = Thread.new {
       db2 = Transactd::Database.new()
-      db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+      db2.connect(URL_DB, true)
       expect(db2.stat()).to eq 0
       db2.open(URL, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL)
       expect(db2.stat()).to eq 0
@@ -1643,7 +1663,7 @@ def testMissingUpdate()
       db2.close()
       v2
     }
-    sleep(0.05)
+    sleep(0.5)
     v = tb.getFVint(FDI_ID)
     v = v + 1
     tb.setFV(FDI_ID, v)
@@ -1673,7 +1693,7 @@ def testMissingUpdate()
     # Get lock(X) same record in parallel.
     w = Thread.new {
       db2 = Transactd::Database.new()
-      db2.connect(PROTOCOL + HOSTNAME + DBNAME, true)
+      db2.connect(URL_DB, true)
       expect(db2.stat()).to eq 0
       db2.open(URL, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL)
       expect(db2.stat()).to eq 0
@@ -1688,7 +1708,7 @@ def testMissingUpdate()
       db2.close()
       v2
     }
-    sleep(0.05)
+    sleep(0.5)
     v = tb.getFVint(FDI_ID)
     tb.del()
     v2 = w.join().value
@@ -1787,12 +1807,12 @@ end
 
 def testLogin()
   db = Transactd::Database.new()
-  db.connect(PROTOCOL + HOSTNAME)
+  db.connect(URL_HOST)
   expect(db.stat()).to eq 0
   if db.stat() == 0
     # second connection
     db2 = Transactd::Database.new()
-    db2.connect(PROTOCOL + HOSTNAME, true)
+    db2.connect(URL_HOST, true)
     expect(db2.stat()).to eq 0
     db2.disconnect()
     db.disconnect()
@@ -1811,7 +1831,7 @@ def testLogin()
   db.close()
   expect(db.stat()).to eq 0
   # true database name
-  db.connect(PROTOCOL + HOSTNAME + DBNAME)
+  db.connect(URL_DB)
   expect(db.stat()).to eq 0
   if (db.stat() == 0)
     db.disconnect()
@@ -1821,7 +1841,7 @@ def testLogin()
   testDropDatabase(db)
   db.disconnect()
   expect(db.stat()).to eq 0
-  db.connect(PROTOCOL + HOSTNAME + DBNAME)
+  db.connect(URL_DB)
   expect(db.stat()).to eq (Transactd::ERROR_NO_DATABASE)
   db.disconnect()
   expect(db.stat()).to eq 1
@@ -2835,11 +2855,11 @@ def createQTextention(db)
 end
 
 def insertQT(db, maxId)
-  db.beginTrn()
   # insert user data
   tb = db.openTable('user', Transactd::TD_OPEN_NORMAL)
   expect(db.stat()).to eq 0
   expect(tb).not_to be nil
+  db.beginTrn()
   tb.clearBuffer()
   for i in 1..maxId
     tb.setFV(0, i)
@@ -2848,11 +2868,13 @@ def insertQT(db, maxId)
     tb.insert()
     expect(tb.stat()).to eq 0
   end
+  db.endTrn()
   tb.close()
   # insert groups data
   tb = db.openTable('groups', Transactd::TD_OPEN_NORMAL)
   expect(db.stat()).to eq 0
   expect(tb).not_to be nil
+  db.beginTrn()
   tb.clearBuffer()
   for i in 1..100
     tb.setFV(0, i)
@@ -2860,11 +2882,13 @@ def insertQT(db, maxId)
     tb.insert()
     expect(tb.stat()).to eq 0
   end
+  db.endTrn()
   tb.close()
   # insert extention data
   tb = db.openTable('extention', Transactd::TD_OPEN_NORMAL)
   expect(db.stat()).to eq 0
   expect(tb).not_to be nil
+  db.beginTrn()
   tb.clearBuffer()
   for i in 1..maxId
     tb.setFV(0, i)
@@ -2873,8 +2897,8 @@ def insertQT(db, maxId)
     tb.insert()
     expect(tb.stat()).to eq 0
   end
-  tb.close()
   db.endTrn()
+  tb.close()
 end
 
 def testCreateQueryTest()
@@ -2931,6 +2955,8 @@ def testNewDelete()
     a = Transactd::Avg.new(fns)
     mi = Transactd::Min.new(fns)
     ma = Transactd::Max.new(fns)
+    la = Transactd::Last.new(fns)
+    fa = Transactd::First.new(fns)
     rs = Transactd::Recordset.new()
     # have to explicitly release
     atu.release()
@@ -3284,6 +3310,64 @@ def testServerPrepareJoin()
   db.close()
 end
 
+def testReadMore()
+  db = Transactd::Database.new()
+  db.open(URL_QT)
+  expect(db.stat()).to eq 0
+  
+  atu = Transactd::ActiveTable.new(db, 'user')
+  atu.alias('名前', 'name')
+  q = Transactd::Query.new()
+  
+  #isStopAtLimit
+  expect(q.isStopAtLimit()).to eq false
+  
+  q.select('id', 'name', 'group')
+        .where('name', '=', '1*')
+        .reject(70).limit(8).stopAtLimit(true)
+  expect(q.isStopAtLimit()).to eq true
+  
+  stmt1 = atu.prepare(q)
+  expect(stmt1).not_to eq nil
+  rs = atu.index(0).keyValue(18).read(stmt1)
+  expect(rs.size()).to eq 2
+  
+  #readMore
+  rs2 = atu.readMore()
+  expect(rs2.size()).to eq 8
+  rs.unionRecordset(rs2)
+  expect(rs.size()).to eq 10
+end
+
+def testFirstLastGroupFunction()
+  db = Transactd::Database.new()
+  db.open(URL_QT)
+  expect(db.stat()).to eq 0
+  
+  atu = Transactd::ActiveTable.new(db, 'user')
+  atu.alias('名前', 'name')
+  q = Transactd::Query.new()
+  q.select('id', 'name', 'group')
+        .where('name', '=', '1*')
+        .reject(70).limit(8).stopAtLimit(true)
+  stmt1 = atu.prepare(q)
+  expect(stmt1).not_to eq nil
+  rs = atu.index(0).keyValue(0).read(stmt1)
+  expect(rs.size()).to eq 8
+  
+  #grouping first and last
+  gq = Transactd::GroupQuery.new()
+  target = Transactd::FieldNames.new()
+  target.addValue('name');
+  last = Transactd::Last.new(target, 'last_rec_name')
+  first = Transactd::First.new(target, 'first_rec_name')
+  gq.addFunction(last);
+  gq.addFunction(first);
+  rs.groupBy(gq);
+  expect(rs[0]['first_rec_name']).to eq "1 user";
+  expect(rs[0]['last_rec_name']).to eq "16 user";
+end
+
 def testWirtableRecord()
   db = Transactd::Database.new()
   db.open(URL_QT)
@@ -3474,6 +3558,12 @@ describe Transactd do
   it 'activetable and prepare (server)' do
     testServerPrepareJoin()
   end
+  it 'activetable and readMore' do
+    testReadMore()
+  end
+  it 'Grouping and first and last' do
+    testFirstLastGroupFunction()
+  end
   it 'write with writableRecord' do
     testWirtableRecord()
   end

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

@@ -52,7 +52,7 @@ struct commandLineParam
         avg_count = _ttol(argv[5]);
         stressMode = (loopCount == -1) ? true : false;
         if (stressMode)
-            loopCount = 1;
+            loopCount = 10;
     }
 };
 
@@ -123,7 +123,7 @@ void makeMysqlParam(bzs::test::worker::mysql::connectParam& param,
     param.port = 0;
 }
 
-#define BENCH_TIMER_SECONDS 1.5f
+#define BENCH_TIMER_SECONDS 2.0f
 double executeWorkers(const commandLineParam& cmd, const connectParams param,
                       const bzs::test::worker::mysql::connectParam& paramMysql,
                       int wn)
@@ -151,11 +151,11 @@ double executeWorkers(const commandLineParam& cmd, const connectParams param,
         }
         printf("*");
         fflush(stdout);
-        Sleep(500);
+        Sleep(1000);
         sync.wait(); // start all workers
         if (cmd.stressMode)
         {
-            Sleep(200);
+            Sleep(500);
             g_bench_signal = BENCH_SIGNAL_GREEN;
             //Measurement interval
             Sleep((unsigned int)(BENCH_TIMER_SECONDS * 1000));
@@ -184,7 +184,7 @@ int execute(const commandLineParam& cmd, const connectParams param,
         if (cmd.stressMode)
         {
             if (t)
-                ts.value = (__int64)(t / BENCH_TIMER_SECONDS);
+                ts.value = (__int64)(t / BENCH_TIMER_SECONDS) * cmd.loopCount;
         }
         else
         {

data/source/bzs/test/transactdBench/workerBase.h

@@ -92,7 +92,7 @@ public:
             else if (g_bench_signal == BENCH_SIGNAL_BLUE)
             {
                 m_bresult = bm.end();
-                dummyWork(); 
+                //dummyWork(); 
                 break;
             }
         }
@@ -116,7 +116,7 @@ public:
             else if (g_bench_signal == BENCH_SIGNAL_BLUE)
             {
                 m_bresult = bm.end();
-                dummyWork(); 
+                //dummyWork(); 
                 break;
             }
         }