transactd 1.2.0 → 2.0.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 (306) hide show
  1. checksums.yaml +4 -4
  2. data/BUILD_UNIX-JA +46 -67
  3. data/BUILD_WIN-JA +106 -63
  4. data/CMakeLists.txt +40 -15
  5. data/README +219 -75
  6. data/README-JA +207 -76
  7. data/README_ORMSRCGEN +118 -0
  8. data/README_ORMSRCGEN-JA +115 -0
  9. data/bin/common/tdclc_32_2_0.dll +0 -0
  10. data/bin/common/tdclc_64_2_0.dll +0 -0
  11. data/build/common/check_for_link_iconv.cmake +18 -14
  12. data/build/common/create_symlink.cmake.in +25 -0
  13. data/build/common/get_boost_libs.cmake +23 -23
  14. data/build/common/options.cmake +0 -66
  15. data/build/common/smart_install.cmake +3 -3
  16. data/build/common/transactd.rc.in +15 -5
  17. data/build/common/transactd_cl_common.cmake +37 -18
  18. data/build/common/transactd_cl_output.cmake +55 -13
  19. data/build/common/transactd_common.cmake +108 -31
  20. data/build/swig/php/generate.cmake.in +15 -17
  21. data/build/swig/php/generate.cmd.in +15 -9
  22. data/build/swig/php/php.swg +124 -82
  23. data/build/swig/php/transactd.no_yield.php +4494 -0
  24. data/build/swig/php/transactd.no_yield.php.git.patch +685 -0
  25. data/build/swig/php/transactd.no_yield.php.patch +685 -0
  26. data/build/swig/php/transactd.yield.php +4461 -0
  27. data/build/swig/php/transactd.yield.php.git.patch +652 -0
  28. data/build/swig/php/transactd.yield.php.patch +652 -0
  29. data/build/swig/referencecounter.h +79 -0
  30. data/build/swig/ruby/ruby.swg +226 -76
  31. data/build/swig/ruby/threadBlockRegionWrapper.h +71 -0
  32. data/build/swig/ruby/without_gvl.swg +87 -0
  33. data/build/swig/tdcl.i +659 -170
  34. data/build/swig/validatablepointer.h +91 -0
  35. data/build/tdclc/CMakeLists.txt +49 -34
  36. data/build/tdclc/{tdclc_64.cbproj → tdclc.cbproj} +65 -20
  37. data/build/tdclc/tdclc.rc +0 -0
  38. data/build/tdclcpp/CMakeLists.txt +84 -20
  39. data/build/tdclcpp/tdclcpp.rc +0 -0
  40. data/build/tdclcpp/{tdclcpp_bcb_64.cbproj → tdclcpp_bc.cbproj} +168 -44
  41. data/build/tdclrb/CMakeLists.txt +84 -66
  42. data/build/tdclrb/bldgem/extconf.rb +28 -3
  43. data/build/tdclrb/gem/helper.rb +11 -1
  44. data/build/tdclrb/gem_output.cmake +20 -16
  45. data/index_ja.html +15 -0
  46. data/source/bzs/db/IBlobBuffer.h +15 -17
  47. data/source/bzs/db/blobBuffer.h +186 -140
  48. data/source/bzs/db/blobStructs.h +37 -37
  49. data/source/bzs/db/engine/mysql/IReadRecords.h +34 -34
  50. data/source/bzs/db/engine/mysql/bookmark.h +150 -147
  51. data/source/bzs/db/engine/mysql/database.cpp +1721 -1526
  52. data/source/bzs/db/engine/mysql/database.h +608 -370
  53. data/source/bzs/db/engine/mysql/dbManager.cpp +213 -201
  54. data/source/bzs/db/engine/mysql/dbManager.h +115 -104
  55. data/source/bzs/db/engine/mysql/errorMessage.cpp +49 -50
  56. data/source/bzs/db/engine/mysql/errorMessage.h +25 -26
  57. data/source/bzs/db/engine/mysql/fieldAccess.h +55 -61
  58. data/source/bzs/db/engine/mysql/mydebuglog.cpp +326 -292
  59. data/source/bzs/db/engine/mysql/mydebuglog.h +63 -55
  60. data/source/bzs/db/engine/mysql/mysqlInternal.h +182 -125
  61. data/source/bzs/db/engine/mysql/mysqlThd.cpp +121 -121
  62. data/source/bzs/db/engine/mysql/mysqlThd.h +20 -20
  63. data/source/bzs/db/engine/mysql/percentageKey.h +241 -228
  64. data/source/bzs/db/protocol/ICommandExecuter.h +18 -17
  65. data/source/bzs/db/protocol/hs/hsCommandExecuter.cpp +543 -514
  66. data/source/bzs/db/protocol/hs/hsCommandExecuter.h +155 -158
  67. data/source/bzs/db/protocol/tdap/btrDate.cpp +213 -180
  68. data/source/bzs/db/protocol/tdap/btrDate.h +39 -37
  69. data/source/bzs/db/protocol/tdap/client/activeTable.cpp +173 -0
  70. data/source/bzs/db/protocol/tdap/client/activeTable.h +165 -0
  71. data/source/bzs/db/protocol/tdap/client/activeTableImple.h +370 -0
  72. data/source/bzs/db/protocol/tdap/client/bulkInsert.h +13 -23
  73. data/source/bzs/db/protocol/tdap/client/client.cpp +81 -68
  74. data/source/bzs/db/protocol/tdap/client/client.h +361 -320
  75. data/source/bzs/db/protocol/tdap/client/connMgr.cpp +17 -22
  76. data/source/bzs/db/protocol/tdap/client/connMgr.h +17 -19
  77. data/source/bzs/db/protocol/tdap/client/connectionPool.cpp +243 -0
  78. data/source/bzs/db/protocol/tdap/client/connectionPool.h +109 -0
  79. data/source/bzs/db/protocol/tdap/client/database.cpp +327 -219
  80. data/source/bzs/db/protocol/tdap/client/database.h +141 -118
  81. data/source/bzs/db/protocol/tdap/client/databaseFactory.cpp +60 -62
  82. data/source/bzs/db/protocol/tdap/client/databaseManager.h +255 -0
  83. data/source/bzs/db/protocol/tdap/client/dbDef.cpp +315 -202
  84. data/source/bzs/db/protocol/tdap/client/dbDef.h +40 -32
  85. data/source/bzs/db/protocol/tdap/client/dllmain.cpp +390 -371
  86. data/source/bzs/db/protocol/tdap/client/errorMessage.cpp +148 -56
  87. data/source/bzs/db/protocol/tdap/client/errorMessage_ja.cpp +149 -57
  88. data/source/bzs/db/protocol/tdap/client/export.h +35 -0
  89. data/source/bzs/db/protocol/tdap/client/field.cpp +1985 -0
  90. data/source/bzs/db/protocol/tdap/client/field.h +393 -0
  91. data/source/bzs/db/protocol/tdap/client/fieldDDF.cpp +14 -14
  92. data/source/bzs/db/protocol/tdap/client/fieldDDF.h +11 -14
  93. data/source/bzs/db/protocol/tdap/client/fieldNameAlias.cpp +123 -0
  94. data/source/bzs/db/protocol/tdap/client/fieldNameAlias.h +58 -0
  95. data/source/bzs/db/protocol/tdap/client/fields.h +178 -0
  96. data/source/bzs/db/protocol/tdap/client/fileDDF.cpp +13 -16
  97. data/source/bzs/db/protocol/tdap/client/fileDDF.h +11 -17
  98. data/source/bzs/db/protocol/tdap/client/filter.h +423 -259
  99. data/source/bzs/db/protocol/tdap/client/groupComp.h +117 -0
  100. data/source/bzs/db/protocol/tdap/client/groupQuery.cpp +818 -0
  101. data/source/bzs/db/protocol/tdap/client/groupQuery.h +281 -0
  102. data/source/bzs/db/protocol/tdap/client/indexDDF.cpp +14 -17
  103. data/source/bzs/db/protocol/tdap/client/indexDDF.h +11 -14
  104. data/source/bzs/db/protocol/tdap/client/memRecord.cpp +231 -0
  105. data/source/bzs/db/protocol/tdap/client/memRecord.h +145 -0
  106. data/source/bzs/db/protocol/tdap/client/memRecordset.cpp +448 -0
  107. data/source/bzs/db/protocol/tdap/client/memRecordset.h +159 -0
  108. data/source/bzs/db/protocol/tdap/client/nsDatabase.cpp +300 -173
  109. data/source/bzs/db/protocol/tdap/client/nsDatabase.h +53 -36
  110. data/source/bzs/db/protocol/tdap/client/nsTable.cpp +171 -128
  111. data/source/bzs/db/protocol/tdap/client/nsTable.h +121 -87
  112. data/source/bzs/db/protocol/tdap/client/pooledDatabaseManager.h +173 -0
  113. data/source/bzs/db/protocol/tdap/client/recordset.cpp +209 -0
  114. data/source/bzs/db/protocol/tdap/client/recordset.h +86 -0
  115. data/source/bzs/db/protocol/tdap/client/recordsetImple.h +596 -0
  116. data/source/bzs/db/protocol/tdap/client/request.h +227 -170
  117. data/source/bzs/db/protocol/tdap/client/serializer.cpp +1288 -0
  118. data/source/bzs/db/protocol/tdap/client/serializer.h +295 -0
  119. data/source/bzs/db/protocol/tdap/client/sharedData.cpp +9 -12
  120. data/source/bzs/db/protocol/tdap/client/sharedData.h +18 -16
  121. data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp +494 -473
  122. data/source/bzs/db/protocol/tdap/client/sqlBuilder.h +51 -53
  123. data/source/bzs/db/protocol/tdap/client/stringConverter.h +214 -148
  124. data/source/bzs/db/protocol/tdap/client/table.cpp +929 -1665
  125. data/source/bzs/db/protocol/tdap/client/table.h +413 -87
  126. data/source/bzs/db/protocol/tdap/client/trdboostapi.h +642 -534
  127. data/source/bzs/db/protocol/tdap/client/trdboostapiInternal.h +25 -40
  128. data/source/bzs/db/protocol/tdap/client/trdclcppautolink.h +11 -15
  129. data/source/bzs/db/protocol/tdap/client/trdormapi.h +378 -437
  130. data/source/bzs/db/protocol/tdap/client/trnsctcl.def +1 -1
  131. data/source/bzs/db/protocol/tdap/fieldComp.h +127 -0
  132. data/source/bzs/db/protocol/tdap/myDateTime.cpp +352 -345
  133. data/source/bzs/db/protocol/tdap/mysql/characterset.cpp +75 -78
  134. data/source/bzs/db/protocol/tdap/mysql/characterset.h +18 -19
  135. data/source/bzs/db/protocol/tdap/mysql/databaseSchema.cpp +216 -199
  136. data/source/bzs/db/protocol/tdap/mysql/databaseSchema.h +23 -14
  137. data/source/bzs/db/protocol/tdap/mysql/debuglog.cpp +354 -314
  138. data/source/bzs/db/protocol/tdap/mysql/debuglog.h +57 -47
  139. data/source/bzs/db/protocol/tdap/mysql/recordsetReader.h +905 -739
  140. data/source/bzs/db/protocol/tdap/mysql/request.h +152 -159
  141. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.cpp +1044 -879
  142. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h +87 -81
  143. data/source/bzs/db/protocol/tdap/tdapRequest.h +162 -130
  144. data/source/bzs/db/protocol/tdap/tdapSchema.cpp +368 -166
  145. data/source/bzs/db/protocol/tdap/tdapSchema.h +702 -566
  146. data/source/bzs/db/protocol/tdap/tdapcapi.h +387 -353
  147. data/source/bzs/db/transactd/appBuilderImple.h +21 -20
  148. data/source/bzs/db/transactd/appModule.cpp +350 -98
  149. data/source/bzs/db/transactd/appModule.h +31 -37
  150. data/source/bzs/db/transactd/connManager.cpp +138 -135
  151. data/source/bzs/db/transactd/connManager.h +28 -21
  152. data/source/bzs/db/transactd/connectionRecord.h +39 -39
  153. data/source/bzs/db/transactd/transactd.cpp +217 -203
  154. data/source/bzs/env/boost_bcb_link.h +131 -0
  155. data/source/bzs/env/compiler.h +136 -79
  156. data/source/bzs/env/crosscompile.cpp +57 -57
  157. data/source/bzs/env/crosscompile.h +130 -115
  158. data/source/bzs/env/fileopen.h +7 -8
  159. data/source/bzs/env/mbcswchrLinux.cpp +4 -9
  160. data/source/bzs/env/mbcswchrLinux.h +37 -34
  161. data/source/bzs/env/tcharMinGW.h +59 -0
  162. data/source/bzs/env/tstring.h +90 -95
  163. data/source/bzs/example/changeSchema.cpp +22 -23
  164. data/source/bzs/example/changeSchema_c.cpp +22 -24
  165. data/source/bzs/example/connection_pool_c.cpp +49 -104
  166. data/source/bzs/example/createDatabase.cpp +40 -47
  167. data/source/bzs/example/createDatabase_c.cpp +38 -43
  168. data/source/bzs/example/deleteRecords.cpp +10 -15
  169. data/source/bzs/example/deleteRecords_c.cpp +10 -14
  170. data/source/bzs/example/dropDatabase.cpp +3 -9
  171. data/source/bzs/example/dropDatabase_c.cpp +5 -6
  172. data/source/bzs/example/insertRecords.cpp +37 -29
  173. data/source/bzs/example/insertRecords_c.cpp +19 -25
  174. data/source/bzs/example/ormap_c.cpp +621 -0
  175. data/source/bzs/example/queryData.cpp +371 -0
  176. data/source/bzs/example/queryData.h +16 -0
  177. data/source/bzs/example/query_c.cpp +109 -0
  178. data/source/bzs/example/readRecords.cpp +27 -27
  179. data/source/bzs/example/readRecords_c.cpp +25 -23
  180. data/source/bzs/example/updateRecords.cpp +16 -21
  181. data/source/bzs/example/updateRecords_c.cpp +8 -12
  182. data/source/bzs/example/update_with_transaction.cpp +21 -24
  183. data/source/bzs/example/update_with_transaction_c.cpp +12 -15
  184. data/source/bzs/example/useORMRecord.cpp +177 -0
  185. data/source/bzs/netsvc/client/tcpClient.cpp +167 -156
  186. data/source/bzs/netsvc/client/tcpClient.h +541 -489
  187. data/source/bzs/netsvc/server/IAppModule.h +119 -32
  188. data/source/bzs/netsvc/server/iserver.h +21 -23
  189. data/source/bzs/netsvc/server/serverCpt.cpp +421 -391
  190. data/source/bzs/netsvc/server/serverCpt.h +41 -43
  191. data/source/bzs/netsvc/server/serverPipe.cpp +580 -565
  192. data/source/bzs/netsvc/server/serverPipe.h +44 -45
  193. data/source/bzs/netsvc/server/serverTpool.cpp +333 -303
  194. data/source/bzs/netsvc/server/serverTpool.h +38 -43
  195. data/source/bzs/rtl/benchmark.cpp +91 -31
  196. data/source/bzs/rtl/benchmark.h +76 -22
  197. data/source/bzs/rtl/datetime.cpp +231 -233
  198. data/source/bzs/rtl/datetime.h +16 -16
  199. data/source/bzs/rtl/debuglog.cpp +48 -51
  200. data/source/bzs/rtl/debuglog.h +55 -44
  201. data/source/bzs/rtl/exception.h +55 -48
  202. data/source/bzs/rtl/stl_uty.cpp +27 -28
  203. data/source/bzs/rtl/stl_uty.h +28 -29
  204. data/source/bzs/rtl/stringBuffers.cpp +8 -6
  205. data/source/bzs/rtl/stringBuffers.h +16 -9
  206. data/source/bzs/rtl/strtrim.cpp +90 -91
  207. data/source/bzs/rtl/strtrim.h +14 -16
  208. data/source/bzs/test/tdclatl/bench_query_atl.js +647 -0
  209. data/source/bzs/test/tdclatl/bench_tdclatl.js +303 -303
  210. data/source/bzs/test/tdclatl/test_query_atl.js +669 -0
  211. data/source/bzs/test/tdclphp/bench.php +357 -0
  212. data/source/bzs/test/tdclphp/transactd_Test.php +907 -303
  213. data/source/bzs/test/tdclphp/transactd_blob_Test.php +21 -49
  214. data/source/bzs/test/tdclphp/transactd_datetime_Test.php +41 -75
  215. data/source/bzs/test/tdclphp/transactd_kanjischema_Test.php +23 -37
  216. data/source/bzs/test/tdclphp/transactd_pool_Test.php +120 -0
  217. data/source/bzs/test/tdclrb/bench_tdclcpp.rb +4 -6
  218. data/source/bzs/test/tdclrb/prepare.rb +15 -12
  219. data/source/bzs/test/tdclrb/transactd_blob_spec.rb +29 -32
  220. data/source/bzs/test/tdclrb/transactd_datetime_spec.rb +0 -29
  221. data/source/bzs/test/tdclrb/transactd_kanjischema_spec.rb +18 -19
  222. data/source/bzs/test/tdclrb/transactd_pool_spec.rb +107 -0
  223. data/source/bzs/test/tdclrb/transactd_spec.rb +734 -142
  224. data/source/bzs/test/transactdBench/query_bench.cpp +156 -0
  225. data/source/bzs/test/transactdBench/scaling_bench.cpp +265 -0
  226. data/source/bzs/test/transactdBench/transactdBench.cpp +107 -83
  227. data/source/bzs/test/transactdBench/transactdBench2.cpp +122 -83
  228. data/source/bzs/test/transactdBench/workerBase.cpp +5 -0
  229. data/source/bzs/test/transactdBench/workerBase.h +88 -0
  230. data/source/bzs/test/transactdBench/workerMySQLImple.h +333 -0
  231. data/source/bzs/test/transactdBench/workerTransactdImple.h +201 -0
  232. data/source/bzs/test/trdclengn/test_blob.cpp +121 -73
  233. data/source/bzs/test/trdclengn/test_trdclengn.cpp +1244 -426
  234. data/source/global/ormsrcgen/confParam.h +80 -0
  235. data/source/global/ormsrcgen/fieldName.cpp +77 -0
  236. data/source/global/ormsrcgen/fieldName.h +43 -0
  237. data/source/global/ormsrcgen/main.cpp +196 -0
  238. data/source/global/ormsrcgen/srcgen.cpp +763 -0
  239. data/source/global/ormsrcgen/srcgen.h +72 -0
  240. data/source/global/ormsrcgen/template/fieldNameList_sample.txt +2 -0
  241. data/source/global/ormsrcgen/template/ormDataClass_template.cpp +48 -0
  242. data/source/global/ormsrcgen/template/ormDataClass_template.h +34 -0
  243. data/source/global/ormsrcgen/template/ormMapClass_template.cpp +51 -0
  244. data/source/global/ormsrcgen/template/ormMapClass_template.h +62 -0
  245. data/source/global/ormsrcgen/template/template.cnf +38 -0
  246. data/source/global/querystmts/querystmts.cpp +237 -0
  247. data/source/global/tdclatl/ConnectParams.cpp +77 -0
  248. data/source/global/tdclatl/ConnectParams.h +70 -0
  249. data/source/global/tdclatl/Database.cpp +132 -128
  250. data/source/global/tdclatl/Database.h +60 -49
  251. data/source/global/tdclatl/DbDef.cpp +68 -64
  252. data/source/global/tdclatl/DbDef.h +36 -36
  253. data/source/global/tdclatl/Field.cpp +12 -17
  254. data/source/global/tdclatl/Field.h +15 -12
  255. data/source/global/tdclatl/FieldDef.cpp +75 -36
  256. data/source/global/tdclatl/FieldDef.h +38 -19
  257. data/source/global/tdclatl/FieldDefs.cpp +74 -0
  258. data/source/global/tdclatl/FieldDefs.h +56 -0
  259. data/source/global/tdclatl/FieldNames.cpp +99 -0
  260. data/source/global/tdclatl/FieldNames.h +66 -0
  261. data/source/global/tdclatl/Flags.cpp +75 -37
  262. data/source/global/tdclatl/Flags.h +13 -12
  263. data/source/global/tdclatl/GroupQuery.cpp +119 -0
  264. data/source/global/tdclatl/GroupQuery.h +65 -0
  265. data/source/global/tdclatl/KeyDef.cpp +15 -14
  266. data/source/global/tdclatl/KeyDef.h +20 -17
  267. data/source/global/tdclatl/KeySegment.cpp +13 -12
  268. data/source/global/tdclatl/PooledDbManager.cpp +223 -0
  269. data/source/global/tdclatl/PooledDbManager.h +76 -0
  270. data/source/global/tdclatl/QueryBase.cpp +206 -127
  271. data/source/global/tdclatl/QueryBase.h +55 -59
  272. data/source/global/tdclatl/Record.cpp +214 -0
  273. data/source/global/tdclatl/Record.h +96 -0
  274. data/source/global/tdclatl/Recordset.cpp +278 -0
  275. data/source/global/tdclatl/Recordset.h +83 -0
  276. data/source/global/tdclatl/RecordsetQuery.cpp +118 -0
  277. data/source/global/tdclatl/RecordsetQuery.h +126 -0
  278. data/source/global/tdclatl/Table.cpp +57 -60
  279. data/source/global/tdclatl/Table.h +32 -29
  280. data/source/global/tdclatl/TableDef.cpp +63 -62
  281. data/source/global/tdclatl/TableDef.h +20 -22
  282. data/source/global/tdclatl/TdVersion.cpp +3 -3
  283. data/source/global/tdclatl/TdVersion.h +15 -11
  284. data/source/global/tdclatl/_IDatabaseEvents_CP.h +99 -92
  285. data/source/global/tdclatl/activeTable.cpp +355 -0
  286. data/source/global/tdclatl/activeTable.h +79 -0
  287. data/source/global/tdclatl/dllmain.cpp +4 -3
  288. data/source/global/tdclatl/dllmain.h +7 -6
  289. data/source/global/tdclatl/keySegment.h +22 -18
  290. data/source/global/tdclatl/resource.h +0 -0
  291. data/source/global/tdclatl/stdafx.h +6 -4
  292. data/source/global/tdclatl/targetver.h +0 -1
  293. data/source/global/tdclatl/tdclatl.cpp +10 -5
  294. data/source/global/tdclatl/tdclatl.idl +530 -14
  295. data/source/linux/charsetConvert.h +78 -79
  296. data/source/linux/linuxTypes.h +9 -12
  297. data/source/linux/tchar.h +168 -166
  298. data/transactd.gemspec +24 -16
  299. metadata +98 -12
  300. data/bin/common/tdclc_32_1_2.dll +0 -0
  301. data/bin/common/tdclc_64_1_2.dll +0 -0
  302. data/build/tdclc/tdclc_32.cbproj +0 -173
  303. data/build/tdclcpp/tdclcpp_bcb_32.cbproj +0 -232
  304. data/build/tdclrb/GEM_VERSION +0 -3
  305. data/source/bzs/db/protocol/tdap/client/filter.cpp +0 -43
  306. data/source/bzs/example/useORM.cpp +0 -585
