transactd 3.5.0 → 3.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (83) hide show
  1. checksums.yaml +4 -4
  2. data/bin/common/{tdclc_32_3_5.dll → tdclc_32_3_6.dll} +0 -0
  3. data/bin/common/tdclc_64_3_6.dll +0 -0
  4. data/build/swig/ruby/tdclrb_wrap.cpp +12524 -24430
  5. data/build/swig/tdcl.i +5 -0
  6. data/build/tdclc/tdclc.cbproj +1 -1
  7. data/build/tdclc/tdclc.rc +4 -4
  8. data/build/tdclcpp/tdclcpp.rc +4 -4
  9. data/build/tdclcpp/tdclcpp_bc.cbproj +1 -1
  10. data/build/tdclrb/tdclrb.rc +4 -4
  11. data/source/bzs/db/engine/mysql/database.cpp +210 -184
  12. data/source/bzs/db/engine/mysql/database.h +276 -105
  13. data/source/bzs/db/engine/mysql/mysqlInternal.h +37 -0
  14. data/source/bzs/db/engine/mysql/mysqlProtocol.cpp +1 -0
  15. data/source/bzs/db/protocol/hs/hsCommandExecuter.cpp +4 -4
  16. data/source/bzs/db/protocol/tdap/client/activeTable.h +1 -1
  17. data/source/bzs/db/protocol/tdap/client/activeTableImple.h +1 -0
  18. data/source/bzs/db/protocol/tdap/client/connMgr.cpp +1 -1
  19. data/source/bzs/db/protocol/tdap/client/database.cpp +7 -4
  20. data/source/bzs/db/protocol/tdap/client/database.h +6 -1
  21. data/source/bzs/db/protocol/tdap/client/databaseManager.h +2 -2
  22. data/source/bzs/db/protocol/tdap/client/dbDef.cpp +21 -9
  23. data/source/bzs/db/protocol/tdap/client/dbDef.h +1 -1
  24. data/source/bzs/db/protocol/tdap/client/dllmain.cpp +10 -2
  25. data/source/bzs/db/protocol/tdap/client/field.cpp +29 -5
  26. data/source/bzs/db/protocol/tdap/client/field.h +3 -1
  27. data/source/bzs/db/protocol/tdap/client/fieldNameAlias.cpp +5 -0
  28. data/source/bzs/db/protocol/tdap/client/fieldNameAlias.h +1 -0
  29. data/source/bzs/db/protocol/tdap/client/fields.h +9 -2
  30. data/source/bzs/db/protocol/tdap/client/groupQuery.cpp +8 -4
  31. data/source/bzs/db/protocol/tdap/client/memRecord.cpp +18 -5
  32. data/source/bzs/db/protocol/tdap/client/memRecord.h +2 -2
  33. data/source/bzs/db/protocol/tdap/client/nsTable.cpp +46 -13
  34. data/source/bzs/db/protocol/tdap/client/nsTable.h +5 -0
  35. data/source/bzs/db/protocol/tdap/client/recordset.cpp +5 -0
  36. data/source/bzs/db/protocol/tdap/client/recordset.h +1 -0
  37. data/source/bzs/db/protocol/tdap/client/recordsetImple.h +6 -2
  38. data/source/bzs/db/protocol/tdap/client/request.h +46 -38
  39. data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp +2 -3
  40. data/source/bzs/db/protocol/tdap/client/stringConverter.h +29 -13
  41. data/source/bzs/db/protocol/tdap/client/table.cpp +60 -10
  42. data/source/bzs/db/protocol/tdap/client/table.h +4 -1
  43. data/source/bzs/db/protocol/tdap/client/trdboostapi.h +18 -1
  44. data/source/bzs/db/protocol/tdap/client/trdormapi.h +10 -4
  45. data/source/bzs/db/protocol/tdap/fieldComp.h +1 -1
  46. data/source/bzs/db/protocol/tdap/mysql/characterset.h +1 -0
  47. data/source/bzs/db/protocol/tdap/mysql/databaseSchema.cpp +11 -4
  48. data/source/bzs/db/protocol/tdap/mysql/databaseSchema.h +2 -1
  49. data/source/bzs/db/protocol/tdap/mysql/recordsetReader.h +52 -94
  50. data/source/bzs/db/protocol/tdap/mysql/request.h +20 -13
  51. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.cpp +92 -60
  52. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h +4 -4
  53. data/source/bzs/db/protocol/tdap/tdapRequest.h +11 -0
  54. data/source/bzs/db/protocol/tdap/tdapSchema.cpp +83 -34
  55. data/source/bzs/db/protocol/tdap/tdapSchema.h +5 -1
  56. data/source/bzs/db/protocol/tdap/tdapcapi.h +7 -3
  57. data/source/bzs/example/ormap_c.cpp +2 -2
  58. data/source/bzs/netsvc/server/serverPipe.cpp +35 -1
  59. data/source/bzs/test/tdclatl/test_v3.js +48 -1
  60. data/source/bzs/test/tdclphp/bench.php +89 -76
  61. data/source/bzs/test/tdclphp/transactd_Test.php +691 -687
  62. data/source/bzs/test/tdclphp/transactd_blob_Test.php +46 -43
  63. data/source/bzs/test/tdclphp/transactd_datetime_Test.php +46 -43
  64. data/source/bzs/test/tdclphp/transactd_kanjischema_Test.php +33 -33
  65. data/source/bzs/test/tdclphp/transactd_pool_Test.php +29 -25
  66. data/source/bzs/test/tdclphp/transactd_v3_Test.php +653 -183
  67. data/source/bzs/test/tdclrb/transactd_datetime_spec.rb +40 -4
  68. data/source/bzs/test/tdclrb/transactd_fetch_spec.rb +785 -0
  69. data/source/bzs/test/tdclrb/transactd_pool_spec.rb +21 -1
  70. data/source/bzs/test/tdclrb/transactd_setget_spec.rb +450 -0
  71. data/source/bzs/test/tdclrb/transactd_spec.rb +14 -2
  72. data/source/bzs/test/tdclrb/transactd_v3_spec.rb +1192 -11
  73. data/source/bzs/test/trdclengn/testField.h +522 -1
  74. data/source/bzs/test/trdclengn/test_tdclcpp_v3.cpp +37 -1
  75. data/source/bzs/test/trdclengn/test_trdclengn.cpp +62 -4
  76. data/source/global/tdclatl/RecordsetQuery.cpp +2 -1
  77. data/source/global/tdclatl/RecordsetQuery.h +1 -1
  78. data/source/global/tdclatl/Table.cpp +17 -0
  79. data/source/global/tdclatl/Table.h +3 -1
  80. data/source/global/tdclatl/tdclatl.idl +7 -2
  81. data/transactd.gemspec +1 -1
  82. metadata +7 -5
  83. data/bin/common/tdclc_64_3_5.dll +0 -0
