Overview
Comment: | Better handling of duplicate keys and added a new LMDB foreach mechanism |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
3a7a6bfc16d161775b6f76c2dcc5a76c |
User & Date: | rkeene on 2018-07-12 21:10:32 |
Other Links: | manifest | tags |
Context
2018-07-12
| ||
21:17 | Document the speed-up hack a bit check-in: 6a9bfc7036 user: rkeene tags: trunk | |
21:10 | Better handling of duplicate keys and added a new LMDB foreach mechanism check-in: 3a7a6bfc16 user: rkeene tags: trunk | |
00:05 | Added support for clearing and adding pending via LMDB check-in: a8e052677e user: rkeene tags: trunk | |
Changes
Modified nano.tcl from [1d335ca4b1] to [7a1ec5be31].
︙ | |||
1188 1189 1190 1191 1192 1193 1194 | 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 | - + | set envHandle [dict get $lmdbInfo envHandle] set dbHandle [lmdb open -env $envHandle -name $table] set sessionHandle [$envHandle txn -readonly $readOnly] set cursor [$dbHandle cursor -txn $sessionHandle] uplevel 1 [list set $cursorVar $cursor] |
︙ | |||
1210 1211 1212 1213 1214 1215 1216 | 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + + - - - - + + + + - - + + - - - - - - + + + + - - + + - - + + - + + + - + + + + + + + + | if {$retcode == 0} { return $retval } return {*}$options $retval } proc ::nano::ledger::lmdb::_foreach {lmdbInfo table cursorVar keyVar valueVar args} { set code [lindex $args end] set args [lrange $args 0 end-1] if {[llength $args] == 0} { set initialize [list getBinary "-first"] } else { if {[lindex $args 0] eq "-set"} { set checkKeyEqual [lindex $args 1] } set initialize [list getBinary {*}$args] } set iterate [list getBinary "-next"] _transaction $lmdbInfo $table cursor { if {$cursorVar ne ""} { uplevel 1 [list set $cursorVar $cursor] } for { if {[catch { set work [$cursor {*}$initialize] } err]} { if {[string match "ERROR: MDB_NOTFOUND: *" $err]} { return } return -code error $err } } true { if {[catch { set work [$cursor {*}$iterate] } err]} { if {[string match "ERROR: MDB_NOTFOUND: *" $err]} { break } return -code error $err } } { unset -nocomplain key if {[info exists checkKeyEqual]} { set key [lindex $work 0] if {$key ne $checkKeyEqual} { break } } if {$keyVar ne ""} { if {![info exists key]} { set key [lindex $work 0] } uplevel 1 [list set $keyVar $key] } if {$valueVar ne ""} { set value [lindex $work 1] uplevel 1 [list set $valueVar $value] } catch {uplevel 1 $code} retval options switch -- [dict get $options "-code"] { 4 - 0 { # TCL_CONTINUE or TCL_OK continue } 1 { # TCL_ERROR, pass it on dict set options "-level" 1 return {*}$options $retval } 2 { # TCL_RETURN return -level 2 $retval } 3 { # TCL_BREAK break } } } } return } interp alias {} ::nano::ledger::lmdb::_magicSpeedup {} time |
︙ | |||
1287 1288 1289 1290 1291 1292 1293 | 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 | - - - - - - - - - + + - - - - + - + - | set blockHash [lindex $args 0] if {[string length $blockHash] != $::nano::block::hashLength} { set blockHash [binary decode hex $blockHash] } set searchKey "${accountPubKey}${blockHash}" set numberOfRowsDeleted 0 |
︙ | |||
1329 1330 1331 1332 1333 1334 1335 | 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 | + + + + + + - - - - + + + + + + | } set lmdbKey "${accountPubKey}${blockHash}" set fromHex [::nano::address::toPublicKey [dict get $args from] -hex] set amountHex [format %032llx [dict get $args amount]] set lmdbData [binary format H64H32 $fromHex $amountHex] set keyExists false _foreach $lmdbInfo "pending" "" "" "" -set $lmdbKey { set keyExists true } if {!$keyExists} { |
︙ |