@@ -1,21 +1,21 @@
1
- /*=================================================================
2
- Copyright (C) 2012 2013 BizStation Corp All rights reserved.
1
+ /* =================================================================
2
+ Copyright (C) 2012 2013 BizStation Corp All rights reserved.
3
3
 
4
- This program is free software; you can redistribute it and/or
5
- modify it under the terms of the GNU General Public License
6
- as published by the Free Software Foundation; either version 2
7
- of the License, or (at your option) any later version.
4
+ This program is free software; you can redistribute it and/or
5
+ modify it under the terms of the GNU General Public License
6
+ as published by the Free Software Foundation; either version 2
7
+ of the License, or (at your option) any later version.
8
8
 
9
- This program is distributed in the hope that it will be useful,
10
- but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
- GNU General Public License for more details.
9
+ This program is distributed in the hope that it will be useful,
10
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+ GNU General Public License for more details.
13
13
 
14
- You should have received a copy of the GNU General Public License
15
- along with this program; if not, write to the Free Software
16
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
17
- 02111-1307, USA.
18
- =================================================================*/
14
+ You should have received a copy of the GNU General Public License
15
+ along with this program; if not, write to the Free Software
16
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
17
+ 02111-1307, USA.
18
+ ================================================================= */
19
19
 
20
20
  #include "mydebuglog.h"