@@ -1,6 +1,6 @@
1
1
  <?php
2
2
  /* ================================================================
3
- Copyright (C) 2014 BizStation Corp All rights reserved.
3
+ Copyright (C) 2014,2016 BizStation Corp All rights reserved.
4
4
 
5
5
  This program is free software; you can redistribute it and/or
6
6
  modify it under the terms of the GNU General Public License
@@ -13,14 +13,19 @@
13
13
  GNU General Public License for more details.
14
14
 
15
15
  You should have received a copy of the GNU General Public License
16
- along with this program; if not, write to the Free Software
17
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
16
+ along with this program; if not, write to the Free Software
17
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
18
18
  02111-1307, USA.
19
19
  ================================================================ */
20
- mb_internal_encoding('UTF-8');
21
20
 
22
- require_once("transactd.php");
23
- use BizStation\Transactd as Bz;
21
+ require("transactd.php");
22
+
23
+ use BizStation\Transactd\Transactd;
24
+ use BizStation\Transactd\Benchmark;
25
+ use BizStation\Transactd\Tabledef;
26
+ use BizStation\Transactd\Database;
27
+ use BizStation\Transactd\Table;
28
+
24
29
  define('TABLENAME', 'users');
25
30
  define('FDI_ID', 0);
26
31
  define('FDI_NAME', 1);
@@ -28,15 +33,16 @@ define('BULKBUFSIZE', 65535 - 1000);
28
33
  define('RECORD_COUNT', 20000);
29
34
  define('RECORD_UNIT', 20);
30
35
 