21
21
  #include "dbManager.h"
@@ -26,24 +26,24 @@
26
26
  using namespace bzs::db::protocol::tdap::mysql;
27
27
 
28
28
  #ifdef DEBUG_LOG
29
- bzs::db::engine::mysql::debugdb dbg;
29
+ bzs::db::engine::mysql::debugdb dbg;
30
30
  #endif
31
31
 
32
-
33
32
  void bzs::rtl::debuglog::init()
34
33
  {
35
- #ifdef DEBUG_LOG
36
- bzs::rtl::debuglog::regist(&dbg);
37
- #endif
38
- fn_format(logfilename, "transctd_debug","",".log",MY_REPLACE_EXT|MY_UNPACK_FILENAME);
34
+ #ifdef DEBUG_LOG
35
+ bzs::rtl::debuglog::regist(&dbg);
36
+ #endif
37
+ fn_format(logfilename, "transctd_debug", "", ".log",
38
+ MY_REPLACE_EXT | MY_UNPACK_FILENAME);
39
39
 
40
- FILE* fp = fileOpen(logfilename, "w");
41
- if (fp)
42
- {
43
- fputs(dateTime(), fp);
44
- fputs("Transctd debug Start\n", fp);
45
- fclose(fp);
46
- }
40
+ FILE* fp = fileOpen(logfilename, "w");
41
+ if (fp)
42
+ {
43
+ fputs(dateTime(), fp);
44
+ fputs("Transctd debug Start\n", fp);
45
+ fclose(fp);
46
+ }
47
47
  }
48
48
 
49
49
  namespace bzs
@@ -59,291 +59,325 @@ char msg[1024];
59
59
 
60
60
  void debugdb::stop()
61
61
  {
62
- bzs::rtl::debuglog::write("Transctd debug End");
62
+ bzs::rtl::debuglog::write("Transctd debug End");
63
63
  }
64
64
 
65
- void debugdb::write(ushort_td op, request& req, bool error)
65
+ void debugdb::write(ushort_td op, request& req, bool error)
66
66
  {
67
- bool writeflag = false;
67
+ bool writeflag = false;
68
68
 
69
- switch(op)
70
- {
71
- case TD_RESET_CLIENT:
72
- {
73
- std::string dbname = getDatabaseName(req);
74
- sprintf_s(msg,1024, "TD_RESET_CLIENT result = %d \tdbname = %s\t cid = %d \n"
75
- , req.result, dbname.c_str(), req.cid);
76
- writeflag = true;
77
- break;
78
- }
79
- case TD_CREATETABLE:
80
- {
81
- std::string dbname = getDatabaseName(req);
82
- sprintf_s(msg, 1024, "TD_CREATETABLE result = %d \tdbname = %s\t table=%s\n"
83
- , req.result, dbname.c_str(), getTableName(req).c_str());
84
- writeflag = true;
85
- break;
86
- }
87
- case TD_OPENTABLE:
88
- {
89
- std::string dbname = getDatabaseName(req);
90
- sprintf_s(msg, 1024, "TD_OPENTABLE result = %d \tHandle = %d \tdbname = %s\n"
91
- , req.result, req.pbk->handle, dbname.c_str());
92
- writeflag = true;
93
- break;
94
- }
95
- case TD_CLOSETABLE:
96
- sprintf_s(msg, 1024, "TD_CLOSETABLE result = %d \tHandle = %d\n"
97
- , req.result, req.pbk->handle);
98
- writeflag = true;
99
- break;
100
- case TD_KEY_SEEK:
101
- sprintf_s(msg, 1024, "TD_KEY_SEEK result = %d \tHandle = %d\n" , req.result, req.pbk->handle);
102
- writeflag = true;
103
- break;
104
- case TD_KEY_AFTER:
105
- sprintf_s(msg, 1024, "TD_KEY_AFTER result = %d \tHandle = %d\n" , req.result, req.pbk->handle);
106
- writeflag = true;
107
- break;
108
- case TD_KEY_OR_AFTER:
109
- sprintf_s(msg, 1024, "TD_KEY_OR_AFTER result = %d \tHandle = %d\n" , req.result, req.pbk->handle);
110
- writeflag = true;
111
- break;
112
- case TD_KEY_BEFORE:
113
- sprintf_s(msg, 1024, "TD_KEY_BEFORE result = %d \tHandle = %d\n", req.result, req.pbk->handle);
114
- writeflag = true;
115
- break;
116
- case TD_KEY_OR_BEFORE:
117
- sprintf_s(msg, 1024, "TD_KEY_OR_BEFORE result = %d \tHandle = %d\n" , req.result, req.pbk->handle);
118
- writeflag = true;
119
- break;
120
- case TD_KEY_FIRST:
121
- sprintf_s(msg, 1024, "TD_KEY_FIRST result = %d \tHandle = %d\n" , req.result, req.pbk->handle);
122
- writeflag = true;
123
- break;
124
- case TD_KEY_PREV:
125
- sprintf_s(msg, 1024, "TD_KEY_PREV result = %d \tHandle = %d\n" , req.result, req.pbk->handle);
126
- writeflag = true;
127
- break;
128
- case TD_KEY_LAST:
129
- sprintf_s(msg, 1024, "TD_KEY_LAST result = %d \tHandle = %d\n", req.result, req.pbk->handle);
130
- writeflag = true;
131
- break;
132
- case TD_KEY_NEXT:
133
- sprintf_s(msg, 1024, "TD_KEY_NEXT result = %d \tHandle = %d\n", req.result, req.pbk->handle);
134
- writeflag = true;
135
- break;
136
- case TD_REC_INSERT:
137
- sprintf_s(msg, 1024, "TD_REC_INSERT result = %d \tHandle = %d\n"
138
- , req.result, req.pbk->handle);
139
- writeflag = true;
140
- break;
141
- case TD_REC_UPDATE:
142
- sprintf_s(msg, 1024, "TD_REC_UPDATE result = %d \tHandle = %d\n"
143
- , req.result, req.pbk->handle);
144
- writeflag = true;
145
- break;
146
- case TD_REC_DELETE:
147
- sprintf_s(msg, 1024, "TD_REC_DELETE result = %d \tHandle = %d\n"
148
- , req.result, req.pbk->handle);
149
- writeflag = true;
150
- break;
151
- case TD_BEGIN_TRANSACTION:
152
- sprintf_s(msg, 1024, "TD_BEGIN_TRANSACTION cid = %d \n", req.cid);
153
- writeflag = true;
154
- break;
155
- case TD_END_TRANSACTION:
156
- sprintf_s(msg, 1024, "TD_END_TRANSACTION cid = %d \n", req.cid);
157
- writeflag = true;
158
- break;
159
- case TD_ABORT_TRANSACTION:
160
- sprintf_s(msg, 1024, "TD_ABORT_TRANSACTION cid = %d \n", req.cid);
161
- writeflag = true;
162
- break;
163
- case TD_BEGIN_SHAPSHOT:
164
- sprintf_s(msg, 1024, "TD_BEGIN_SHAPSHOT cid = %d \n", req.cid);
165
- writeflag = true;
166
- break;
167
- case TD_END_SNAPSHOT:
168
- sprintf_s(msg, 1024, "TD_END_SNAPSHOT cid = %d \n", req.cid);
169
- writeflag = true;
170
- break;
171
- case TD_TABLE_INFO:
172
- {
173
- std::string dbname = getDatabaseName(req);
174
- sprintf_s(msg, 1024, "TD_TABLE_INFO result = %d \tHandle = %d\n"
175
- , req.result, req.pbk->handle);
176
- writeflag = true;
177
- break;
178
- }
179
-
180
- case TD_POS_FIRST:
181
- sprintf_s(msg, 1024, "TD_POS_FIRST result = %d \tHandle = %d\n", req.result, req.pbk->handle);
182
- writeflag = true;
183
- break;
184
- case TD_POS_LAST:
185
- sprintf_s(msg, 1024, "TD_POS_LAST result = %d \tHandle = %d\n", req.result, req.pbk->handle);
186
- writeflag = true;
187
- break;
188
- case TD_POS_NEXT:
189
- sprintf_s(msg, 1024, "TD_POS_NEXT result = %d \tHandle = %d\n", req.result, req.pbk->handle);
190
- writeflag = true;
191
- break;
192
- case TD_POS_PREV:
193
- sprintf_s(msg, 1024, "TD_POS_PREV result = %d \tHandle = %d\n", req.result, req.pbk->handle);
194
- writeflag = true;
195
- break;
196
- case TD_BOOKMARK:
197
- if (req.result==0)
198
- sprintf_s(msg, 1024, "TD_BOOKMARK result = %d \tHandle = %d key = %d pos = %d\n"
199
- , req.result, req.pbk->handle, req.keyNum, *((uint*)req.data));
200
- else
201
- sprintf_s(msg, 1024, "TD_BOOKMARK result = %d \tHandle = %d key = %d \n"
202
- , req.result, req.pbk->handle, req.keyNum);
203
- writeflag = true;
204
- break;
69
+ switch (op)
70
+ {
71
+ case TD_RESET_CLIENT:
72
+ {
73
+ std::string dbname = getDatabaseName(req);
74
+ sprintf_s(msg, 1024,
75
+ "TD_RESET_CLIENT result = %d \tdbname = %s\t cid = %d \n",
76
+ req.result, dbname.c_str(), req.cid);
77
+ writeflag = true;
78
+ break;
79
+ }
80
+ case TD_CREATETABLE:
81
+ {
82
+ std::string dbname = getDatabaseName(req);
83
+ sprintf_s(msg, 1024,
84
+ "TD_CREATETABLE result = %d \tdbname = %s\t table=%s\n",
85
+ req.result, dbname.c_str(), getTableName(req).c_str());
86
+ writeflag = true;
87
+ break;
88
+ }
89
+ case TD_OPENTABLE:
90
+ {
91
+ std::string dbname = getDatabaseName(req);
92
+ sprintf_s(msg, 1024,
93
+ "TD_OPENTABLE result = %d \tHandle = %d \tdbname = %s\n",
94
+ req.result, req.pbk->handle, dbname.c_str());
95
+ writeflag = true;
96
+ break;
97
+ }
98
+ case TD_CLOSETABLE:
99
+ sprintf_s(msg, 1024, "TD_CLOSETABLE result = %d \tHandle = %d\n",
100
+ req.result, req.pbk->handle);
101
+ writeflag = true;
102
+ break;
103
+ case TD_KEY_SEEK:
104
+ sprintf_s(msg, 1024, "TD_KEY_SEEK result = %d \tHandle = %d\n",
105
+ req.result, req.pbk->handle);
106
+ writeflag = true;
107
+ break;
108
+ case TD_KEY_AFTER:
109
+ sprintf_s(msg, 1024, "TD_KEY_AFTER result = %d \tHandle = %d\n",
110
+ req.result, req.pbk->handle);
111
+ writeflag = true;
112
+ break;
113
+ case TD_KEY_OR_AFTER:
114
+ sprintf_s(msg, 1024, "TD_KEY_OR_AFTER result = %d \tHandle = %d\n",
115
+ req.result, req.pbk->handle);
116
+ writeflag = true;
117
+ break;
118
+ case TD_KEY_BEFORE:
119
+ sprintf_s(msg, 1024, "TD_KEY_BEFORE result = %d \tHandle = %d\n",
120
+ req.result, req.pbk->handle);
121
+ writeflag = true;
122
+ break;
123
+ case TD_KEY_OR_BEFORE:
124
+ sprintf_s(msg, 1024, "TD_KEY_OR_BEFORE result = %d \tHandle = %d\n",
125
+ req.result, req.pbk->handle);
126
+ writeflag = true;
127
+ break;
128
+ case TD_KEY_FIRST:
129
+ sprintf_s(msg, 1024, "TD_KEY_FIRST result = %d \tHandle = %d\n",
130
+ req.result, req.pbk->handle);
131
+ writeflag = true;
132
+ break;
133
+ case TD_KEY_PREV:
134
+ sprintf_s(msg, 1024, "TD_KEY_PREV result = %d \tHandle = %d\n",
135
+ req.result, req.pbk->handle);
136
+ writeflag = true;
137
+ break;
138
+ case TD_KEY_LAST:
139
+ sprintf_s(msg, 1024, "TD_KEY_LAST result = %d \tHandle = %d\n",
140
+ req.result, req.pbk->handle);
141
+ writeflag = true;
142
+ break;
143
+ case TD_KEY_NEXT:
144
+ sprintf_s(msg, 1024, "TD_KEY_NEXT result = %d \tHandle = %d\n",
145
+ req.result, req.pbk->handle);
146
+ writeflag = true;
147
+ break;
148
+ case TD_REC_INSERT:
149
+ sprintf_s(msg, 1024, "TD_REC_INSERT result = %d \tHandle = %d\n",
150
+ req.result, req.pbk->handle);
151
+ writeflag = true;
152
+ break;
153
+ case TD_REC_UPDATE:
154
+ sprintf_s(msg, 1024, "TD_REC_UPDATE result = %d \tHandle = %d\n",
155
+ req.result, req.pbk->handle);
156
+ writeflag = true;
157
+ break;
158
+ case TD_REC_DELETE:
159
+ sprintf_s(msg, 1024, "TD_REC_DELETE result = %d \tHandle = %d\n",
160
+ req.result, req.pbk->handle);
161
+ writeflag = true;
162
+ break;
163
+ case TD_BEGIN_TRANSACTION:
164
+ sprintf_s(msg, 1024, "TD_BEGIN_TRANSACTION cid = %d \n", req.cid);
165
+ writeflag = true;
166
+ break;
167
+ case TD_END_TRANSACTION:
168
+ sprintf_s(msg, 1024, "TD_END_TRANSACTION cid = %d \n", req.cid);
169
+ writeflag = true;
170
+ break;
171
+ case TD_ABORT_TRANSACTION:
172
+ sprintf_s(msg, 1024, "TD_ABORT_TRANSACTION cid = %d \n", req.cid);
173
+ writeflag = true;
174
+ break;
175
+ case TD_BEGIN_SHAPSHOT:
176
+ sprintf_s(msg, 1024, "TD_BEGIN_SHAPSHOT cid = %d \n", req.cid);
177
+ writeflag = true;
178
+ break;
179
+ case TD_END_SNAPSHOT:
180
+ sprintf_s(msg, 1024, "TD_END_SNAPSHOT cid = %d \n", req.cid);
181
+ writeflag = true;
182
+ break;
183
+ case TD_TABLE_INFO:
184
+ {
185
+ std::string dbname = getDatabaseName(req);
186
+ sprintf_s(msg, 1024, "TD_TABLE_INFO result = %d \tHandle = %d\n",
187
+ req.result, req.pbk->handle);
188
+ writeflag = true;
189
+ break;
190
+ }
205
191
 
206
- case TD_MOVE_BOOKMARK:
207
- sprintf_s(msg, 1024, "TD_MOVE_BOOKMARK result = %d \tHandle = %d key = %d pos = %d\n"
208
- , req.result, req.pbk->handle, req.keyNum, *((uchar*)req.data));
209
- writeflag = true;
210
- break;
211
-
212
- case TD_GETDIRECTORY:
213
- sprintf_s(msg, 1024, "TD_GETDIRECTORY cid = %d \n", req.cid);
214
- writeflag = true;
215
- break;
192
+ case TD_POS_FIRST:
193
+ sprintf_s(msg, 1024, "TD_POS_FIRST result = %d \tHandle = %d\n",
194
+ req.result, req.pbk->handle);
195
+ writeflag = true;
196
+ break;
197
+ case TD_POS_LAST:
198
+ sprintf_s(msg, 1024, "TD_POS_LAST result = %d \tHandle = %d\n",
199
+ req.result, req.pbk->handle);
200
+ writeflag = true;
201
+ break;
202
+ case TD_POS_NEXT:
203
+ sprintf_s(msg, 1024, "TD_POS_NEXT result = %d \tHandle = %d\n",
204
+ req.result, req.pbk->handle);
205
+ writeflag = true;
206
+ break;
207
+ case TD_POS_PREV:
208
+ sprintf_s(msg, 1024, "TD_POS_PREV result = %d \tHandle = %d\n",
209
+ req.result, req.pbk->handle);
210
+ writeflag = true;
211
+ break;
212
+ case TD_BOOKMARK:
213
+ if (req.result == 0)
214
+ sprintf_s(
215
+ msg, 1024,
216
+ "TD_BOOKMARK result = %d \tHandle = %d key = %d pos = %d\n",
217
+ req.result, req.pbk->handle, req.keyNum, *((uint*)req.data));
218
+ else
219
+ sprintf_s(msg, 1024,
220
+ "TD_BOOKMARK result = %d \tHandle = %d key = %d \n",
221
+ req.result, req.pbk->handle, req.keyNum);
222
+ writeflag = true;
223
+ break;
216
224
 
217
-
218
- case TD_SET_OWNERNAME:
219
- sprintf_s(msg, 1024, "TD_SET_OWNERNAME result = %d \tHandle = %d\n", req.result, req.pbk->handle);
220
- writeflag = true;
221
- break;
222
- case TD_DROP_INDEX:
223
- sprintf_s(msg, 1024, "TD_DROP_INDEX result = %d \tHandle = %d\n", req.result, req.pbk->handle);
224
- writeflag = true;
225
- break;
226
- case TD_KEY_NEXT_MULTI:
227
- sprintf_s(msg, 1024, "TD_KEY_NEXT_MULTI result = %d \tHandle = %d\n", req.result, req.pbk->handle);
228
- writeflag = true;
229
- break;
230
- case TD_KEY_PREV_MULTI:
231
- sprintf_s(msg, 1024, "TD_KEY_PREV_MULTI result = %d \tHandle = %d\n", req.result, req.pbk->handle);
232
- writeflag = true;
233
- break;
234
- case TD_POS_NEXT_MULTI:
235
- sprintf_s(msg, 1024, "TD_POS_NEXT_MULTI result = %d \tHandle = %d\n", req.result, req.pbk->handle);
236
- writeflag = true;
237
- break;
238
- case TD_POS_PREV_MULTI:
239
- sprintf_s(msg, 1024, "TD_POS_PREV_MULTI result = %d \tHandle = %d\n", req.result, req.pbk->handle);
240
- writeflag = true;
241
- break;
242
- case TD_MOVE_PER:
243
- sprintf_s(msg, 1024, "TD_MOVE_PER result = %d \tHandle = %d\n", req.result, req.pbk->handle);
244
- writeflag = true;
245
- break;
246
- case TD_GET_PER:
247
- sprintf_s(msg, 1024, "TD_GET_PER result = %d \tHandle = %d\n", req.result, req.pbk->handle);
248
- writeflag = true;
249
- break;
250
- case TD_INSERT_BULK:
251
- sprintf_s(msg, 1024, "TD_INSERT_BULK result = %d \tHandle = %d\n", req.result, req.pbk->handle);
252
- writeflag = true;
253
- break;
254
- case TD_VERSION:
255
- sprintf_s(msg, 1024, "TD_VERSION result = %d \n", req.result);
256
- writeflag = true;
257
- break;
225
+ case TD_MOVE_BOOKMARK:
226
+ sprintf_s(
227
+ msg, 1024,
228
+ "TD_MOVE_BOOKMARK result = %d \tHandle = %d key = %d pos = %d\n",
229
+ req.result, req.pbk->handle, req.keyNum, *((uchar*)req.data));
230
+ writeflag = true;
231
+ break;
258
232
 
259
- }
260
- if (error)
261
- {
262
- sprintf_s(msg, 1024, "ERROR result = %d op=%d\t\tHandle = %d\n"
263
- , req.result, op, req.pbk?req.pbk->handle:0);
264
- writeflag = true;
265
- }
266
- if (writeflag)
267
- bzs::rtl::debuglog::write(msg);
268
-
233
+ case TD_GETDIRECTORY:
234
+ sprintf_s(msg, 1024, "TD_GETDIRECTORY cid = %d \n", req.cid);
235
+ writeflag = true;
236
+ break;
237
+
238
+ case TD_SET_OWNERNAME:
239
+ sprintf_s(msg, 1024, "TD_SET_OWNERNAME result = %d \tHandle = %d\n",
240
+ req.result, req.pbk->handle);
241
+ writeflag = true;
242
+ break;
243
+ case TD_DROP_INDEX:
244
+ sprintf_s(msg, 1024, "TD_DROP_INDEX result = %d \tHandle = %d\n",
245
+ req.result, req.pbk->handle);
246
+ writeflag = true;
247
+ break;
248
+ case TD_KEY_NEXT_MULTI:
249
+ sprintf_s(msg, 1024, "TD_KEY_NEXT_MULTI result = %d \tHandle = %d\n",
250
+ req.result, req.pbk->handle);
251
+ writeflag = true;
252
+ break;
253
+ case TD_KEY_PREV_MULTI:
254
+ sprintf_s(msg, 1024, "TD_KEY_PREV_MULTI result = %d \tHandle = %d\n",
255
+ req.result, req.pbk->handle);
256
+ writeflag = true;
257
+ break;
258
+ case TD_POS_NEXT_MULTI:
259
+ sprintf_s(msg, 1024, "TD_POS_NEXT_MULTI result = %d \tHandle = %d\n",
260
+ req.result, req.pbk->handle);
261
+ writeflag = true;
262
+ break;
263
+ case TD_POS_PREV_MULTI:
264
+ sprintf_s(msg, 1024, "TD_POS_PREV_MULTI result = %d \tHandle = %d\n",
265
+ req.result, req.pbk->handle);
266
+ writeflag = true;
267
+ break;
268
+ case TD_MOVE_PER:
269
+ sprintf_s(msg, 1024, "TD_MOVE_PER result = %d \tHandle = %d\n",
270
+ req.result, req.pbk->handle);
271
+ writeflag = true;
272
+ break;
273
+ case TD_GET_PER:
274
+ sprintf_s(msg, 1024, "TD_GET_PER result = %d \tHandle = %d\n",
275
+ req.result, req.pbk->handle);
276
+ writeflag = true;
277
+ break;
278
+ case TD_INSERT_BULK:
279
+ sprintf_s(msg, 1024, "TD_INSERT_BULK result = %d \tHandle = %d\n",
280
+ req.result, req.pbk->handle);
281
+ writeflag = true;
282
+ break;
283
+ case TD_VERSION:
284
+ sprintf_s(msg, 1024, "TD_VERSION result = %d \n", req.result);
285
+ writeflag = true;
286
+ break;
287
+ }
288
+ if (error)
289
+ {
290
+ sprintf_s(msg, 1024, "ERROR result = %d op=%d\t\tHandle = %d\n",
291
+ req.result, op, req.pbk ? req.pbk->handle : 0);
292
+ writeflag = true;
293
+ }
294
+ if (writeflag)
295
+ bzs::rtl::debuglog::write(msg);
269
296
  }