31
-
32
- function assertEquals($a, $b, $msg = '') {
36
+ function assertEquals($a, $b, $msg = '')
37
+ {
33
38
  if ($a !== $b) {
34
39
  echo("$a !== $b $msg");
35
40
  return false;
36
41
  }
37
42
  return true;
38
43
  }
39
- function assertNotEquals($a, $b, $msg = '') {
44
+ function assertNotEquals($a, $b, $msg = '')
45
+ {
40
46
  if ($a === $b) {
41
47
  echo("$a === $b $msg");
42
48
  return false;
@@ -44,11 +50,12 @@ function assertNotEquals($a, $b, $msg = '') {
44
50
  return true;
45
51
  }
46
52
 
47
- function create($URI) {
53
+ function create($URI)
54
+ {
48
55
  // create database
49
- $db = new Bz\database();
56
+ $db = new Database();
50
57
  $db->create($URI);
51
- if ($db->stat() == Bz\transactd::STATUS_TABLE_EXISTS_ERROR) {
58
+ if ($db->stat() == Transactd::STATUS_TABLE_EXISTS_ERROR) {
52
59
  $db->open($URI);
53
60
  assertEquals($db->stat(), 0);
54
61
  $db->drop();
@@ -56,20 +63,20 @@ function create($URI) {
56
63
  $db->create($URI);
57
64
  }
58
65
  assertEquals($db->stat(), 0);
59
- $db->open($URI, Bz\transactd::TYPE_SCHEMA_BDF, Bz\transactd::TD_OPEN_NORMAL);
66
+ $db->open($URI, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL);
60
67
  assertEquals($db->stat(), 0);
61
68
  // create table
62
69
  $dbdef = $db->dbDef();
63
- assertNotEquals($dbdef, NULL);
64
- $td = new Bz\tabledef();
70
+ assertNotEquals($dbdef, null);
71
+ $td = new Tabledef();
65
72
  // Set table schema codepage to UTF-8
66
73
  // - codepage for field NAME and tableNAME
67
- $td->schemaCodePage = Bz\transactd::CP_UTF8;
74
+ $td->schemaCodePage = Transactd::CP_UTF8;
68
75
  $td->setTableName(TABLENAME);
69
76
  $td->setFileName(TABLENAME . '.dat');
70
77
  // Set table default charaset index
71
78
  // - default charset for field VALUE
72
- $td->charsetIndex = Bz\transactd::charsetIndex(Bz\transactd::CP_UTF8);
79
+ $td->charsetIndex = Transactd::charsetIndex(Transactd::CP_UTF8);
73
80
  $td->id = 1;
74
81
  $td->pageSize = 2048;
75
82
  $dbdef->insertTable($td);
@@ -77,14 +84,14 @@ function create($URI) {
77
84
  // id
78
85
  $fd = $dbdef->insertField($td->id, FDI_ID);
79
86
  $fd->setName('id');
80
- $fd->type = Bz\transactd::ft_autoinc;
87
+ $fd->type = Transactd::ft_autoinc;
81
88
  $fd->len = 4;
82
89
  $dbdef->updateTableDef($td->id);
83
90
  assertEquals($dbdef->stat(), 0);
84
91
  // user_id
85
92
  $fd = $dbdef->insertField($td->id, FDI_NAME);
86
93
  $fd->setName('name');
87
- $fd->type = Bz\transactd::ft_myvarchar;
94
+ $fd->type = Transactd::ft_myvarchar;
88
95
  $fd->len = 100;
89
96
  $dbdef->updateTableDef($td->id);
90
97
  assertEquals($dbdef->stat(), 0);
@@ -98,11 +105,12 @@ function create($URI) {
98
105
  $dbdef->updateTableDef($td->id);
99
106
  assertEquals($dbdef->stat(), 0);
100
107
  // test open
101
- $tb = $db->openTable(TABLENAME);
108
+ $db->openTable(TABLENAME);
102
109
  assertEquals($db->stat(), 0);
103
110
  }
104
111
 
105
- function deleteAll($db, $tb) {
112
+ function deleteAll($db, $tb)
113
+ {
106
114
  $db->beginTrn();
107
115
  $tb->clearBuffer();
108
116
  for ($i = 1; $i <= RECORD_COUNT; $i++) {
@@ -120,20 +128,23 @@ function deleteAll($db, $tb) {
120
128
  return true;
121
129
  }
122
130
 
123
- function insert($db, $tb) {
131
+ function insert($tb)
132
+ {
124
133
  $tb->setKeyNum(0);
125
134
  $tb->clearBuffer();
126
135
  for ($i = 1; $i <= RECORD_COUNT; $i++) {
127
136
  $tb->setFV(FDI_ID, $i);
128
137
  $tb->setFV(FDI_NAME, $i);
129
138
  $tb->insert();
130
- if (!assertEquals($tb->stat(), 0, 'insert'))
139
+ if (!assertEquals($tb->stat(), 0, 'insert')) {
131
140
  return false;
141
+ }
132
142
  }
133
143
  return true;
134
144
  }
135
145
 
136
- function insertTransaction($db, $tb) {
146
+ function insertTransaction($db, $tb)
147
+ {
137
148
  $tb->setKeyNum(0);
138
149
  $start = 1;
139
150
  $tb->clearBuffer();
@@ -154,7 +165,8 @@ function insertTransaction($db, $tb) {
154
165
  return true;
155
166
  }
156
167
 
157
- function insertBulk($db, $tb) {
168
+ function insertBulk($tb)
169
+ {
158
170
  $tb->setKeyNum(0);
159
171
  $start = 1;
160
172
  $tb->clearBuffer();
@@ -175,14 +187,14 @@ function insertBulk($db, $tb) {
175
187
  return true;
176
188
  }
177
189
 
178
- function read($db, $tb) {
190
+ function read($tb)
191
+ {
179
192
  $tb->setKeyNum(0);
180
193
  $tb->clearBuffer();
181
194
  for ($i = 1; $i <= RECORD_COUNT; $i++) {
182
195
  $tb->setFV(FDI_ID, $i);
183
196
  $tb->seek();
184
- if (($tb->stat() !==0) || ($tb->getFVint(FDI_ID) !== $i))
185
- {
197
+ if (($tb->stat() !==0) || ($tb->getFVint(FDI_ID) !== $i)) {
186
198
  echo("seek stat = ".$tb->stat()." value ".$i." = ".$tb->getFVint(FDI_ID));
187
199
  return false;
188
200
  }
@@ -190,15 +202,15 @@ function read($db, $tb) {
190
202
  return true;
191
203
  }
192
204
 
193
- function readSnapshot($db, $tb) {
205
+ function readSnapshot($db, $tb)
206
+ {
194
207
  $tb->setKeyNum(0);
195
208
  $db->beginSnapshot();
196
209
  $tb->clearBuffer();
197
210
  for ($i = 1; $i <= RECORD_COUNT; $i++) {
198
211
  $tb->setFV(FDI_ID, $i);
199
212
  $tb->seek();
200
- if (($tb->stat() !==0) || ($tb->getFVint(FDI_ID) !== $i))
201
- {
213
+ if (($tb->stat() !==0) || ($tb->getFVint(FDI_ID) !== $i)) {
202
214
  echo("seek stat = ".$tb->stat()." value ".$i." = ".$tb->getFVint(FDI_ID));
203
215
  $db->endSnapshot();
204
216
  return false;
@@ -208,17 +220,17 @@ function readSnapshot($db, $tb) {
208
220
  return true;
209
221
  }
210
222
 
211
- function readRange($db, $tb) {
223
+ function readRange($tb)
224
+ {
212
225
  $start = 1;
213
226
  $tb->setKeyNum(0);
214
227
  $tb->clearBuffer();
215
228
  $tb->setFilter('*', 1, RECORD_UNIT);
216
229
  $tb->setFV(FDI_ID, $start);
217
- $tb->find(Bz\table::findForword);
230
+ $tb->find(Table::findForword);
218
231
  while ($start < RECORD_COUNT) {
219
232
  for ($i = $start; $i < $start + RECORD_UNIT; $i++) {
220
- if (/*($tb->stat() !==0) || */($tb->getFVint(FDI_ID) !== $i))
221
- {
233
+ if (/*($tb->stat() !==0) || */($tb->getFVint(FDI_ID) !== $i)) {
222
234
  echo("find stat = ".$tb->stat()." value ".$i." = ".$tb->getFVint(FDI_ID));
223
235
  return false;
224
236
  }
@@ -229,18 +241,18 @@ function readRange($db, $tb) {
229
241
  return true;
230
242
  }
231
243
 
232
- function readRangeSnapshot($db, $tb) {
244
+ function readRangeSnapshot($db, $tb)
245
+ {
233
246
  $start = 1;
234
247
  $tb->setKeyNum(0);
235
248
  $tb->clearBuffer();
236
249
  $tb->setFilter('*', 1, RECORD_UNIT);
237
250
  $tb->setFV(FDI_ID, $start);
238
251
  $db->beginSnapshot();
239
- $tb->find(Bz\table::findForword);
252
+ $tb->find(Table::findForword);
240
253
  while ($start < RECORD_COUNT) {
241
254
  for ($i = $start; $i < $start + RECORD_UNIT; $i++) {
242
- if (/*($tb->stat() !==0) || */($tb->getFVint(FDI_ID) !== $i))
243
- {
255
+ if (/*($tb->stat() !==0) || */($tb->getFVint(FDI_ID) !== $i)) {
244
256
  echo("find stat = ".$tb->stat()." value ".$i." = ".$tb->getFVint(FDI_ID));
245
257
  $db->endSnapshot();
246
258
  return false;
@@ -253,15 +265,15 @@ function readRangeSnapshot($db, $tb) {
253
265
  return true;
254
266
  }
255
267
 
256
- function update($db, $tb) {
268
+ function update($tb)
269
+ {
257
270
  $tb->setKeyNum(0);
258
271
  $tb->clearBuffer();
259
272
  for ($i = 1; $i <= RECORD_COUNT; $i++) {
260
273
  $tb->setFV(FDI_ID, $i);
261
274
  $tb->setFV(FDI_NAME, ($i + 1));
262
- $tb->update(Bz\table::changeInKey);
263
- if ($tb->stat() !==0)
264
- {
275
+ $tb->update(Table::changeInKey);
276
+ if ($tb->stat() !==0) {
265
277
  echo("update stat = ".$tb->stat());
266
278
  return false;
267
279
  }
@@ -269,7 +281,8 @@ function update($db, $tb) {
269
281
  return true;
270
282
  }
271
283
 
272
- function updateTransaction($db, $tb) {
284
+ function updateTransaction($db, $tb)
285
+ {
273
286
  $tb->setKeyNum(0);
274
287
  $start = 1;
275
288
  $tb->clearBuffer();
@@ -278,9 +291,8 @@ function updateTransaction($db, $tb) {
278
291
  for ($i = $start; $i < $start + RECORD_UNIT; $i++) {
279
292
  $tb->setFV(FDI_ID, $i);
280
293
  $tb->setFV(FDI_NAME, ($i + 2));
281
- $tb->update(Bz\table::changeInKey);
282
- if ($tb->stat() !==0)
283
- {
294
+ $tb->update(Table::changeInKey);
295
+ if ($tb->stat() !==0) {
284
296
  echo("update stat = ".$tb->stat());
285
297
  $db->abortTrn();
286
298
  return false;
@@ -292,8 +304,9 @@ function updateTransaction($db, $tb) {
292
304
  return true;
293
305
  }
294
306
 
295
- function main($argc, $argv) {
296
- if ($argc < 4) {
307
+ function main($argc, $argv)
308
+ {
309
+ if ($argc < 4) {
297
310
  echo("usage: php bench.php databaseUri processNumber functionNumber\n");
298
311
  echo("\t --- functionNumber list ---\n");
299
312
  echo("\t-1: all function\n");
@@ -308,11 +321,11 @@ function main($argc, $argv) {
308
321
  echo("\t 8: update in transaction. 20rec x 1000times\n");
309
322
  echo("example : php bench.php \"tdap://localhost/test?dbfile=test.bdf\" 0 -1\n");
310
323
  return;
311
- }
324
+ }
312
325
 
313
326
  $URI = $argv[1];
314
327
  // Currenty $proc is ignored.
315
- $proc = (int)$argv[2];
328
+ //$proc = (int)$argv[2];
316
329
  $funcNum = (int)$argv[3];
317
330
 
318
331
  create($URI);
@@ -322,61 +335,61 @@ function main($argc, $argv) {
322
335
  echo($URI."\n");
323
336
  echo("----------------------------------------\n");
324
337
 
325
- $db = new Bz\database();
326
- $db->open($URI, Bz\transactd::TYPE_SCHEMA_BDF, Bz\transactd::TD_OPEN_NORMAL);
338
+ $db = new Database();
339
+ $db->open($URI, Transactd::TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL);
327
340
  assertEquals($db->stat(), 0);
328
341
  $tb = $db->openTable(TABLENAME);
329
342
  assertEquals($db->stat(), 0);
330
343
 
331
344
  if (($funcNum === -1) || ($funcNum === 0)) {
332
345
  deleteAll($db, $tb);
333
- Bz\benchmark::start();
334
- $ret = insert($db, $tb);
335
- Bz\benchmark::showTimeSec($ret, ': insert ' . RECORD_COUNT);
346
+ Benchmark::start();
347
+ $ret = insert($tb);
348
+ Benchmark::showTimeSec($ret, ': insert ' . RECORD_COUNT);
336
349
  }
337
350
 
338
351
  if (($funcNum === -1) || ($funcNum === 1)) {
339
352
  deleteAll($db, $tb);
340
- Bz\benchmark::start();
353
+ Benchmark::start();
341
354
  $ret = insertTransaction($db, $tb);
342
- Bz\benchmark::showTimeSec($ret, ': insertTransaction ' . RECORD_COUNT . ' with transaction per ' . RECORD_UNIT);
355
+ Benchmark::showTimeSec($ret, ': insertTransaction ' . RECORD_COUNT . ' with transaction per ' . RECORD_UNIT);
343
356
  }
344
357
 
345
358
  if (($funcNum === -1) || ($funcNum === 2)) {
346
359
  deleteAll($db, $tb);
347
- Bz\benchmark::start();
348
- $ret = insertBulk($db, $tb);
349
- Bz\benchmark::showTimeSec($ret, ': insertBulk ' . RECORD_COUNT . ' with bulkmode per ' . RECORD_UNIT);
360
+ Benchmark::start();
361
+ $ret = insertBulk($tb);
362
+ Benchmark::showTimeSec($ret, ': insertBulk ' . RECORD_COUNT . ' with bulkmode per ' . RECORD_UNIT);
350
363
  }
351
364
  if (($funcNum === -1) || ($funcNum === 3)) {
352
- Bz\benchmark::start();
353
- $ret = read($db, $tb);
354
- Bz\benchmark::showTimeSec($ret, ': read ' . RECORD_COUNT);
365
+ Benchmark::start();
366
+ $ret = read($tb);
367
+ Benchmark::showTimeSec($ret, ': read ' . RECORD_COUNT);
355
368
  }
356
369
  if (($funcNum === -1) || ($funcNum === 4)) {
357
- Bz\benchmark::start();
370
+ Benchmark::start();
358
371
  $ret = readSnapshot($db, $tb);
359
- Bz\benchmark::showTimeSec($ret, ': read with snapshot ' . RECORD_COUNT);
372
+ Benchmark::showTimeSec($ret, ': read with snapshot ' . RECORD_COUNT);
360
373
  }
361
374
  if (($funcNum === -1) || ($funcNum === 5)) {
362
- Bz\benchmark::start();
363
- $ret = readRange($db, $tb);
364
- Bz\benchmark::showTimeSec($ret, ': read ' . RECORD_COUNT . ' with range per ' . RECORD_UNIT);
375
+ Benchmark::start();
376
+ $ret = readRange($tb);
377
+ Benchmark::showTimeSec($ret, ': read ' . RECORD_COUNT . ' with range per ' . RECORD_UNIT);
365
378
  }
366
379
  if (($funcNum === -1) || ($funcNum === 6)) {
367
- Bz\benchmark::start();
380
+ Benchmark::start();
368
381
  $ret = readRangeSnapshot($db, $tb);
369
- Bz\benchmark::showTimeSec($ret, ': read ' . RECORD_COUNT . ' with snapshot and range per ' . RECORD_UNIT);
382
+ Benchmark::showTimeSec($ret, ': read ' . RECORD_COUNT . ' with snapshot and range per ' . RECORD_UNIT);
370
383
  }
371
384
  if (($funcNum === -1) || ($funcNum === 7)) {
372
- Bz\benchmark::start();
373
- $ret = update($db, $tb);
374
- Bz\benchmark::showTimeSec($ret, ': update ' . RECORD_COUNT);
385
+ Benchmark::start();
386
+ $ret = update($tb);
387
+ Benchmark::showTimeSec($ret, ': update ' . RECORD_COUNT);
375
388
  }
376
389
  if (($funcNum === -1) || ($funcNum === 8)) {
377
- Bz\benchmark::start();
390
+ Benchmark::start();
378
391
  $ret = updateTransaction($db, $tb);
379
- Bz\benchmark::showTimeSec($ret, ': updateTransaction ' . RECORD_COUNT . ' with transaction per ' . RECORD_UNIT);
392
+ Benchmark::showTimeSec($ret, ': updateTransaction ' . RECORD_COUNT . ' with transaction per ' . RECORD_UNIT);
380
393
  }
381
394
  }
382
395
  main($argc, $argv);