270
297
 
271
- void debugdb::fieldDump(table* tb)
298
+ void debugdb::fieldDump(table* tb)
272
299
  {
273
- boost::mutex::scoped_lock lck(m_mutex);
274
- FILE* fp = fileOpen(logfilename, "a+");
275
- if (fp)
276
- {
277
- int size;
278
- for (int j=0;j<(int)tb->internalTable()->s->fields;j++)
279
- {
280
- fputs(tb->internalTable()->s->field[j]->field_name, fp);
281
- fputs("=", fp);
282
- fputs(tb->valStr(j, size), fp);
283
- fputs("\n", fp);
284
- }
285
- fclose(fp);
286
- }
300
+ boost::mutex::scoped_lock lck(m_mutex);
301
+ FILE* fp = fileOpen(logfilename, "a+");
302
+ if (fp)
303
+ {
304
+ int size;
305
+ for (int j = 0; j < (int)tb->internalTable()->s->fields; j++)
306
+ {
307
+ fputs(tb->internalTable()->s->field[j]->field_name, fp);
308
+ fputs("=", fp);
309
+ fputs(tb->valStr(j, size), fp);
310
+ fputs("\n", fp);
311
+ }
312
+ fclose(fp);
313
+ }
287
314
  }
288
315
 
289
- void debugdb::writeInsert(table* tb, const char* packPtr,int packlen, int row, int errorCount)
316
+ void debugdb::writeInsert(table* tb, const char* packPtr, int packlen, int row,
317
+ int errorCount)
290
318
  {
291
- char tmp[64];
292
- sprintf(tmp, "INSERT PACKED Row=%d len=%d ErrorRows=%d ", packlen, row, errorCount);
293
- writeDump(tmp, packPtr + sizeof(ushort_td), packlen);
294
- uint len = tb->recordLen()-tb->nullBytes();
295
- sprintf(tmp, "INSERT UNPACKED Row=%d len=%d stat=%d", row, len, tb->stat());
296
- writeDump(tmp, (const char*)tb->record(), len);
297
- fieldDump(tb);
319
+ char tmp[64];
320
+ sprintf(tmp, "INSERT PACKED Row=%d len=%d ErrorRows=%d ", packlen, row,
321
+ errorCount);
322
+ writeDump(tmp, packPtr + sizeof(ushort_td), packlen);
323
+ uint len = tb->recordLen() - tb->nullBytes();
324
+ sprintf(tmp, "INSERT UNPACKED Row=%d len=%d stat=%d", row, len, tb->stat());
325
+ writeDump(tmp, (const char*)tb->record(), len);
326
+ fieldDump(tb);
298
327
  }
299
328
 
300
329
  #ifdef DEBUG_READRECORDS
330
+
301
331
  void debugdb::writeReadRecordsBegin(extResultDef* resultDef, extRequest* req)
302
332
  {
303
- char tmp[2048];
304
- char tmp2[1024]={0x00};
305
- sprintf(tmp, "READS RESULTDEF maxRows=%d fieldCount=%d\n", resultDef->maxRows, resultDef->fieldCount);
306
- for (int i=0;i<resultDef->fieldCount;i++)
307
- {
308
- resultField* fd = &resultDef->field[i];
309
- sprintf(tmp2,"RESULTDEF FIELD%d pos =%d len=%d \n",i+1, fd->pos, fd->len);
310
- strcat(tmp, tmp2);
311
- }
312
- sprintf(tmp2, "READS REQ len=%d reject=%d logicalCount=%d\n", req->len, req->rejectCount, req->logicalCount);
313
- strcat(tmp, tmp2);
314
- logicalField* field = &req->field;
315
- while(1)
316
- {
317
- sprintf(tmp2,"REQUEST FIELD1 type =%d len=%d pos=%d logType=%d opr=%d "
318
- , field->type, field->len, field->pos, field->logType, field->opr);
319
- strcat(tmp, tmp2);
320
- if (field->logType & CMPLOGICAL_FIELD)
321
- sprintf(tmp2, "offset=%d\n", field->offset);
322
- else
323
- {
324
- strcat(tmp, "Value=");
325
- for (int j=0;j<field->len;j++)
326
- {
327
- sprintf(tmp2, "%02X ", *(field->ptr+j));
328
- strcat(tmp, tmp2);
329
- }
330
- strcat(tmp, "\n");
331
- }
332
- if (field->opr == 0) break;//this is last
333
- field = field->next();
334
- }
335
- write(tmp);
333
+ char tmp[2048];
334
+ char tmp2[1024] = { 0x00 };
335
+ sprintf(tmp, "READS RESULTDEF maxRows=%d fieldCount=%d\n",
336
+ resultDef->maxRows, resultDef->fieldCount);
337
+ for (int i = 0; i < resultDef->fieldCount; i++)
338
+ {
339
+ resultField* fd = &resultDef->field[i];
340
+ sprintf(tmp2, "RESULTDEF FIELD%d pos =%d len=%d \n", i + 1, fd->pos,
341
+ fd->len);
342
+ strcat(tmp, tmp2);
343
+ }
344
+ sprintf(tmp2, "READS REQ len=%d reject=%d logicalCount=%d\n", req->len,
345
+ req->rejectCount, req->logicalCount);
346
+ strcat(tmp, tmp2);
347
+ logicalField* field = &req->field;
348
+ while (1)
349
+ {
350
+ sprintf(
351
+ tmp2, "REQUEST FIELD1 type =%d len=%d pos=%d logType=%d opr=%d ",
352
+ field->type, field->len, field->pos, field->logType, field->opr);
353
+ strcat(tmp, tmp2);
354
+ if (field->logType & CMPLOGICAL_FIELD)
355
+ sprintf(tmp2, "offset=%d\n", field->offset);
356
+ else
357
+ {
358
+ strcat(tmp, "Value=");
359
+ for (int j = 0; j < field->len; j++)
360
+ {
361
+ sprintf(tmp2, "%02X ", *(field->ptr + j));
362
+ strcat(tmp, tmp2);
363
+ }
364
+ strcat(tmp, "\n");
365
+ }
366
+ if (field->opr == 0)
367
+ break; // this is last
368
+ field = field->next();
369
+ }
370
+ write(tmp);
336
371
  }
337
372
 
338
373
  void debugdb::writeReadRecordsEnd(resultWriter* rw)
339
374
  {
340
- dump("READS RESULT DUMP", rw->resultBuffer()+RETBUF_EXT_RESERVE_SIZE
341
- , rw->resultLen()-RETBUF_EXT_RESERVE_SIZE);
375
+ dump("READS RESULT DUMP", rw->resultBuffer() + RETBUF_EXT_RESERVE_SIZE,
376
+ rw->resultLen() - RETBUF_EXT_RESERVE_SIZE);
342
377
  }
343
- #endif //DEBUG_READRECORDS
344
-
345
- }//namespace mysql
346
- }//namespace engine
347
- }//namespace db
348
- }//namespace bzs
378
+ #endif // DEBUG_READRECORDS
349
379
 
380
+ } // namespace mysql
381
+ } // namespace engine
382
+ } // namespace db
383
+ } // namespace bzs