+271 -2

Cargo.lock

··· 126 126 ] 127 127 128 128 [[package]] 129 129 + name = "bincode" 130 130 + version = "2.0.1" 131 131 + source = "registry+https://github.com/rust-lang/crates.io-index" 132 132 + checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" 133 133 + dependencies = [ 134 134 + "bincode_derive", 135 135 + "serde", 136 136 + "unty", 137 137 + ] 138 138 + 139 139 + [[package]] 140 140 + name = "bincode_derive" 141 141 + version = "2.0.1" 142 142 + source = "registry+https://github.com/rust-lang/crates.io-index" 143 143 + checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" 144 144 + dependencies = [ 145 145 + "virtue", 146 146 + ] 147 147 + 148 148 + [[package]] 129 149 name = "bitflags" 130 150 version = "2.9.4" 131 151 source = "registry+https://github.com/rust-lang/crates.io-index" 132 152 checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" 153 153 + 154 154 + [[package]] 155 155 + name = "block-buffer" 156 156 + version = "0.10.4" 157 157 + source = "registry+https://github.com/rust-lang/crates.io-index" 158 158 + checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" 159 159 + dependencies = [ 160 160 + "generic-array", 161 161 + ] 133 162 134 163 [[package]] 135 164 name = "bumpalo" ··· 267 296 ] 268 297 269 298 [[package]] 299 299 + name = "cpufeatures" 300 300 + version = "0.2.17" 301 301 + source = "registry+https://github.com/rust-lang/crates.io-index" 302 302 + checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" 303 303 + dependencies = [ 304 304 + "libc", 305 305 + ] 306 306 + 307 307 + [[package]] 270 308 name = "criterion" 271 309 version = "0.7.0" 272 310 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 332 370 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" 333 371 334 372 [[package]] 373 373 + name = "crypto-common" 374 374 + version = "0.1.6" 375 375 + source = "registry+https://github.com/rust-lang/crates.io-index" 376 376 + checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" 377 377 + dependencies = [ 378 378 + "generic-array", 379 379 + "typenum", 380 380 + ] 381 381 + 382 382 + [[package]] 335 383 name = "data-encoding" 336 384 version = "2.9.0" 337 385 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 358 406 ] 359 407 360 408 [[package]] 409 409 + name = "digest" 410 410 + version = "0.10.7" 411 411 + source = "registry+https://github.com/rust-lang/crates.io-index" 412 412 + checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" 413 413 + dependencies = [ 414 414 + "block-buffer", 415 415 + "crypto-common", 416 416 + ] 417 417 + 418 418 + [[package]] 361 419 name = "either" 362 420 version = "1.15.0" 363 421 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 387 445 ] 388 446 389 447 [[package]] 448 448 + name = "errno" 449 449 + version = "0.3.14" 450 450 + source = "registry+https://github.com/rust-lang/crates.io-index" 451 451 + checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" 452 452 + dependencies = [ 453 453 + "libc", 454 454 + "windows-sys 0.60.2", 455 455 + ] 456 456 + 457 457 + [[package]] 458 458 + name = "fallible-iterator" 459 459 + version = "0.3.0" 460 460 + source = "registry+https://github.com/rust-lang/crates.io-index" 461 461 + checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" 462 462 + 463 463 + [[package]] 464 464 + name = "fallible-streaming-iterator" 465 465 + version = "0.1.9" 466 466 + source = "registry+https://github.com/rust-lang/crates.io-index" 467 467 + checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" 468 468 + 469 469 + [[package]] 470 470 + name = "fastrand" 471 471 + version = "2.3.0" 472 472 + source = "registry+https://github.com/rust-lang/crates.io-index" 473 473 + checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" 474 474 + 475 475 + [[package]] 476 476 + name = "foldhash" 477 477 + version = "0.1.5" 478 478 + source = "registry+https://github.com/rust-lang/crates.io-index" 479 479 + checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" 480 480 + 481 481 + [[package]] 390 482 name = "futures" 391 483 version = "0.3.31" 392 484 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 476 568 ] 477 569 478 570 [[package]] 571 571 + name = "generic-array" 572 572 + version = "0.14.9" 573 573 + source = "registry+https://github.com/rust-lang/crates.io-index" 574 574 + checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" 575 575 + dependencies = [ 576 576 + "typenum", 577 577 + "version_check", 578 578 + ] 579 579 + 580 580 + [[package]] 581 581 + name = "getrandom" 582 582 + version = "0.3.3" 583 583 + source = "registry+https://github.com/rust-lang/crates.io-index" 584 584 + checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" 585 585 + dependencies = [ 586 586 + "cfg-if", 587 587 + "libc", 588 588 + "r-efi", 589 589 + "wasi 0.14.7+wasi-0.2.4", 590 590 + ] 591 591 + 592 592 + [[package]] 479 593 name = "gimli" 480 594 version = "0.32.3" 481 595 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 490 604 "cfg-if", 491 605 "crunchy", 492 606 "zerocopy", 607 607 + ] 608 608 + 609 609 + [[package]] 610 610 + name = "hashbrown" 611 611 + version = "0.15.5" 612 612 + source = "registry+https://github.com/rust-lang/crates.io-index" 613 613 + checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" 614 614 + dependencies = [ 615 615 + "foldhash", 616 616 + ] 617 617 + 618 618 + [[package]] 619 619 + name = "hashlink" 620 620 + version = "0.10.0" 621 621 + source = "registry+https://github.com/rust-lang/crates.io-index" 622 622 + checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" 623 623 + dependencies = [ 624 624 + "hashbrown", 493 625 ] 494 626 495 627 [[package]] ··· 598 730 checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" 599 731 600 732 [[package]] 733 733 + name = "libsqlite3-sys" 734 734 + version = "0.35.0" 735 735 + source = "registry+https://github.com/rust-lang/crates.io-index" 736 736 + checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" 737 737 + dependencies = [ 738 738 + "pkg-config", 739 739 + "vcpkg", 740 740 + ] 741 741 + 742 742 + [[package]] 743 743 + name = "linux-raw-sys" 744 744 + version = "0.11.0" 745 745 + source = "registry+https://github.com/rust-lang/crates.io-index" 746 746 + checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" 747 747 + 748 748 + [[package]] 601 749 name = "lock_api" 602 750 version = "0.4.14" 603 751 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 645 793 checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" 646 794 dependencies = [ 647 795 "libc", 648 648 - "wasi", 796 796 + "wasi 0.11.1+wasi-snapshot-preview1", 649 797 "windows-sys 0.59.0", 650 798 ] 651 799 ··· 744 892 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 745 893 746 894 [[package]] 895 895 + name = "pkg-config" 896 896 + version = "0.3.32" 897 897 + source = "registry+https://github.com/rust-lang/crates.io-index" 898 898 + checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" 899 899 + 900 900 + [[package]] 747 901 name = "plotters" 748 902 version = "0.3.7" 749 903 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 805 959 ] 806 960 807 961 [[package]] 962 962 + name = "r-efi" 963 963 + version = "5.3.0" 964 964 + source = "registry+https://github.com/rust-lang/crates.io-index" 965 965 + checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" 966 966 + 967 967 + [[package]] 808 968 name = "rayon" 809 969 version = "1.11.0" 810 970 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 864 1024 865 1025 [[package]] 866 1026 name = "repo-stream" 867 867 - version = "0.1.0" 1027 1027 + version = "0.2.2" 868 1028 dependencies = [ 1029 1029 + "bincode", 869 1030 "clap", 870 1031 "criterion", 871 1032 "env_logger", ··· 875 1036 "iroh-car", 876 1037 "log", 877 1038 "multibase", 1039 1039 + "rusqlite", 878 1040 "serde", 879 1041 "serde_bytes", 880 1042 "serde_ipld_dagcbor", 1043 1043 + "sha2", 1044 1044 + "tempfile", 881 1045 "thiserror 2.0.17", 882 1046 "tokio", 883 1047 ] 884 1048 885 1049 [[package]] 1050 1050 + name = "rusqlite" 1051 1051 + version = "0.37.0" 1052 1052 + source = "registry+https://github.com/rust-lang/crates.io-index" 1053 1053 + checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" 1054 1054 + dependencies = [ 1055 1055 + "bitflags", 1056 1056 + "fallible-iterator", 1057 1057 + "fallible-streaming-iterator", 1058 1058 + "hashlink", 1059 1059 + "libsqlite3-sys", 1060 1060 + "smallvec", 1061 1061 + ] 1062 1062 + 1063 1063 + [[package]] 886 1064 name = "rustc-demangle" 887 1065 version = "0.1.26" 888 1066 source = "registry+https://github.com/rust-lang/crates.io-index" 889 1067 checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" 1068 1068 + 1069 1069 + [[package]] 1070 1070 + name = "rustix" 1071 1071 + version = "1.1.2" 1072 1072 + source = "registry+https://github.com/rust-lang/crates.io-index" 1073 1073 + checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" 1074 1074 + dependencies = [ 1075 1075 + "bitflags", 1076 1076 + "errno", 1077 1077 + "libc", 1078 1078 + "linux-raw-sys", 1079 1079 + "windows-sys 0.60.2", 1080 1080 + ] 890 1081 891 1082 [[package]] 892 1083 name = "rustversion" ··· 981 1172 ] 982 1173 983 1174 [[package]] 1175 1175 + name = "sha2" 1176 1176 + version = "0.10.9" 1177 1177 + source = "registry+https://github.com/rust-lang/crates.io-index" 1178 1178 + checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" 1179 1179 + dependencies = [ 1180 1180 + "cfg-if", 1181 1181 + "cpufeatures", 1182 1182 + "digest", 1183 1183 + ] 1184 1184 + 1185 1185 + [[package]] 984 1186 name = "signal-hook-registry" 985 1187 version = "1.4.6" 986 1188 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1037 1239 "proc-macro2", 1038 1240 "quote", 1039 1241 "unicode-ident", 1242 1242 + ] 1243 1243 + 1244 1244 + [[package]] 1245 1245 + name = "tempfile" 1246 1246 + version = "3.23.0" 1247 1247 + source = "registry+https://github.com/rust-lang/crates.io-index" 1248 1248 + checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" 1249 1249 + dependencies = [ 1250 1250 + "fastrand", 1251 1251 + "getrandom", 1252 1252 + "once_cell", 1253 1253 + "rustix", 1254 1254 + "windows-sys 0.60.2", 1040 1255 ] 1041 1256 1042 1257 [[package]] ··· 1121 1336 ] 1122 1337 1123 1338 [[package]] 1339 1339 + name = "typenum" 1340 1340 + version = "1.19.0" 1341 1341 + source = "registry+https://github.com/rust-lang/crates.io-index" 1342 1342 + checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" 1343 1343 + 1344 1344 + [[package]] 1124 1345 name = "unicode-ident" 1125 1346 version = "1.0.19" 1126 1347 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1137 1358 version = "0.8.0" 1138 1359 source = "registry+https://github.com/rust-lang/crates.io-index" 1139 1360 checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" 1361 1361 + 1362 1362 + [[package]] 1363 1363 + name = "unty" 1364 1364 + version = "0.0.4" 1365 1365 + source = "registry+https://github.com/rust-lang/crates.io-index" 1366 1366 + checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" 1140 1367 1141 1368 [[package]] 1142 1369 name = "utf8parse" ··· 1145 1372 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" 1146 1373 1147 1374 [[package]] 1375 1375 + name = "vcpkg" 1376 1376 + version = "0.2.15" 1377 1377 + source = "registry+https://github.com/rust-lang/crates.io-index" 1378 1378 + checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" 1379 1379 + 1380 1380 + [[package]] 1381 1381 + name = "version_check" 1382 1382 + version = "0.9.5" 1383 1383 + source = "registry+https://github.com/rust-lang/crates.io-index" 1384 1384 + checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" 1385 1385 + 1386 1386 + [[package]] 1387 1387 + name = "virtue" 1388 1388 + version = "0.0.18" 1389 1389 + source = "registry+https://github.com/rust-lang/crates.io-index" 1390 1390 + checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" 1391 1391 + 1392 1392 + [[package]] 1148 1393 name = "walkdir" 1149 1394 version = "2.5.0" 1150 1395 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1159 1404 version = "0.11.1+wasi-snapshot-preview1" 1160 1405 source = "registry+https://github.com/rust-lang/crates.io-index" 1161 1406 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" 1407 1407 + 1408 1408 + [[package]] 1409 1409 + name = "wasi" 1410 1410 + version = "0.14.7+wasi-0.2.4" 1411 1411 + source = "registry+https://github.com/rust-lang/crates.io-index" 1412 1412 + checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" 1413 1413 + dependencies = [ 1414 1414 + "wasip2", 1415 1415 + ] 1416 1416 + 1417 1417 + [[package]] 1418 1418 + name = "wasip2" 1419 1419 + version = "1.0.1+wasi-0.2.4" 1420 1420 + source = "registry+https://github.com/rust-lang/crates.io-index" 1421 1421 + checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" 1422 1422 + dependencies = [ 1423 1423 + "wit-bindgen", 1424 1424 + ] 1162 1425 1163 1426 [[package]] 1164 1427 name = "wasm-bindgen" ··· 1390 1653 version = "0.53.1" 1391 1654 source = "registry+https://github.com/rust-lang/crates.io-index" 1392 1655 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" 1656 1656 + 1657 1657 + [[package]] 1658 1658 + name = "wit-bindgen" 1659 1659 + version = "0.46.0" 1660 1660 + source = "registry+https://github.com/rust-lang/crates.io-index" 1661 1661 + checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" 1393 1662 1394 1663 [[package]] 1395 1664 name = "zerocopy"

+11 -3

Cargo.toml

··· 1 1 [package] 2 2 name = "repo-stream" 3 3 - version = "0.1.0" 3 3 + version = "0.2.2" 4 4 edition = "2024" 5 5 license = "MIT OR Apache-2.0" 6 6 - description = "Fast and robust atproto CAR file processing in rust" 6 6 + description = "A robust CAR file -> MST walker for atproto" 7 7 + repository = "https://tangled.org/@microcosm.blue/repo-stream" 7 8 8 9 [dependencies] 10 10 + bincode = { version = "2.0.1", features = ["serde"] } 9 11 futures = "0.3.31" 10 12 futures-core = "0.3.31" 11 13 ipld-core = { version = "0.4.2", features = ["serde"] } 12 14 iroh-car = "0.5.1" 13 15 log = "0.4.28" 14 16 multibase = "0.9.2" 17 17 + rusqlite = "0.37.0" 15 18 serde = { version = "1.0.228", features = ["derive"] } 16 19 serde_bytes = "0.11.19" 17 20 serde_ipld_dagcbor = "0.6.4" 21 21 + sha2 = "0.10.9" 18 22 thiserror = "2.0.17" 19 19 - tokio = "1.47.1" 23 23 + tokio = { version = "1.47.1", features = ["rt", "sync"] } 20 24 21 25 [dev-dependencies] 22 26 clap = { version = "4.5.48", features = ["derive"] } 23 27 criterion = { version = "0.7.0", features = ["async_tokio"] } 24 28 env_logger = "0.11.8" 25 29 multibase = "0.9.2" 30 30 + tempfile = "3.23.0" 26 31 tokio = { version = "1.47.1", features = ["full"] } 27 32 28 33 [profile.profiling] 29 34 inherits = "release" 30 35 debug = true 36 36 + 37 37 + # [profile.release] 38 38 + # debug = true 31 39 32 40 [[bench]] 33 41 name = "non-huge-cars"

+12 -21

benches/huge-car.rs

··· 1 1 extern crate repo_stream; 2 2 - use futures::TryStreamExt; 3 3 - use iroh_car::CarReader; 4 4 - use std::convert::Infallible; 2 2 + use repo_stream::Driver; 5 3 use std::path::{Path, PathBuf}; 6 4 7 5 use criterion::{Criterion, criterion_group, criterion_main}; ··· 20 18 }); 21 19 } 22 20 23 23 - async fn drive_car(filename: impl AsRef<Path>) { 21 21 + async fn drive_car(filename: impl AsRef<Path>) -> usize { 24 22 let reader = tokio::fs::File::open(filename).await.unwrap(); 25 23 let reader = tokio::io::BufReader::new(reader); 26 26 - let reader = CarReader::new(reader).await.unwrap(); 27 24 28 28 - let root = reader 29 29 - .header() 30 30 - .roots() 31 31 - .first() 32 32 - .ok_or("missing root") 25 25 + let mut driver = match Driver::load_car(reader, |block| block.len(), 1024) 26 26 + .await 33 27 .unwrap() 34 34 - .clone(); 35 35 - 36 36 - let stream = std::pin::pin!(reader.stream()); 37 37 - 38 38 - let (_commit, v) = 39 39 - repo_stream::drive::Vehicle::init(root, stream, |block| Ok::<_, Infallible>(block.len())) 40 40 - .await 41 41 - .unwrap(); 42 42 - let mut record_stream = std::pin::pin!(v.stream()); 28 28 + { 29 29 + Driver::Memory(_, mem_driver) => mem_driver, 30 30 + Driver::Disk(_) => panic!("not doing disk for benchmark"), 31 31 + }; 43 32 44 44 - while let Some(_) = record_stream.try_next().await.unwrap() { 45 45 - // just here for the drive 33 33 + let mut n = 0; 34 34 + while let Some(pairs) = driver.next_chunk(256).await.unwrap() { 35 35 + n += pairs.len(); 46 36 } 37 37 + n 47 38 } 48 39 49 40 criterion_group!(benches, criterion_benchmark);

+16 -22

benches/non-huge-cars.rs

··· 1 1 extern crate repo_stream; 2 2 - use futures::TryStreamExt; 3 3 - use iroh_car::CarReader; 4 4 - use std::convert::Infallible; 2 2 + use repo_stream::Driver; 5 3 6 4 use criterion::{Criterion, criterion_group, criterion_main}; 7 5 6 6 + const EMPTY_CAR: &'static [u8] = include_bytes!("../car-samples/empty.car"); 8 7 const TINY_CAR: &'static [u8] = include_bytes!("../car-samples/tiny.car"); 9 8 const LITTLE_CAR: &'static [u8] = include_bytes!("../car-samples/little.car"); 10 9 const MIDSIZE_CAR: &'static [u8] = include_bytes!("../car-samples/midsize.car"); ··· 15 14 .build() 16 15 .expect("Creating runtime failed"); 17 16 17 17 + c.bench_function("empty-car", |b| { 18 18 + b.to_async(&rt).iter(async || drive_car(EMPTY_CAR).await) 19 19 + }); 18 20 c.bench_function("tiny-car", |b| { 19 21 b.to_async(&rt).iter(async || drive_car(TINY_CAR).await) 20 22 }); ··· 26 28 }); 27 29 } 28 30 29 29 - async fn drive_car(bytes: &[u8]) { 30 30 - let reader = CarReader::new(bytes).await.unwrap(); 31 31 - 32 32 - let root = reader 33 33 - .header() 34 34 - .roots() 35 35 - .first() 36 36 - .ok_or("missing root") 31 31 + async fn drive_car(bytes: &[u8]) -> usize { 32 32 + let mut driver = match Driver::load_car(bytes, |block| block.len(), 32) 33 33 + .await 37 34 .unwrap() 38 38 - .clone(); 39 39 - 40 40 - let stream = std::pin::pin!(reader.stream()); 35 35 + { 36 36 + Driver::Memory(_, mem_driver) => mem_driver, 37 37 + Driver::Disk(_) => panic!("not benching big cars here"), 38 38 + }; 41 39 42 42 - let (_commit, v) = 43 43 - repo_stream::drive::Vehicle::init(root, stream, |block| Ok::<_, Infallible>(block.len())) 44 44 - .await 45 45 - .unwrap(); 46 46 - let mut record_stream = std::pin::pin!(v.stream()); 47 47 - 48 48 - while let Some(_) = record_stream.try_next().await.unwrap() { 49 49 - // just here for the drive 40 40 + let mut n = 0; 41 41 + while let Some(pairs) = driver.next_chunk(256).await.unwrap() { 42 42 + n += pairs.len(); 50 43 } 44 44 + n 51 45 } 52 46 53 47 criterion_group!(benches, criterion_benchmark);

car-samples/empty.car

This is a binary file and will not be displayed.

+93

examples/disk-read-file/main.rs

··· 1 1 + /*! 2 2 + Read a CAR file by spilling to disk 3 3 + */ 4 4 + 5 5 + extern crate repo_stream; 6 6 + use clap::Parser; 7 7 + use repo_stream::{DiskBuilder, Driver, DriverBuilder}; 8 8 + use std::path::PathBuf; 9 9 + use std::time::Instant; 10 10 + 11 11 + #[derive(Debug, Parser)] 12 12 + struct Args { 13 13 + #[arg()] 14 14 + car: PathBuf, 15 15 + #[arg()] 16 16 + tmpfile: PathBuf, 17 17 + } 18 18 + 19 19 + #[tokio::main] 20 20 + async fn main() -> Result<(), Box<dyn std::error::Error>> { 21 21 + env_logger::init(); 22 22 + 23 23 + let Args { car, tmpfile } = Args::parse(); 24 24 + 25 25 + // repo-stream takes an AsyncRead as input. wrapping a filesystem read in 26 26 + // BufReader can provide a really significant performance win. 27 27 + let reader = tokio::fs::File::open(car).await?; 28 28 + let reader = tokio::io::BufReader::new(reader); 29 29 + 30 30 + log::info!("hello! reading the car..."); 31 31 + let t0 = Instant::now(); 32 32 + 33 33 + // in this example we only bother handling CARs that are too big for memory 34 34 + // `noop` helper means: do no block processing, store the raw blocks 35 35 + let driver = match DriverBuilder::new() 36 36 + .with_mem_limit_mb(10) // how much memory can be used before disk spill 37 37 + .load_car(reader) 38 38 + .await? 39 39 + { 40 40 + Driver::Memory(_, _) => panic!("try this on a bigger car"), 41 41 + Driver::Disk(big_stuff) => { 42 42 + // we reach here if the repo was too big and needs to be spilled to 43 43 + // disk to continue 44 44 + 45 45 + // set up a disk store we can spill to 46 46 + let disk_store = DiskBuilder::new().open(tmpfile).await?; 47 47 + 48 48 + // do the spilling, get back a (similar) driver 49 49 + let (commit, driver) = big_stuff.finish_loading(disk_store).await?; 50 50 + 51 51 + // at this point you might want to fetch the account's signing key 52 52 + // via the DID from the commit, and then verify the signature. 53 53 + log::warn!("big's comit ({:?}): {:?}", t0.elapsed(), commit); 54 54 + 55 55 + // pop the driver back out to get some code indentation relief 56 56 + driver 57 57 + } 58 58 + }; 59 59 + 60 60 + // collect some random stats about the blocks 61 61 + let mut n = 0; 62 62 + let mut zeros = 0; 63 63 + 64 64 + log::info!("walking..."); 65 65 + 66 66 + // this example uses the disk driver's channel mode: the tree walking is 67 67 + // spawned onto a blocking thread, and we get chunks of rkey+blocks back 68 68 + let (mut rx, join) = driver.to_channel(512); 69 69 + while let Some(r) = rx.recv().await { 70 70 + let pairs = r?; 71 71 + 72 72 + // keep a count of the total number of blocks seen 73 73 + n += pairs.len(); 74 74 + 75 75 + for (_, block) in pairs { 76 76 + // for each block, count how many bytes are equal to '0' 77 77 + // (this is just an example, you probably want to do something more 78 78 + // interesting) 79 79 + zeros += block.into_iter().filter(|&b| b == b'0').count() 80 80 + } 81 81 + } 82 82 + 83 83 + log::info!("arrived! ({:?}) joining rx...", t0.elapsed()); 84 84 + 85 85 + // clean up the database. would be nice to do this in drop so it happens 86 86 + // automatically, but some blocking work happens, so that's not allowed in 87 87 + // async rust. 🤷‍♀️ 88 88 + join.await?.reset_store().await?; 89 89 + 90 90 + log::info!("done. n={n} zeros={zeros}"); 91 91 + 92 92 + Ok(()) 93 93 + }

+18 -25

examples/read-file/main.rs

··· 1 1 + /*! 2 2 + Read a CAR file with in-memory processing 3 3 + */ 4 4 + 1 5 extern crate repo_stream; 2 6 use clap::Parser; 3 3 - use futures::TryStreamExt; 4 4 - use iroh_car::CarReader; 5 5 - use std::convert::Infallible; 7 7 + use repo_stream::{Driver, DriverBuilder}; 6 8 use std::path::PathBuf; 7 9 8 10 type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>; ··· 21 23 let reader = tokio::fs::File::open(file).await?; 22 24 let reader = tokio::io::BufReader::new(reader); 23 25 24 24 - println!("hello!"); 25 25 - 26 26 - let reader = CarReader::new(reader).await?; 27 27 - 28 28 - let root = reader 29 29 - .header() 30 30 - .roots() 31 31 - .first() 32 32 - .ok_or("missing root")? 33 33 - .clone(); 34 34 - log::debug!("root: {root:?}"); 35 35 - 36 36 - // let stream = Box::pin(reader.stream()); 37 37 - let stream = std::pin::pin!(reader.stream()); 38 38 - 39 39 - let (commit, v) = 40 40 - repo_stream::drive::Vehicle::init(root, stream, |block| Ok::<_, Infallible>(block.len())) 41 41 - .await?; 42 42 - let mut record_stream = std::pin::pin!(v.stream()); 26 26 + let (commit, mut driver) = match DriverBuilder::new() 27 27 + .with_block_processor(|block| block.len()) 28 28 + .load_car(reader) 29 29 + .await? 30 30 + { 31 31 + Driver::Memory(commit, mem_driver) => (commit, mem_driver), 32 32 + Driver::Disk(_) => panic!("this example doesn't handle big CARs"), 33 33 + }; 43 34 44 35 log::info!("got commit: {commit:?}"); 45 36 46 46 - while let Some((rkey, _rec)) = record_stream.try_next().await? { 47 47 - log::info!("got {rkey:?}"); 37 37 + let mut n = 0; 38 38 + while let Some(pairs) = driver.next_chunk(256).await? { 39 39 + n += pairs.len(); 40 40 + // log::info!("got {rkey:?}"); 48 41 } 49 49 - log::info!("bye!"); 42 42 + log::info!("bye! total records={n}"); 50 43 51 44 Ok(()) 52 45 }

+70 -2

readme.md

··· 1 1 # repo-stream 2 2 3 3 - Fast and (aspirationally) robust atproto CAR file processing in rust 3 3 + A robust CAR file -> MST walker for atproto 4 4 + 5 5 + [![Crates.io][crates-badge]](https://crates.io/crates/repo-stream) 6 6 + [![Documentation][docs-badge]](https://docs.rs/repo-stream) 7 7 + [![Sponsor][sponsor-badge]](https://github.com/sponsors/uniphil) 8 8 + 9 9 + [crates-badge]: https://img.shields.io/crates/v/repo-stream.svg 10 10 + [docs-badge]: https://docs.rs/repo-stream/badge.svg 11 11 + [sponsor-badge]: https://img.shields.io/badge/at-microcosm-b820f9?labelColor=b820f9&logo=githubsponsors&logoColor=fff 12 12 + 13 13 + ```rust 14 14 + use repo_stream::{Driver, DriverBuilder, DriveError, DiskBuilder}; 15 15 + 16 16 + #[tokio::main] 17 17 + async fn main() -> Result<(), DriveError> { 18 18 + // repo-stream takes any AsyncRead as input, like a tokio::fs::File 19 19 + let reader = tokio::fs::File::open("repo.car".into()).await?; 20 20 + let reader = tokio::io::BufReader::new(reader); 21 21 + 22 22 + // example repo workload is simply counting the total record bytes 23 23 + let mut total_size = 0; 24 24 + 25 25 + match DriverBuilder::new() 26 26 + .with_mem_limit_mb(10) 27 27 + .with_block_processor(|rec| rec.len()) // block processing: just extract the raw record size 28 28 + .load_car(reader) 29 29 + .await? 30 30 + { 31 31 + 32 32 + // if all blocks fit within memory 33 33 + Driver::Memory(_commit, mut driver) => { 34 34 + while let Some(chunk) = driver.next_chunk(256).await? { 35 35 + for (_rkey, size) in chunk { 36 36 + total_size += size; 37 37 + } 38 38 + } 39 39 + }, 40 40 + 41 41 + // if the CAR was too big for in-memory processing 42 42 + Driver::Disk(paused) => { 43 43 + // set up a disk store we can spill to 44 44 + let store = DiskBuilder::new().open("some/path.db".into()).await?; 45 45 + // do the spilling, get back a (similar) driver 46 46 + let (_commit, mut driver) = paused.finish_loading(store).await?; 47 47 + 48 48 + while let Some(chunk) = driver.next_chunk(256).await? { 49 49 + for (_rkey, size) in chunk { 50 50 + total_size += size; 51 51 + } 52 52 + } 53 53 + 54 54 + // clean up the disk store (drop tables etc) 55 55 + driver.reset_store().await?; 56 56 + } 57 57 + }; 58 58 + println!("sum of size of all records: {total_size}"); 59 59 + Ok(()) 60 60 + } 61 61 + ``` 62 62 + 63 63 + more recent todo 64 64 + 65 65 + - [ ] get an *emtpy* car for the test suite 66 66 + - [x] implement a max size on disk limit 67 67 + 68 68 + 69 69 + ----- 70 70 + 71 71 + older stuff (to clean up): 4 72 5 73 6 74 current car processing times (records processed into their length usize, phil's dev machine): ··· 27 95 -> yeah the commit is returned from init 28 96 - [ ] spec compliance todos 29 97 - [x] assert that keys are ordered and fail if not 30 30 - - [ ] verify node mst depth from key (possibly pending [interop test fixes](https://github.com/bluesky-social/atproto-interop-tests/issues/5)) 98 98 + - [x] verify node mst depth from key (possibly pending [interop test fixes](https://github.com/bluesky-social/atproto-interop-tests/issues/5)) 31 99 - [ ] performance todos 32 100 - [x] consume the serialized nodes into a mutable efficient format 33 101 - [ ] maybe customize the deserialize impl to do that directly?

+221

src/disk.rs

··· 1 1 + /*! 2 2 + Disk storage for blocks on disk 3 3 + 4 4 + Currently this uses sqlite. In testing sqlite wasn't the fastest, but it seemed 5 5 + to be the best behaved in terms of both on-disk space usage and memory usage. 6 6 + 7 7 + ```no_run 8 8 + # use repo_stream::{DiskBuilder, DiskError}; 9 9 + # #[tokio::main] 10 10 + # async fn main() -> Result<(), DiskError> { 11 11 + let store = DiskBuilder::new() 12 12 + .with_cache_size_mb(32) 13 13 + .with_max_stored_mb(1024) // errors when >1GiB of processed blocks are inserted 14 14 + .open("/some/path.db".into()).await?; 15 15 + # Ok(()) 16 16 + # } 17 17 + ``` 18 18 + */ 19 19 + 20 20 + use crate::drive::DriveError; 21 21 + use rusqlite::OptionalExtension; 22 22 + use std::path::PathBuf; 23 23 + 24 24 + #[derive(Debug, thiserror::Error)] 25 25 + pub enum DiskError { 26 26 + /// A wrapped database error 27 27 + /// 28 28 + /// (The wrapped err should probably be obscured to remove public-facing 29 29 + /// sqlite bits) 30 30 + #[error(transparent)] 31 31 + DbError(#[from] rusqlite::Error), 32 32 + /// A tokio blocking task failed to join 33 33 + #[error("Failed to join a tokio blocking task: {0}")] 34 34 + JoinError(#[from] tokio::task::JoinError), 35 35 + /// The total size of stored blocks exceeded the allowed size 36 36 + /// 37 37 + /// If you need to process *really* big CARs, you can configure a higher 38 38 + /// limit. 39 39 + #[error("Maximum disk size reached")] 40 40 + MaxSizeExceeded, 41 41 + #[error("this error was replaced, seeing this is a bug.")] 42 42 + #[doc(hidden)] 43 43 + Stolen, 44 44 + } 45 45 + 46 46 + impl DiskError { 47 47 + /// hack for ownership challenges with the disk driver 48 48 + pub(crate) fn steal(&mut self) -> Self { 49 49 + let mut swapped = DiskError::Stolen; 50 50 + std::mem::swap(self, &mut swapped); 51 51 + swapped 52 52 + } 53 53 + } 54 54 + 55 55 + /// Builder-style disk store setup 56 56 + #[derive(Debug, Clone)] 57 57 + pub struct DiskBuilder { 58 58 + /// Database in-memory cache allowance 59 59 + /// 60 60 + /// Default: 32 MiB 61 61 + pub cache_size_mb: usize, 62 62 + /// Database stored block size limit 63 63 + /// 64 64 + /// Default: 10 GiB 65 65 + /// 66 66 + /// Note: actual size on disk may be more, but should approximately scale 67 67 + /// with this limit 68 68 + pub max_stored_mb: usize, 69 69 + } 70 70 + 71 71 + impl Default for DiskBuilder { 72 72 + fn default() -> Self { 73 73 + Self { 74 74 + cache_size_mb: 32, 75 75 + max_stored_mb: 10 * 1024, // 10 GiB 76 76 + } 77 77 + } 78 78 + } 79 79 + 80 80 + impl DiskBuilder { 81 81 + /// Begin configuring the storage with defaults 82 82 + pub fn new() -> Self { 83 83 + Default::default() 84 84 + } 85 85 + /// Set the in-memory cache allowance for the database 86 86 + /// 87 87 + /// Default: 32 MiB 88 88 + pub fn with_cache_size_mb(mut self, size: usize) -> Self { 89 89 + self.cache_size_mb = size; 90 90 + self 91 91 + } 92 92 + /// Set the approximate stored block size limit 93 93 + /// 94 94 + /// Default: 10 GiB 95 95 + pub fn with_max_stored_mb(mut self, max: usize) -> Self { 96 96 + self.max_stored_mb = max; 97 97 + self 98 98 + } 99 99 + /// Open and initialize the actual disk storage 100 100 + pub async fn open(&self, path: PathBuf) -> Result<DiskStore, DiskError> { 101 101 + DiskStore::new(path, self.cache_size_mb, self.max_stored_mb).await 102 102 + } 103 103 + } 104 104 + 105 105 + /// On-disk block storage 106 106 + pub struct DiskStore { 107 107 + conn: rusqlite::Connection, 108 108 + max_stored: usize, 109 109 + stored: usize, 110 110 + } 111 111 + 112 112 + impl DiskStore { 113 113 + /// Initialize a new disk store 114 114 + pub async fn new( 115 115 + path: PathBuf, 116 116 + cache_mb: usize, 117 117 + max_stored_mb: usize, 118 118 + ) -> Result<Self, DiskError> { 119 119 + let max_stored = max_stored_mb * 2_usize.pow(20); 120 120 + let conn = tokio::task::spawn_blocking(move || { 121 121 + let conn = rusqlite::Connection::open(path)?; 122 122 + 123 123 + let sqlite_one_mb = -(2_i64.pow(10)); // negative is kibibytes for sqlite cache_size 124 124 + 125 125 + // conn.pragma_update(None, "journal_mode", "OFF")?; 126 126 + // conn.pragma_update(None, "journal_mode", "MEMORY")?; 127 127 + conn.pragma_update(None, "journal_mode", "WAL")?; 128 128 + // conn.pragma_update(None, "wal_autocheckpoint", "0")?; // this lets things get a bit big on disk 129 129 + conn.pragma_update(None, "synchronous", "OFF")?; 130 130 + conn.pragma_update( 131 131 + None, 132 132 + "cache_size", 133 133 + (cache_mb as i64 * sqlite_one_mb).to_string(), 134 134 + )?; 135 135 + Self::reset_tables(&conn)?; 136 136 + 137 137 + Ok::<_, DiskError>(conn) 138 138 + }) 139 139 + .await??; 140 140 + 141 141 + Ok(Self { 142 142 + conn, 143 143 + max_stored, 144 144 + stored: 0, 145 145 + }) 146 146 + } 147 147 + pub(crate) fn get_writer(&'_ mut self) -> Result<SqliteWriter<'_>, DiskError> { 148 148 + let tx = self.conn.transaction()?; 149 149 + Ok(SqliteWriter { 150 150 + tx, 151 151 + stored: &mut self.stored, 152 152 + max: self.max_stored, 153 153 + }) 154 154 + } 155 155 + pub(crate) fn get_reader<'conn>(&'conn self) -> Result<SqliteReader<'conn>, DiskError> { 156 156 + let select_stmt = self.conn.prepare("SELECT val FROM blocks WHERE key = ?1")?; 157 157 + Ok(SqliteReader { select_stmt }) 158 158 + } 159 159 + /// Drop and recreate the kv table 160 160 + pub async fn reset(self) -> Result<Self, DiskError> { 161 161 + tokio::task::spawn_blocking(move || { 162 162 + Self::reset_tables(&self.conn)?; 163 163 + Ok(self) 164 164 + }) 165 165 + .await? 166 166 + } 167 167 + fn reset_tables(conn: &rusqlite::Connection) -> Result<(), DiskError> { 168 168 + conn.execute("DROP TABLE IF EXISTS blocks", ())?; 169 169 + conn.execute( 170 170 + "CREATE TABLE blocks ( 171 171 + key BLOB PRIMARY KEY NOT NULL, 172 172 + val BLOB NOT NULL 173 173 + ) WITHOUT ROWID", 174 174 + (), 175 175 + )?; 176 176 + Ok(()) 177 177 + } 178 178 + } 179 179 + 180 180 + pub(crate) struct SqliteWriter<'conn> { 181 181 + tx: rusqlite::Transaction<'conn>, 182 182 + stored: &'conn mut usize, 183 183 + max: usize, 184 184 + } 185 185 + 186 186 + impl SqliteWriter<'_> { 187 187 + pub(crate) fn put_many( 188 188 + &mut self, 189 189 + kv: impl Iterator<Item = Result<(Vec<u8>, Vec<u8>), DriveError>>, 190 190 + ) -> Result<(), DriveError> { 191 191 + let mut insert_stmt = self 192 192 + .tx 193 193 + .prepare_cached("INSERT INTO blocks (key, val) VALUES (?1, ?2)") 194 194 + .map_err(DiskError::DbError)?; 195 195 + for pair in kv { 196 196 + let (k, v) = pair?; 197 197 + *self.stored += v.len(); 198 198 + if *self.stored > self.max { 199 199 + return Err(DiskError::MaxSizeExceeded.into()); 200 200 + } 201 201 + insert_stmt.execute((k, v)).map_err(DiskError::DbError)?; 202 202 + } 203 203 + Ok(()) 204 204 + } 205 205 + pub fn commit(self) -> Result<(), DiskError> { 206 206 + self.tx.commit()?; 207 207 + Ok(()) 208 208 + } 209 209 + } 210 210 + 211 211 + pub(crate) struct SqliteReader<'conn> { 212 212 + select_stmt: rusqlite::Statement<'conn>, 213 213 + } 214 214 + 215 215 + impl SqliteReader<'_> { 216 216 + pub(crate) fn get(&mut self, key: Vec<u8>) -> rusqlite::Result<Option<Vec<u8>>> { 217 217 + self.select_stmt 218 218 + .query_one((&key,), |row| row.get(0)) 219 219 + .optional() 220 220 + } 221 221 + }

+561 -109

src/drive.rs

··· 1 1 - use futures::{Stream, TryStreamExt}; 1 1 + //! Consume a CAR from an AsyncRead, producing an ordered stream of records 2 2 + 3 3 + use crate::disk::{DiskError, DiskStore}; 4 4 + use crate::process::Processable; 2 5 use ipld_core::cid::Cid; 6 6 + use iroh_car::CarReader; 7 7 + use serde::{Deserialize, Serialize}; 3 8 use std::collections::HashMap; 4 4 - use std::error::Error; 9 9 + use std::convert::Infallible; 10 10 + use tokio::{io::AsyncRead, sync::mpsc}; 5 11 6 12 use crate::mst::{Commit, Node}; 7 7 - use crate::walk::{Step, Trip, Walker}; 13 13 + use crate::walk::{Step, WalkError, Walker}; 8 14 15 15 + /// Errors that can happen while consuming and emitting blocks and records 9 16 #[derive(Debug, thiserror::Error)] 10 10 - pub enum DriveError<E: Error> { 11 11 - #[error("Failed to initialize CarReader: {0}")] 17 17 + pub enum DriveError { 18 18 + #[error("Error from iroh_car: {0}")] 12 19 CarReader(#[from] iroh_car::Error), 13 13 - #[error("Car block stream error: {0}")] 14 14 - CarBlockError(Box<dyn Error>), 15 20 #[error("Failed to decode commit block: {0}")] 16 16 - BadCommit(Box<dyn Error>), 21 21 + BadBlock(#[from] serde_ipld_dagcbor::DecodeError<Infallible>), 17 22 #[error("The Commit block reference by the root was not found")] 18 23 MissingCommit, 19 24 #[error("The MST block {0} could not be found")] 20 25 MissingBlock(Cid), 21 26 #[error("Failed to walk the mst tree: {0}")] 22 22 - Tripped(#[from] Trip<E>), 23 23 - #[error("Encountered an rkey out of order while walking the MST")] 24 24 - RkeyOutOfOrder, 27 27 + WalkError(#[from] WalkError), 28 28 + #[error("CAR file had no roots")] 29 29 + MissingRoot, 30 30 + #[error("Storage error")] 31 31 + StorageError(#[from] DiskError), 32 32 + #[error("Encode error: {0}")] 33 33 + BincodeEncodeError(#[from] bincode::error::EncodeError), 34 34 + #[error("Tried to send on a closed channel")] 35 35 + ChannelSendError, // SendError takes <T> which we don't need 36 36 + #[error("Failed to join a task: {0}")] 37 37 + JoinError(#[from] tokio::task::JoinError), 25 38 } 26 39 27 27 - type CarBlock<E> = Result<(Cid, Vec<u8>), E>; 40 40 + #[derive(Debug, thiserror::Error)] 41 41 + pub enum DecodeError { 42 42 + #[error(transparent)] 43 43 + BincodeDecodeError(#[from] bincode::error::DecodeError), 44 44 + #[error("extra bytes remained after decoding")] 45 45 + ExtraGarbage, 46 46 + } 28 47 29 29 - #[derive(Debug)] 30 30 - pub struct Rkey(pub String); 48 48 + /// An in-order chunk of Rkey + (processed) Block pairs 49 49 + pub type BlockChunk<T> = Vec<(String, T)>; 31 50 32 32 - #[derive(Debug)] 33 33 - pub enum MaybeProcessedBlock<T, E> { 51 51 + #[derive(Debug, Clone, Serialize, Deserialize)] 52 52 + pub(crate) enum MaybeProcessedBlock<T> { 34 53 /// A block that's *probably* a Node (but we can't know yet) 35 54 /// 36 55 /// It *can be* a record that suspiciously looks a lot like a node, so we ··· 49 68 /// If we _never_ needed this block, then we may have wasted a bit of effort 50 69 /// trying to process it. Oh well. 51 70 /// 52 52 - /// It would be nice to store the real error type from the processing 53 53 - /// function, but I'm leaving that generics puzzle for later. 54 54 - /// 55 71 /// There's an alternative here, which would be to kick unprocessable blocks 56 72 /// back to Raw, or maybe even a new RawUnprocessable variant. Then we could 57 73 /// surface the typed error later if needed by trying to reprocess. 58 58 - Processed(Result<T, E>), 74 74 + Processed(T), 59 75 } 60 76 61 61 - // TODO: generic error not box dyn nonsense. 62 62 - pub type ProcRes<T, E> = Result<T, E>; 77 77 + impl<T: Processable> Processable for MaybeProcessedBlock<T> { 78 78 + /// TODO this is probably a little broken 79 79 + fn get_size(&self) -> usize { 80 80 + use std::{cmp::max, mem::size_of}; 81 81 + 82 82 + // enum is always as big as its biggest member? 83 83 + let base_size = max(size_of::<Vec<u8>>(), size_of::<T>()); 84 84 + 85 85 + let extra = match self { 86 86 + Self::Raw(bytes) => bytes.len(), 87 87 + Self::Processed(t) => t.get_size(), 88 88 + }; 89 89 + 90 90 + base_size + extra 91 91 + } 92 92 + } 93 93 + 94 94 + impl<T> MaybeProcessedBlock<T> { 95 95 + fn maybe(process: fn(Vec<u8>) -> T, data: Vec<u8>) -> Self { 96 96 + if Node::could_be(&data) { 97 97 + MaybeProcessedBlock::Raw(data) 98 98 + } else { 99 99 + MaybeProcessedBlock::Processed(process(data)) 100 100 + } 101 101 + } 102 102 + } 63 103 64 64 - pub struct Vehicle<SE, S, T, P, PE> 65 65 - where 66 66 - S: Stream<Item = CarBlock<SE>>, 67 67 - P: Fn(&[u8]) -> ProcRes<T, PE>, 68 68 - PE: Error, 69 69 - { 70 70 - block_stream: S, 71 71 - blocks: HashMap<Cid, MaybeProcessedBlock<T, PE>>, 72 72 - walker: Walker, 73 73 - process: P, 74 74 - prev_rkey: String, 104 104 + /// Read a CAR file, buffering blocks in memory or to disk 105 105 + pub enum Driver<R: AsyncRead + Unpin, T: Processable> { 106 106 + /// All blocks fit within the memory limit 107 107 + /// 108 108 + /// You probably want to check the commit's signature. You can go ahead and 109 109 + /// walk the MST right away. 110 110 + Memory(Commit, MemDriver<T>), 111 111 + /// Blocks exceed the memory limit 112 112 + /// 113 113 + /// You'll need to provide a disk storage to continue. The commit will be 114 114 + /// returned and can be validated only once all blocks are loaded. 115 115 + Disk(NeedDisk<R, T>), 116 116 + } 117 117 + 118 118 + /// Builder-style driver setup 119 119 + #[derive(Debug, Clone)] 120 120 + pub struct DriverBuilder { 121 121 + pub mem_limit_mb: usize, 122 122 + } 123 123 + 124 124 + impl Default for DriverBuilder { 125 125 + fn default() -> Self { 126 126 + Self { mem_limit_mb: 16 } 127 127 + } 128 128 + } 129 129 + 130 130 + impl DriverBuilder { 131 131 + /// Begin configuring the driver with defaults 132 132 + pub fn new() -> Self { 133 133 + Default::default() 134 134 + } 135 135 + /// Set the in-memory size limit, in MiB 136 136 + /// 137 137 + /// Default: 16 MiB 138 138 + pub fn with_mem_limit_mb(self, new_limit: usize) -> Self { 139 139 + Self { 140 140 + mem_limit_mb: new_limit, 141 141 + } 142 142 + } 143 143 + /// Set the block processor 144 144 + /// 145 145 + /// Default: noop, raw blocks will be emitted 146 146 + pub fn with_block_processor<T: Processable>( 147 147 + self, 148 148 + p: fn(Vec<u8>) -> T, 149 149 + ) -> DriverBuilderWithProcessor<T> { 150 150 + DriverBuilderWithProcessor { 151 151 + mem_limit_mb: self.mem_limit_mb, 152 152 + block_processor: p, 153 153 + } 154 154 + } 155 155 + /// Begin processing an atproto MST from a CAR file 156 156 + pub async fn load_car<R: AsyncRead + Unpin>( 157 157 + &self, 158 158 + reader: R, 159 159 + ) -> Result<Driver<R, Vec<u8>>, DriveError> { 160 160 + Driver::load_car(reader, crate::process::noop, self.mem_limit_mb).await 161 161 + } 162 162 + } 163 163 + 164 164 + /// Builder-style driver intermediate step 165 165 + /// 166 166 + /// start from `DriverBuilder` 167 167 + #[derive(Debug, Clone)] 168 168 + pub struct DriverBuilderWithProcessor<T: Processable> { 169 169 + pub mem_limit_mb: usize, 170 170 + pub block_processor: fn(Vec<u8>) -> T, 171 171 + } 172 172 + 173 173 + impl<T: Processable> DriverBuilderWithProcessor<T> { 174 174 + /// Set the in-memory size limit, in MiB 175 175 + /// 176 176 + /// Default: 16 MiB 177 177 + pub fn with_mem_limit_mb(mut self, new_limit: usize) -> Self { 178 178 + self.mem_limit_mb = new_limit; 179 179 + self 180 180 + } 181 181 + /// Begin processing an atproto MST from a CAR file 182 182 + pub async fn load_car<R: AsyncRead + Unpin>( 183 183 + &self, 184 184 + reader: R, 185 185 + ) -> Result<Driver<R, T>, DriveError> { 186 186 + Driver::load_car(reader, self.block_processor, self.mem_limit_mb).await 187 187 + } 75 188 } 76 189 77 77 - impl<SE, S, T: Clone, P, PE> Vehicle<SE, S, T, P, PE> 78 78 - where 79 79 - SE: Error + 'static, 80 80 - S: Stream<Item = CarBlock<SE>> + Unpin, 81 81 - P: Fn(&[u8]) -> ProcRes<T, PE>, 82 82 - PE: Error, 83 83 - { 84 84 - pub async fn init( 85 85 - root: Cid, 86 86 - mut block_stream: S, 87 87 - process: P, 88 88 - ) -> Result<(Commit, Self), DriveError<PE>> { 89 89 - let mut blocks = HashMap::new(); 190 190 + impl<R: AsyncRead + Unpin, T: Processable> Driver<R, T> { 191 191 + /// Begin processing an atproto MST from a CAR file 192 192 + /// 193 193 + /// Blocks will be loaded, processed, and buffered in memory. If the entire 194 194 + /// processed size is under the `mem_limit_mb` limit, a `Driver::Memory` 195 195 + /// will be returned along with a `Commit` ready for validation. 196 196 + /// 197 197 + /// If the `mem_limit_mb` limit is reached before loading all blocks, the 198 198 + /// partial state will be returned as `Driver::Disk(needed)`, which can be 199 199 + /// resumed by providing a `SqliteStorage` for on-disk block storage. 200 200 + pub async fn load_car( 201 201 + reader: R, 202 202 + process: fn(Vec<u8>) -> T, 203 203 + mem_limit_mb: usize, 204 204 + ) -> Result<Driver<R, T>, DriveError> { 205 205 + let max_size = mem_limit_mb * 2_usize.pow(20); 206 206 + let mut mem_blocks = HashMap::new(); 207 207 + 208 208 + let mut car = CarReader::new(reader).await?; 209 209 + 210 210 + let root = *car 211 211 + .header() 212 212 + .roots() 213 213 + .first() 214 214 + .ok_or(DriveError::MissingRoot)?; 215 215 + log::debug!("root: {root:?}"); 90 216 91 217 let mut commit = None; 92 218 93 93 - while let Some((cid, data)) = block_stream 94 94 - .try_next() 95 95 - .await 96 96 - .map_err(|e| DriveError::CarBlockError(e.into()))? 97 97 - { 219 219 + // try to load all the blocks into memory 220 220 + let mut mem_size = 0; 221 221 + while let Some((cid, data)) = car.next_block().await? { 222 222 + // the root commit is a Special Third Kind of block that we need to make 223 223 + // sure not to optimistically send to the processing function 98 224 if cid == root { 99 99 - let c: Commit = serde_ipld_dagcbor::from_slice(&data) 100 100 - .map_err(|e| DriveError::BadCommit(e.into()))?; 225 225 + let c: Commit = serde_ipld_dagcbor::from_slice(&data)?; 101 226 commit = Some(c); 102 102 - break; 103 103 - } else { 104 104 - blocks.insert( 105 105 - cid, 106 106 - if Node::could_be(&data) { 107 107 - MaybeProcessedBlock::Raw(data) 108 108 - } else { 109 109 - MaybeProcessedBlock::Processed(process(&data)) 110 110 - }, 111 111 - ); 227 227 + continue; 228 228 + } 229 229 + 230 230 + // remaining possible types: node, record, other. optimistically process 231 231 + let maybe_processed = MaybeProcessedBlock::maybe(process, data); 232 232 + 233 233 + // stash (maybe processed) blocks in memory as long as we have room 234 234 + mem_size += std::mem::size_of::<Cid>() + maybe_processed.get_size(); 235 235 + mem_blocks.insert(cid, maybe_processed); 236 236 + if mem_size >= max_size { 237 237 + return Ok(Driver::Disk(NeedDisk { 238 238 + car, 239 239 + root, 240 240 + process, 241 241 + max_size, 242 242 + mem_blocks, 243 243 + commit, 244 244 + })); 112 245 } 113 246 } 114 247 115 115 - // we either broke out or read all the blocks without finding the commit... 248 248 + // all blocks loaded and we fit in memory! hopefully we found the commit... 116 249 let commit = commit.ok_or(DriveError::MissingCommit)?; 117 250 118 251 let walker = Walker::new(commit.data); 119 252 120 120 - let me = Self { 121 121 - block_stream, 122 122 - blocks, 123 123 - walker, 124 124 - process, 125 125 - prev_rkey: "".to_string(), 126 126 - }; 127 127 - Ok((commit, me)) 253 253 + Ok(Driver::Memory( 254 254 + commit, 255 255 + MemDriver { 256 256 + blocks: mem_blocks, 257 257 + walker, 258 258 + process, 259 259 + }, 260 260 + )) 128 261 } 262 262 + } 129 263 130 130 - async fn drive_until(&mut self, cid_needed: Cid) -> Result<(), DriveError<PE>> { 131 131 - while let Some((cid, data)) = self 132 132 - .block_stream 133 133 - .try_next() 134 134 - .await 135 135 - .map_err(|e| DriveError::CarBlockError(e.into()))? 136 136 - { 137 137 - self.blocks.insert( 138 138 - cid, 139 139 - if Node::could_be(&data) { 140 140 - MaybeProcessedBlock::Raw(data) 141 141 - } else { 142 142 - MaybeProcessedBlock::Processed((self.process)(&data)) 143 143 - }, 144 144 - ); 145 145 - if cid == cid_needed { 146 146 - return Ok(()); 147 147 - } 264 264 + /// The core driver between the block stream and MST walker 265 265 + /// 266 266 + /// In the future, PDSs will export CARs in a stream-friendly order that will 267 267 + /// enable processing them with tiny memory overhead. But that future is not 268 268 + /// here yet. 269 269 + /// 270 270 + /// CARs are almost always in a stream-unfriendly order, so I'm reverting the 271 271 + /// optimistic stream features: we load all block first, then walk the MST. 272 272 + /// 273 273 + /// This makes things much simpler: we only need to worry about spilling to disk 274 274 + /// in one place, and we always have a reasonable expecatation about how much 275 275 + /// work the init function will do. We can drop the CAR reader before walking, 276 276 + /// so the sync/async boundaries become a little easier to work around. 277 277 + #[derive(Debug)] 278 278 + pub struct MemDriver<T: Processable> { 279 279 + blocks: HashMap<Cid, MaybeProcessedBlock<T>>, 280 280 + walker: Walker, 281 281 + process: fn(Vec<u8>) -> T, 282 282 + } 283 283 + 284 284 + impl<T: Processable> MemDriver<T> { 285 285 + /// Step through the record outputs, in rkey order 286 286 + pub async fn next_chunk(&mut self, n: usize) -> Result<Option<BlockChunk<T>>, DriveError> { 287 287 + let mut out = Vec::with_capacity(n); 288 288 + for _ in 0..n { 289 289 + // walk as far as we can until we run out of blocks or find a record 290 290 + match self.walker.step(&mut self.blocks, self.process)? { 291 291 + Step::Missing(cid) => return Err(DriveError::MissingBlock(cid)), 292 292 + Step::Finish => break, 293 293 + Step::Found { rkey, data } => { 294 294 + out.push((rkey, data)); 295 295 + continue; 296 296 + } 297 297 + }; 148 298 } 149 299 150 150 - // if we never found the block 151 151 - Err(DriveError::MissingBlock(cid_needed)) 300 300 + if out.is_empty() { 301 301 + Ok(None) 302 302 + } else { 303 303 + Ok(Some(out)) 304 304 + } 152 305 } 306 306 + } 153 307 154 154 - pub async fn next_record(&mut self) -> Result<Option<(Rkey, T)>, DriveError<PE>> { 308 308 + /// A partially memory-loaded car file that needs disk spillover to continue 309 309 + pub struct NeedDisk<R: AsyncRead + Unpin, T: Processable> { 310 310 + car: CarReader<R>, 311 311 + root: Cid, 312 312 + process: fn(Vec<u8>) -> T, 313 313 + max_size: usize, 314 314 + mem_blocks: HashMap<Cid, MaybeProcessedBlock<T>>, 315 315 + pub commit: Option<Commit>, 316 316 + } 317 317 + 318 318 + fn encode(v: impl Serialize) -> Result<Vec<u8>, bincode::error::EncodeError> { 319 319 + bincode::serde::encode_to_vec(v, bincode::config::standard()) 320 320 + } 321 321 + 322 322 + pub(crate) fn decode<T: Processable>(bytes: &[u8]) -> Result<T, DecodeError> { 323 323 + let (t, n) = bincode::serde::decode_from_slice(bytes, bincode::config::standard())?; 324 324 + if n != bytes.len() { 325 325 + return Err(DecodeError::ExtraGarbage); 326 326 + } 327 327 + Ok(t) 328 328 + } 329 329 + 330 330 + impl<R: AsyncRead + Unpin, T: Processable + Send + 'static> NeedDisk<R, T> { 331 331 + pub async fn finish_loading( 332 332 + mut self, 333 333 + mut store: DiskStore, 334 334 + ) -> Result<(Commit, DiskDriver<T>), DriveError> { 335 335 + // move store in and back out so we can manage lifetimes 336 336 + // dump mem blocks into the store 337 337 + store = tokio::task::spawn(async move { 338 338 + let mut writer = store.get_writer()?; 339 339 + 340 340 + let kvs = self 341 341 + .mem_blocks 342 342 + .into_iter() 343 343 + .map(|(k, v)| Ok(encode(v).map(|v| (k.to_bytes(), v))?)); 344 344 + 345 345 + writer.put_many(kvs)?; 346 346 + writer.commit()?; 347 347 + Ok::<_, DriveError>(store) 348 348 + }) 349 349 + .await??; 350 350 + 351 351 + let (tx, mut rx) = mpsc::channel::<Vec<(Cid, MaybeProcessedBlock<T>)>>(1); 352 352 + 353 353 + let store_worker = tokio::task::spawn_blocking(move || { 354 354 + let mut writer = store.get_writer()?; 355 355 + 356 356 + while let Some(chunk) = rx.blocking_recv() { 357 357 + let kvs = chunk 358 358 + .into_iter() 359 359 + .map(|(k, v)| Ok(encode(v).map(|v| (k.to_bytes(), v))?)); 360 360 + writer.put_many(kvs)?; 361 361 + } 362 362 + 363 363 + writer.commit()?; 364 364 + Ok::<_, DriveError>(store) 365 365 + }); // await later 366 366 + 367 367 + // dump the rest to disk (in chunks) 368 368 + log::debug!("dumping the rest of the stream..."); 155 369 loop { 156 156 - // walk as far as we can until we run out of blocks or find a record 157 157 - let cid_needed = match self.walker.walk(&mut self.blocks, &self.process)? { 158 158 - Step::Rest(cid) => cid, 159 159 - Step::Finish => return Ok(None), 160 160 - Step::Step { rkey, data } => { 161 161 - if rkey <= self.prev_rkey { 162 162 - return Err(DriveError::RkeyOutOfOrder); 370 370 + let mut mem_size = 0; 371 371 + let mut chunk = vec![]; 372 372 + loop { 373 373 + let Some((cid, data)) = self.car.next_block().await? else { 374 374 + break; 375 375 + }; 376 376 + // we still gotta keep checking for the root since we might not have it 377 377 + if cid == self.root { 378 378 + let c: Commit = serde_ipld_dagcbor::from_slice(&data)?; 379 379 + self.commit = Some(c); 380 380 + continue; 381 381 + } 382 382 + // remaining possible types: node, record, other. optimistically process 383 383 + // TODO: get the actual in-memory size to compute disk spill 384 384 + let maybe_processed = MaybeProcessedBlock::maybe(self.process, data); 385 385 + mem_size += std::mem::size_of::<Cid>() + maybe_processed.get_size(); 386 386 + chunk.push((cid, maybe_processed)); 387 387 + if mem_size >= self.max_size { 388 388 + // soooooo if we're setting the db cache to max_size and then letting 389 389 + // multiple chunks in the queue that are >= max_size, then at any time 390 390 + // we might be using some multiple of max_size? 391 391 + break; 392 392 + } 393 393 + } 394 394 + if chunk.is_empty() { 395 395 + break; 396 396 + } 397 397 + tx.send(chunk) 398 398 + .await 399 399 + .map_err(|_| DriveError::ChannelSendError)?; 400 400 + } 401 401 + drop(tx); 402 402 + log::debug!("done. waiting for worker to finish..."); 403 403 + 404 404 + store = store_worker.await??; 405 405 + 406 406 + log::debug!("worker finished."); 407 407 + 408 408 + let commit = self.commit.ok_or(DriveError::MissingCommit)?; 409 409 + 410 410 + let walker = Walker::new(commit.data); 411 411 + 412 412 + Ok(( 413 413 + commit, 414 414 + DiskDriver { 415 415 + process: self.process, 416 416 + state: Some(BigState { store, walker }), 417 417 + }, 418 418 + )) 419 419 + } 420 420 + } 421 421 + 422 422 + struct BigState { 423 423 + store: DiskStore, 424 424 + walker: Walker, 425 425 + } 426 426 + 427 427 + /// MST walker that reads from disk instead of an in-memory hashmap 428 428 + pub struct DiskDriver<T: Clone> { 429 429 + process: fn(Vec<u8>) -> T, 430 430 + state: Option<BigState>, 431 431 + } 432 432 + 433 433 + // for doctests only 434 434 + #[doc(hidden)] 435 435 + pub fn _get_fake_disk_driver() -> DiskDriver<Vec<u8>> { 436 436 + use crate::process::noop; 437 437 + DiskDriver { 438 438 + process: noop, 439 439 + state: None, 440 440 + } 441 441 + } 442 442 + 443 443 + impl<T: Processable + Send + 'static> DiskDriver<T> { 444 444 + /// Walk the MST returning up to `n` rkey + record pairs 445 445 + /// 446 446 + /// ```no_run 447 447 + /// # use repo_stream::{drive::{DiskDriver, DriveError, _get_fake_disk_driver}, process::noop}; 448 448 + /// # #[tokio::main] 449 449 + /// # async fn main() -> Result<(), DriveError> { 450 450 + /// # let mut disk_driver = _get_fake_disk_driver(); 451 451 + /// while let Some(pairs) = disk_driver.next_chunk(256).await? { 452 452 + /// for (rkey, record) in pairs { 453 453 + /// println!("{rkey}: size={}", record.len()); 454 454 + /// } 455 455 + /// } 456 456 + /// let store = disk_driver.reset_store().await?; 457 457 + /// # Ok(()) 458 458 + /// # } 459 459 + /// ``` 460 460 + pub async fn next_chunk(&mut self, n: usize) -> Result<Option<BlockChunk<T>>, DriveError> { 461 461 + let process = self.process; 462 462 + 463 463 + // state should only *ever* be None transiently while inside here 464 464 + let mut state = self.state.take().expect("DiskDriver must have Some(state)"); 465 465 + 466 466 + // the big pain here is that we don't want to leave self.state in an 467 467 + // invalid state (None), so all the error paths have to make sure it 468 468 + // comes out again. 469 469 + let (state, res) = tokio::task::spawn_blocking( 470 470 + move || -> (BigState, Result<BlockChunk<T>, DriveError>) { 471 471 + let mut reader_res = state.store.get_reader(); 472 472 + let reader: &mut _ = match reader_res { 473 473 + Ok(ref mut r) => r, 474 474 + Err(ref mut e) => { 475 475 + // unfortunately we can't return the error directly because 476 476 + // (for some reason) it's attached to the lifetime of the 477 477 + // reader? 478 478 + // hack a mem::swap so we can get it out :/ 479 479 + let e_swapped = e.steal(); 480 480 + // the pain: `state` *has to* outlive the reader 481 481 + drop(reader_res); 482 482 + return (state, Err(e_swapped.into())); 163 483 } 164 164 - return Ok(Some((Rkey(rkey), data))); 484 484 + }; 485 485 + 486 486 + let mut out = Vec::with_capacity(n); 487 487 + 488 488 + for _ in 0..n { 489 489 + // walk as far as we can until we run out of blocks or find a record 490 490 + let step = match state.walker.disk_step(reader, process) { 491 491 + Ok(s) => s, 492 492 + Err(e) => { 493 493 + // the pain: `state` *has to* outlive the reader 494 494 + drop(reader_res); 495 495 + return (state, Err(e.into())); 496 496 + } 497 497 + }; 498 498 + match step { 499 499 + Step::Missing(cid) => { 500 500 + // the pain: `state` *has to* outlive the reader 501 501 + drop(reader_res); 502 502 + return (state, Err(DriveError::MissingBlock(cid))); 503 503 + } 504 504 + Step::Finish => break, 505 505 + Step::Found { rkey, data } => out.push((rkey, data)), 506 506 + }; 165 507 } 166 166 - }; 508 508 + 509 509 + // `state` *has to* outlive the reader 510 510 + drop(reader_res); 511 511 + 512 512 + (state, Ok::<_, DriveError>(out)) 513 513 + }, 514 514 + ) 515 515 + .await?; // on tokio JoinError, we'll be left with invalid state :( 516 516 + 517 517 + // *must* restore state before dealing with the actual result 518 518 + self.state = Some(state); 519 519 + 520 520 + let out = res?; 521 521 + 522 522 + if out.is_empty() { 523 523 + Ok(None) 524 524 + } else { 525 525 + Ok(Some(out)) 526 526 + } 527 527 + } 528 528 + 529 529 + fn read_tx_blocking( 530 530 + &mut self, 531 531 + n: usize, 532 532 + tx: mpsc::Sender<Result<BlockChunk<T>, DriveError>>, 533 533 + ) -> Result<(), mpsc::error::SendError<Result<BlockChunk<T>, DriveError>>> { 534 534 + let BigState { store, walker } = self.state.as_mut().expect("valid state"); 535 535 + let mut reader = match store.get_reader() { 536 536 + Ok(r) => r, 537 537 + Err(e) => return tx.blocking_send(Err(e.into())), 538 538 + }; 539 539 + 540 540 + loop { 541 541 + let mut out: BlockChunk<T> = Vec::with_capacity(n); 542 542 + 543 543 + for _ in 0..n { 544 544 + // walk as far as we can until we run out of blocks or find a record 545 545 + 546 546 + let step = match walker.disk_step(&mut reader, self.process) { 547 547 + Ok(s) => s, 548 548 + Err(e) => return tx.blocking_send(Err(e.into())), 549 549 + }; 550 550 + 551 551 + match step { 552 552 + Step::Missing(cid) => { 553 553 + return tx.blocking_send(Err(DriveError::MissingBlock(cid))); 554 554 + } 555 555 + Step::Finish => return Ok(()), 556 556 + Step::Found { rkey, data } => { 557 557 + out.push((rkey, data)); 558 558 + continue; 559 559 + } 560 560 + }; 561 561 + } 167 562 168 168 - // load blocks until we reach that cid 169 169 - self.drive_until(cid_needed).await?; 563 563 + if out.is_empty() { 564 564 + break; 565 565 + } 566 566 + tx.blocking_send(Ok(out))?; 170 567 } 568 568 + 569 569 + Ok(()) 171 570 } 172 571 173 173 - pub fn stream(self) -> impl Stream<Item = Result<(Rkey, T), DriveError<PE>>> { 174 174 - futures::stream::try_unfold(self, |mut this| async move { 175 175 - let maybe_record = this.next_record().await?; 176 176 - Ok(maybe_record.map(|b| (b, this))) 177 177 - }) 572 572 + /// Spawn the disk reading task into a tokio blocking thread 573 573 + /// 574 574 + /// The idea is to avoid so much sending back and forth to the blocking 575 575 + /// thread, letting a blocking task do all the disk reading work and sending 576 576 + /// records and rkeys back through an `mpsc` channel instead. 577 577 + /// 578 578 + /// This might also allow the disk work to continue while processing the 579 579 + /// records. It's still not yet clear if this method actually has much 580 580 + /// benefit over just using `.next_chunk(n)`. 581 581 + /// 582 582 + /// ```no_run 583 583 + /// # use repo_stream::{drive::{DiskDriver, DriveError, _get_fake_disk_driver}, process::noop}; 584 584 + /// # #[tokio::main] 585 585 + /// # async fn main() -> Result<(), DriveError> { 586 586 + /// # let mut disk_driver = _get_fake_disk_driver(); 587 587 + /// let (mut rx, join) = disk_driver.to_channel(512); 588 588 + /// while let Some(recvd) = rx.recv().await { 589 589 + /// let pairs = recvd?; 590 590 + /// for (rkey, record) in pairs { 591 591 + /// println!("{rkey}: size={}", record.len()); 592 592 + /// } 593 593 + /// 594 594 + /// } 595 595 + /// let store = join.await?.reset_store().await?; 596 596 + /// # Ok(()) 597 597 + /// # } 598 598 + /// ``` 599 599 + pub fn to_channel( 600 600 + mut self, 601 601 + n: usize, 602 602 + ) -> ( 603 603 + mpsc::Receiver<Result<BlockChunk<T>, DriveError>>, 604 604 + tokio::task::JoinHandle<Self>, 605 605 + ) { 606 606 + let (tx, rx) = mpsc::channel::<Result<BlockChunk<T>, DriveError>>(1); 607 607 + 608 608 + // sketch: this worker is going to be allowed to execute without a join handle 609 609 + let chan_task = tokio::task::spawn_blocking(move || { 610 610 + if let Err(mpsc::error::SendError(_)) = self.read_tx_blocking(n, tx) { 611 611 + log::debug!("big car reader exited early due to dropped receiver channel"); 612 612 + } 613 613 + self 614 614 + }); 615 615 + 616 616 + (rx, chan_task) 617 617 + } 618 618 + 619 619 + /// Reset the disk storage so it can be reused. You must call this. 620 620 + /// 621 621 + /// Ideally we'd put this in an `impl Drop`, but since it makes blocking 622 622 + /// calls, that would be risky in an async context. For now you just have to 623 623 + /// carefully make sure you call it. 624 624 + /// 625 625 + /// The sqlite store is returned, so it can be reused for another 626 626 + /// `DiskDriver`. 627 627 + pub async fn reset_store(mut self) -> Result<DiskStore, DriveError> { 628 628 + let BigState { store, .. } = self.state.take().expect("valid state"); 629 629 + Ok(store.reset().await?) 178 630 } 179 631 }

+86 -2

src/lib.rs

··· 1 1 - pub mod drive; 1 1 + /*! 2 2 + A robust CAR file -> MST walker for atproto 3 3 + 4 4 + Small CARs have their blocks buffered in memory. If a configurable memory limit 5 5 + is reached while reading blocks, CAR reading is suspended, and can be continued 6 6 + by providing disk storage to buffer the CAR blocks instead. 7 7 + 8 8 + A `process` function can be provided for tasks where records are transformed 9 9 + into a smaller representation, to save memory (and disk) during block reading. 10 10 + 11 11 + Once blocks are loaded, the MST is walked and emitted as chunks of pairs of 12 12 + `(rkey, processed_block)` pairs, in order (depth first, left-to-right). 13 13 + 14 14 + Some MST validations are applied 15 15 + - Keys must appear in order 16 16 + - Keys must be at the correct MST tree depth 17 17 + 18 18 + `iroh_car` additionally applies a block size limit of `2MiB`. 19 19 + 20 20 + ``` 21 21 + use repo_stream::{Driver, DriverBuilder, DiskBuilder}; 22 22 + 23 23 + # #[tokio::main] 24 24 + # async fn main() -> Result<(), Box<dyn std::error::Error>> { 25 25 + # let reader = include_bytes!("../car-samples/tiny.car").as_slice(); 26 26 + let mut total_size = 0; 27 27 + 28 28 + match DriverBuilder::new() 29 29 + .with_mem_limit_mb(10) 30 30 + .with_block_processor(|rec| rec.len()) // block processing: just extract the raw record size 31 31 + .load_car(reader) 32 32 + .await? 33 33 + { 34 34 + 35 35 + // if all blocks fit within memory 36 36 + Driver::Memory(_commit, mut driver) => { 37 37 + while let Some(chunk) = driver.next_chunk(256).await? { 38 38 + for (_rkey, size) in chunk { 39 39 + total_size += size; 40 40 + } 41 41 + } 42 42 + }, 43 43 + 44 44 + // if the CAR was too big for in-memory processing 45 45 + Driver::Disk(paused) => { 46 46 + // set up a disk store we can spill to 47 47 + let store = DiskBuilder::new().open("some/path.db".into()).await?; 48 48 + // do the spilling, get back a (similar) driver 49 49 + let (_commit, mut driver) = paused.finish_loading(store).await?; 50 50 + 51 51 + while let Some(chunk) = driver.next_chunk(256).await? { 52 52 + for (_rkey, size) in chunk { 53 53 + total_size += size; 54 54 + } 55 55 + } 56 56 + 57 57 + // clean up the disk store (drop tables etc) 58 58 + driver.reset_store().await?; 59 59 + } 60 60 + }; 61 61 + println!("sum of size of all records: {total_size}"); 62 62 + # Ok(()) 63 63 + # } 64 64 + ``` 65 65 + 66 66 + Disk spilling suspends and returns a `Driver::Disk(paused)` instead of going 67 67 + ahead and eagerly using disk I/O. This means you have to write a bit more code 68 68 + to handle both cases, but it allows you to have finer control over resource 69 69 + usage. For example, you can drive a number of parallel memory CAR workers, and 70 70 + separately have a different number of disk workers picking up suspended disk 71 71 + tasks from a queue. 72 72 + 73 73 + Find more [examples in the repo](https://tangled.org/@microcosm.blue/repo-stream/tree/main/examples). 74 74 + 75 75 + */ 76 76 + 2 77 pub mod mst; 3 3 - pub mod walk; 78 78 + mod walk; 79 79 + 80 80 + pub mod disk; 81 81 + pub mod drive; 82 82 + pub mod process; 83 83 + 84 84 + pub use disk::{DiskBuilder, DiskError, DiskStore}; 85 85 + pub use drive::{DriveError, Driver, DriverBuilder, NeedDisk}; 86 86 + pub use mst::Commit; 87 87 + pub use process::Processable;

+4 -8

src/mst.rs

··· 39 39 /// MST node data schema 40 40 #[derive(Debug, Deserialize, PartialEq)] 41 41 #[serde(deny_unknown_fields)] 42 42 - pub struct Node { 42 42 + pub(crate) struct Node { 43 43 /// link to sub-tree Node on a lower level and with all keys sorting before 44 44 /// keys at this node 45 45 #[serde(rename = "l")] ··· 62 62 /// so if a block *could be* a node, any record converter must postpone 63 63 /// processing. if it turns out it happens to be a very node-looking record, 64 64 /// well, sorry, it just has to only be processed later when that's known. 65 65 - pub fn could_be(bytes: impl AsRef<[u8]>) -> bool { 65 65 + pub(crate) fn could_be(bytes: impl AsRef<[u8]>) -> bool { 66 66 const NODE_FINGERPRINT: [u8; 3] = [ 67 67 0xA2, // map length 2 (for "l" and "e" keys) 68 68 0x61, // text length 1 ··· 83 83 /// with an empty array of entries. This is the only situation in which a 84 84 /// tree may contain an empty leaf node which does not either contain keys 85 85 /// ("entries") or point to a sub-tree containing entries. 86 86 - /// 87 87 - /// TODO: to me this is slightly unclear with respect to `l` (ask someone). 88 88 - /// ...is that what "The top of the tree must not be a an empty node which 89 89 - /// only points to a sub-tree." is referring to? 90 90 - pub fn is_empty(&self) -> bool { 86 86 + pub(crate) fn is_empty(&self) -> bool { 91 87 self.left.is_none() && self.entries.is_empty() 92 88 } 93 89 } ··· 95 91 /// TreeEntry object 96 92 #[derive(Debug, Deserialize, PartialEq)] 97 93 #[serde(deny_unknown_fields)] 98 98 - pub struct Entry { 94 94 + pub(crate) struct Entry { 99 95 /// count of bytes shared with previous TreeEntry in this Node (if any) 100 96 #[serde(rename = "p")] 101 97 pub prefix_len: usize,

+108

src/process.rs

··· 1 1 + /*! 2 2 + Record processor function output trait 3 3 + 4 4 + The return type must satisfy the `Processable` trait, which requires: 5 5 + 6 6 + - `Clone` because two rkeys can refer to the same record by CID, which may 7 7 + only appear once in the CAR file. 8 8 + - `Serialize + DeserializeOwned` so it can be spilled to disk. 9 9 + 10 10 + One required function must be implemented, `get_size()`: this should return the 11 11 + approximate total off-stack size of the type. (the on-stack size will be added 12 12 + automatically via `std::mem::get_size`). 13 13 + 14 14 + Note that it is **not guaranteed** that the `process` function will run on a 15 15 + block before storing it in memory or on disk: it's not possible to know if a 16 16 + block is a record without actually walking the MST, so the best we can do is 17 17 + apply `process` to any block that we know *cannot* be an MST node, and otherwise 18 18 + store the raw block bytes. 19 19 + 20 20 + Here's a silly processing function that just collects 'eyy's found in the raw 21 21 + record bytes 22 22 + 23 23 + ``` 24 24 + # use repo_stream::Processable; 25 25 + # use serde::{Serialize, Deserialize}; 26 26 + #[derive(Debug, Clone, Serialize, Deserialize)] 27 27 + struct Eyy(usize, String); 28 28 + 29 29 + impl Processable for Eyy { 30 30 + fn get_size(&self) -> usize { 31 31 + // don't need to compute the usize, it's on the stack 32 32 + self.1.capacity() // in-mem size from the string's capacity, in bytes 33 33 + } 34 34 + } 35 35 + 36 36 + fn process(raw: Vec<u8>) -> Vec<Eyy> { 37 37 + let mut out = Vec::new(); 38 38 + let to_find = "eyy".as_bytes(); 39 39 + for i in 0..(raw.len() - 3) { 40 40 + if &raw[i..(i+3)] == to_find { 41 41 + out.push(Eyy(i, "eyy".to_string())); 42 42 + } 43 43 + } 44 44 + out 45 45 + } 46 46 + ``` 47 47 + 48 48 + The memory sizing stuff is a little sketch but probably at least approximately 49 49 + works. 50 50 + */ 51 51 + 52 52 + use serde::{Serialize, de::DeserializeOwned}; 53 53 + 54 54 + /// Output trait for record processing 55 55 + pub trait Processable: Clone + Serialize + DeserializeOwned { 56 56 + /// Any additional in-memory size taken by the processed type 57 57 + /// 58 58 + /// Do not include stack size (`std::mem::size_of`) 59 59 + fn get_size(&self) -> usize; 60 60 + } 61 61 + 62 62 + /// Processor that just returns the raw blocks 63 63 + #[inline] 64 64 + pub fn noop(block: Vec<u8>) -> Vec<u8> { 65 65 + block 66 66 + } 67 67 + 68 68 + impl Processable for u8 { 69 69 + fn get_size(&self) -> usize { 70 70 + 0 71 71 + } 72 72 + } 73 73 + 74 74 + impl Processable for usize { 75 75 + fn get_size(&self) -> usize { 76 76 + 0 // no additional space taken, just its stack size (newtype is free) 77 77 + } 78 78 + } 79 79 + 80 80 + impl Processable for String { 81 81 + fn get_size(&self) -> usize { 82 82 + self.capacity() 83 83 + } 84 84 + } 85 85 + 86 86 + impl<Item: Sized + Processable> Processable for Vec<Item> { 87 87 + fn get_size(&self) -> usize { 88 88 + let slot_size = std::mem::size_of::<Item>(); 89 89 + let direct_size = slot_size * self.capacity(); 90 90 + let items_referenced_size: usize = self.iter().map(|item| item.get_size()).sum(); 91 91 + direct_size + items_referenced_size 92 92 + } 93 93 + } 94 94 + 95 95 + impl<Item: Processable> Processable for Option<Item> { 96 96 + fn get_size(&self) -> usize { 97 97 + self.as_ref().map(|item| item.get_size()).unwrap_or(0) 98 98 + } 99 99 + } 100 100 + 101 101 + impl<Item: Processable, Error: Processable> Processable for Result<Item, Error> { 102 102 + fn get_size(&self) -> usize { 103 103 + match self { 104 104 + Ok(item) => item.get_size(), 105 105 + Err(err) => err.get_size(), 106 106 + } 107 107 + } 108 108 + }

+278 -253

src/walk.rs

··· 1 1 //! Depth-first MST traversal 2 2 3 3 - use crate::drive::{MaybeProcessedBlock, ProcRes}; 3 3 + use crate::disk::SqliteReader; 4 4 + use crate::drive::{DecodeError, MaybeProcessedBlock}; 4 5 use crate::mst::Node; 6 6 + use crate::process::Processable; 5 7 use ipld_core::cid::Cid; 8 8 + use sha2::{Digest, Sha256}; 6 9 use std::collections::HashMap; 7 7 - use std::error::Error; 10 10 + use std::convert::Infallible; 8 11 12 12 + /// Errors that can happen while walking 9 13 #[derive(Debug, thiserror::Error)] 10 10 - pub enum Trip<E: Error> { 11 11 - #[error("empty mst nodes are not allowed")] 12 12 - NodeEmpty, 14 14 + pub enum WalkError { 15 15 + #[error("Failed to fingerprint commit block")] 16 16 + BadCommitFingerprint, 13 17 #[error("Failed to decode commit block: {0}")] 14 14 - BadCommit(Box<dyn std::error::Error>), 18 18 + BadCommit(#[from] serde_ipld_dagcbor::DecodeError<Infallible>), 15 19 #[error("Action node error: {0}")] 16 16 - ActionNode(#[from] ActionNodeError), 17 17 - #[error("Process failed: {0}")] 18 18 - ProcessFailed(E), 20 20 + MstError(#[from] MstError), 21 21 + #[error("storage error: {0}")] 22 22 + StorageError(#[from] rusqlite::Error), 23 23 + #[error("Decode error: {0}")] 24 24 + DecodeError(#[from] DecodeError), 19 25 } 20 26 21 21 - #[derive(Debug, thiserror::Error)] 22 22 - pub enum ActionNodeError { 27 27 + /// Errors from invalid Rkeys 28 28 + #[derive(Debug, PartialEq, thiserror::Error)] 29 29 + pub enum MstError { 23 30 #[error("Failed to compute an rkey due to invalid prefix_len")] 24 31 EntryPrefixOutOfbounds, 25 32 #[error("RKey was not utf-8")] 26 33 EntryRkeyNotUtf8(#[from] std::string::FromUtf8Error), 34 34 + #[error("Nodes cannot be empty (except for an entirely empty MST)")] 35 35 + EmptyNode, 36 36 + #[error("Found an entry with rkey at the wrong depth")] 37 37 + WrongDepth, 38 38 + #[error("Lost track of our depth (possible bug?)")] 39 39 + LostDepth, 40 40 + #[error("MST depth underflow: depth-0 node with child trees")] 41 41 + DepthUnderflow, 42 42 + #[error("Encountered an rkey out of order while walking the MST")] 43 43 + RkeyOutOfOrder, 27 44 } 28 45 46 46 + /// Walker outputs 29 47 #[derive(Debug)] 30 48 pub enum Step<T> { 31 31 - Rest(Cid), 49 49 + /// We needed this CID but it's not in the block store 50 50 + Missing(Cid), 51 51 + /// Reached the end of the MST! yay! 32 52 Finish, 33 33 - Step { rkey: String, data: T }, 53 53 + /// A record was found! 54 54 + Found { rkey: String, data: T }, 34 55 } 35 56 36 57 #[derive(Debug, Clone, PartialEq)] 37 58 enum Need { 38 38 - Node(Cid), 59 59 + Node { depth: Depth, cid: Cid }, 39 60 Record { rkey: String, cid: Cid }, 40 61 } 41 62 42 42 - fn push_from_node(stack: &mut Vec<Need>, node: &Node) -> Result<(), ActionNodeError> { 43 43 - let mut entries = Vec::with_capacity(node.entries.len()); 63 63 + #[derive(Debug, Clone, Copy, PartialEq)] 64 64 + enum Depth { 65 65 + Root, 66 66 + Depth(u32), 67 67 + } 68 68 + 69 69 + impl Depth { 70 70 + fn from_key(key: &[u8]) -> Self { 71 71 + let mut zeros = 0; 72 72 + for byte in Sha256::digest(key) { 73 73 + let leading = byte.leading_zeros(); 74 74 + zeros += leading; 75 75 + if leading < 8 { 76 76 + break; 77 77 + } 78 78 + } 79 79 + Self::Depth(zeros / 2) // truncating divide (rounds down) 80 80 + } 81 81 + fn next_expected(&self) -> Result<Option<u32>, MstError> { 82 82 + match self { 83 83 + Self::Root => Ok(None), 84 84 + Self::Depth(d) => d.checked_sub(1).ok_or(MstError::DepthUnderflow).map(Some), 85 85 + } 86 86 + } 87 87 + } 88 88 + 89 89 + fn push_from_node(stack: &mut Vec<Need>, node: &Node, parent_depth: Depth) -> Result<(), MstError> { 90 90 + // empty nodes are not allowed in the MST except in an empty MST 91 91 + if node.is_empty() { 92 92 + if parent_depth == Depth::Root { 93 93 + return Ok(()); // empty mst, nothing to push 94 94 + } else { 95 95 + return Err(MstError::EmptyNode); 96 96 + } 97 97 + } 44 98 99 99 + let mut entries = Vec::with_capacity(node.entries.len()); 45 100 let mut prefix = vec![]; 101 101 + let mut this_depth = parent_depth.next_expected()?; 102 102 + 46 103 for entry in &node.entries { 47 104 let mut rkey = vec![]; 48 105 let pre_checked = prefix 49 106 .get(..entry.prefix_len) 50 50 - .ok_or(ActionNodeError::EntryPrefixOutOfbounds)?; 107 107 + .ok_or(MstError::EntryPrefixOutOfbounds)?; 51 108 rkey.extend_from_slice(pre_checked); 52 109 rkey.extend_from_slice(&entry.keysuffix); 110 110 + 111 111 + let Depth::Depth(key_depth) = Depth::from_key(&rkey) else { 112 112 + return Err(MstError::WrongDepth); 113 113 + }; 114 114 + 115 115 + // this_depth is `none` if we are the deepest child (directly below root) 116 116 + // in that case we accept whatever highest depth is claimed 117 117 + let expected_depth = match this_depth { 118 118 + Some(d) => d, 119 119 + None => { 120 120 + this_depth = Some(key_depth); 121 121 + key_depth 122 122 + } 123 123 + }; 124 124 + 125 125 + // all keys we find should be this depth 126 126 + if key_depth != expected_depth { 127 127 + return Err(MstError::DepthUnderflow); 128 128 + } 129 129 + 53 130 prefix = rkey.clone(); 54 131 55 132 entries.push(Need::Record { ··· 57 134 cid: entry.value, 58 135 }); 59 136 if let Some(ref tree) = entry.tree { 60 60 - entries.push(Need::Node(*tree)); 137 137 + entries.push(Need::Node { 138 138 + depth: Depth::Depth(key_depth), 139 139 + cid: *tree, 140 140 + }); 61 141 } 62 142 } 63 143 64 144 entries.reverse(); 65 145 stack.append(&mut entries); 66 146 147 147 + let d = this_depth.ok_or(MstError::LostDepth)?; 148 148 + 67 149 if let Some(tree) = node.left { 68 68 - stack.push(Need::Node(tree)); 150 150 + stack.push(Need::Node { 151 151 + depth: Depth::Depth(d), 152 152 + cid: tree, 153 153 + }); 69 154 } 70 155 Ok(()) 71 156 } 72 157 158 158 + /// Traverser of an atproto MST 159 159 + /// 160 160 + /// Walks the tree from left-to-right in depth-first order 73 161 #[derive(Debug)] 74 162 pub struct Walker { 75 163 stack: Vec<Need>, 164 164 + prev: String, 76 165 } 77 166 78 167 impl Walker { 79 168 pub fn new(tree_root_cid: Cid) -> Self { 80 169 Self { 81 81 - stack: vec![Need::Node(tree_root_cid)], 170 170 + stack: vec![Need::Node { 171 171 + depth: Depth::Root, 172 172 + cid: tree_root_cid, 173 173 + }], 174 174 + prev: "".to_string(), 82 175 } 83 176 } 84 177 85 85 - pub fn walk<T: Clone, E: Error>( 178 178 + /// Advance through nodes until we find a record or can't go further 179 179 + pub fn step<T: Processable>( 86 180 &mut self, 87 87 - blocks: &mut HashMap<Cid, MaybeProcessedBlock<T, E>>, 88 88 - process: impl Fn(&[u8]) -> ProcRes<T, E>, 89 89 - ) -> Result<Step<T>, Trip<E>> { 181 181 + blocks: &mut HashMap<Cid, MaybeProcessedBlock<T>>, 182 182 + process: impl Fn(Vec<u8>) -> T, 183 183 + ) -> Result<Step<T>, WalkError> { 90 184 loop { 91 91 - let Some(mut need) = self.stack.last() else { 185 185 + let Some(need) = self.stack.last_mut() else { 92 186 log::trace!("tried to walk but we're actually done."); 93 187 return Ok(Step::Finish); 94 188 }; 95 189 96 96 - match &mut need { 97 97 - Need::Node(cid) => { 190 190 + match need { 191 191 + &mut Need::Node { depth, cid } => { 98 192 log::trace!("need node {cid:?}"); 99 99 - let Some(block) = blocks.remove(cid) else { 193 193 + let Some(block) = blocks.remove(&cid) else { 100 194 log::trace!("node not found, resting"); 101 101 - return Ok(Step::Rest(*cid)); 195 195 + return Ok(Step::Missing(cid)); 102 196 }; 103 197 104 198 let MaybeProcessedBlock::Raw(data) = block else { 105 105 - return Err(Trip::BadCommit("failed commit fingerprint".into())); 199 199 + return Err(WalkError::BadCommitFingerprint); 106 200 }; 107 201 let node = serde_ipld_dagcbor::from_slice::<Node>(&data) 108 108 - .map_err(|e| Trip::BadCommit(e.into()))?; 202 202 + .map_err(WalkError::BadCommit)?; 109 203 110 204 // found node, make sure we remember 111 205 self.stack.pop(); 112 206 113 207 // queue up work on the found node next 114 114 - push_from_node(&mut self.stack, &node)?; 208 208 + push_from_node(&mut self.stack, &node, depth)?; 115 209 } 116 210 Need::Record { rkey, cid } => { 117 211 log::trace!("need record {cid:?}"); 212 212 + // note that we cannot *remove* a record block, sadly, since 213 213 + // there can be multiple rkeys pointing to the same cid. 118 214 let Some(data) = blocks.get_mut(cid) else { 215 215 + return Ok(Step::Missing(*cid)); 216 216 + }; 217 217 + let rkey = rkey.clone(); 218 218 + let data = match data { 219 219 + MaybeProcessedBlock::Raw(data) => process(data.to_vec()), 220 220 + MaybeProcessedBlock::Processed(t) => t.clone(), 221 221 + }; 222 222 + 223 223 + // found node, make sure we remember 224 224 + self.stack.pop(); 225 225 + 226 226 + // rkeys *must* be in order or else the tree is invalid (or 227 227 + // we have a bug) 228 228 + if rkey <= self.prev { 229 229 + return Err(MstError::RkeyOutOfOrder)?; 230 230 + } 231 231 + self.prev = rkey.clone(); 232 232 + 233 233 + return Ok(Step::Found { rkey, data }); 234 234 + } 235 235 + } 236 236 + } 237 237 + } 238 238 + 239 239 + /// blocking!!!!!! 240 240 + pub fn disk_step<T: Processable>( 241 241 + &mut self, 242 242 + reader: &mut SqliteReader, 243 243 + process: impl Fn(Vec<u8>) -> T, 244 244 + ) -> Result<Step<T>, WalkError> { 245 245 + loop { 246 246 + let Some(need) = self.stack.last_mut() else { 247 247 + log::trace!("tried to walk but we're actually done."); 248 248 + return Ok(Step::Finish); 249 249 + }; 250 250 + 251 251 + match need { 252 252 + &mut Need::Node { depth, cid } => { 253 253 + let cid_bytes = cid.to_bytes(); 254 254 + log::trace!("need node {cid:?}"); 255 255 + let Some(block_bytes) = reader.get(cid_bytes)? else { 256 256 + log::trace!("node not found, resting"); 257 257 + return Ok(Step::Missing(cid)); 258 258 + }; 259 259 + 260 260 + let block: MaybeProcessedBlock<T> = crate::drive::decode(&block_bytes)?; 261 261 + 262 262 + let MaybeProcessedBlock::Raw(data) = block else { 263 263 + return Err(WalkError::BadCommitFingerprint); 264 264 + }; 265 265 + let node = serde_ipld_dagcbor::from_slice::<Node>(&data) 266 266 + .map_err(WalkError::BadCommit)?; 267 267 + 268 268 + // found node, make sure we remember 269 269 + self.stack.pop(); 270 270 + 271 271 + // queue up work on the found node next 272 272 + push_from_node(&mut self.stack, &node, depth).map_err(WalkError::MstError)?; 273 273 + } 274 274 + Need::Record { rkey, cid } => { 275 275 + log::trace!("need record {cid:?}"); 276 276 + let cid_bytes = cid.to_bytes(); 277 277 + let Some(data_bytes) = reader.get(cid_bytes)? else { 119 278 log::trace!("record block not found, resting"); 120 120 - return Ok(Step::Rest(*cid)); 279 279 + return Ok(Step::Missing(*cid)); 121 280 }; 281 281 + let data: MaybeProcessedBlock<T> = crate::drive::decode(&data_bytes)?; 122 282 let rkey = rkey.clone(); 123 283 let data = match data { 124 284 MaybeProcessedBlock::Raw(data) => process(data), 125 125 - MaybeProcessedBlock::Processed(Ok(t)) => Ok(t.clone()), 126 126 - bad => { 127 127 - // big hack to pull the error out -- this corrupts 128 128 - // a block, so we should not continue trying to work 129 129 - let mut steal = MaybeProcessedBlock::Raw(vec![]); 130 130 - std::mem::swap(&mut steal, bad); 131 131 - let MaybeProcessedBlock::Processed(Err(e)) = steal else { 132 132 - unreachable!(); 133 133 - }; 134 134 - return Err(Trip::ProcessFailed(e)); 135 135 - } 285 285 + MaybeProcessedBlock::Processed(t) => t.clone(), 136 286 }; 137 287 138 288 // found node, make sure we remember 139 289 self.stack.pop(); 140 290 141 291 log::trace!("emitting a block as a step. depth={}", self.stack.len()); 142 142 - let data = data.map_err(Trip::ProcessFailed)?; 143 143 - return Ok(Step::Step { rkey, data }); 292 292 + 293 293 + // rkeys *must* be in order or else the tree is invalid (or 294 294 + // we have a bug) 295 295 + if rkey <= self.prev { 296 296 + return Err(MstError::RkeyOutOfOrder)?; 297 297 + } 298 298 + self.prev = rkey.clone(); 299 299 + 300 300 + return Ok(Step::Found { rkey, data }); 144 301 } 145 302 } 146 303 } ··· 150 307 #[cfg(test)] 151 308 mod test { 152 309 use super::*; 153 153 - // use crate::mst::Entry; 154 310 155 311 fn cid1() -> Cid { 156 312 "bafyreihixenvk3ahqbytas4hk4a26w43bh6eo3w6usjqtxkpzsvi655a3m" 157 313 .parse() 158 314 .unwrap() 159 315 } 160 160 - // fn cid2() -> Cid { 161 161 - // "QmY7Yh4UquoXHLPFo2XbhXkhBvFoPwmQUSa92pxnxjQuPU" 162 162 - // .parse() 163 163 - // .unwrap() 164 164 - // } 165 165 - // fn cid3() -> Cid { 166 166 - // "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi" 167 167 - // .parse() 168 168 - // .unwrap() 169 169 - // } 170 170 - // fn cid4() -> Cid { 171 171 - // "QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR" 172 172 - // .parse() 173 173 - // .unwrap() 174 174 - // } 175 175 - // fn cid5() -> Cid { 176 176 - // "QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D" 177 177 - // .parse() 178 178 - // .unwrap() 179 179 - // } 180 180 - // fn cid6() -> Cid { 181 181 - // "QmdmQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7RgQm" 182 182 - // .parse() 183 183 - // .unwrap() 184 184 - // } 185 185 - // fn cid7() -> Cid { 186 186 - // "bafybeiaysi4s6lnjev27ln5icwm6tueaw2vdykrtjkwiphwekaywqhcjze" 187 187 - // .parse() 188 188 - // .unwrap() 189 189 - // } 190 190 - // fn cid8() -> Cid { 191 191 - // "bafyreif3tfdpr5n4jdrbielmcapwvbpcthepfkwq2vwonmlhirbjmotedi" 192 192 - // .parse() 193 193 - // .unwrap() 194 194 - // } 195 195 - // fn cid9() -> Cid { 196 196 - // "bafyreicnokmhmrnlp2wjhyk2haep4tqxiptwfrp2rrs7rzq7uk766chqvq" 197 197 - // .parse() 198 198 - // .unwrap() 199 199 - // } 316 316 + 317 317 + #[test] 318 318 + fn test_depth_spec_0() { 319 319 + let d = Depth::from_key(b"2653ae71"); 320 320 + assert_eq!(d, Depth::Depth(0)) 321 321 + } 322 322 + 323 323 + #[test] 324 324 + fn test_depth_spec_1() { 325 325 + let d = Depth::from_key(b"blue"); 326 326 + assert_eq!(d, Depth::Depth(1)) 327 327 + } 328 328 + 329 329 + #[test] 330 330 + fn test_depth_spec_4() { 331 331 + let d = Depth::from_key(b"app.bsky.feed.post/454397e440ec"); 332 332 + assert_eq!(d, Depth::Depth(4)) 333 333 + } 334 334 + 335 335 + #[test] 336 336 + fn test_depth_spec_8() { 337 337 + let d = Depth::from_key(b"app.bsky.feed.post/9adeb165882c"); 338 338 + assert_eq!(d, Depth::Depth(8)) 339 339 + } 340 340 + 341 341 + #[test] 342 342 + fn test_depth_ietf_draft_0() { 343 343 + let d = Depth::from_key(b"key1"); 344 344 + assert_eq!(d, Depth::Depth(0)) 345 345 + } 346 346 + 347 347 + #[test] 348 348 + fn test_depth_ietf_draft_1() { 349 349 + let d = Depth::from_key(b"key7"); 350 350 + assert_eq!(d, Depth::Depth(1)) 351 351 + } 352 352 + 353 353 + #[test] 354 354 + fn test_depth_ietf_draft_4() { 355 355 + let d = Depth::from_key(b"key515"); 356 356 + assert_eq!(d, Depth::Depth(4)) 357 357 + } 358 358 + 359 359 + #[test] 360 360 + fn test_depth_interop() { 361 361 + // examples from https://github.com/bluesky-social/atproto-interop-tests/blob/main/mst/key_heights.json 362 362 + for (k, expected) in [ 363 363 + ("", 0), 364 364 + ("asdf", 0), 365 365 + ("blue", 1), 366 366 + ("2653ae71", 0), 367 367 + ("88bfafc7", 2), 368 368 + ("2a92d355", 4), 369 369 + ("884976f5", 6), 370 370 + ("app.bsky.feed.post/454397e440ec", 4), 371 371 + ("app.bsky.feed.post/9adeb165882c", 8), 372 372 + ] { 373 373 + let d = Depth::from_key(k.as_bytes()); 374 374 + assert_eq!(d, Depth::Depth(expected), "key: {}", k); 375 375 + } 376 376 + } 200 377 201 378 #[test] 202 202 - fn test_next_from_node_empty() { 203 203 - let node = Node { 379 379 + fn test_push_empty_fails() { 380 380 + let empty_node = Node { 204 381 left: None, 205 382 entries: vec![], 206 383 }; 207 384 let mut stack = vec![]; 208 208 - push_from_node(&mut stack, &node).unwrap(); 209 209 - assert_eq!(stack.last(), None); 385 385 + let err = push_from_node(&mut stack, &empty_node, Depth::Depth(4)); 386 386 + assert_eq!(err, Err(MstError::EmptyNode)); 210 387 } 211 388 212 389 #[test] 213 213 - fn test_needs_from_node_just_left() { 390 390 + fn test_push_one_node() { 214 391 let node = Node { 215 392 left: Some(cid1()), 216 393 entries: vec![], 217 394 }; 218 395 let mut stack = vec![]; 219 219 - push_from_node(&mut stack, &node).unwrap(); 220 220 - assert_eq!(stack.last(), Some(Need::Node(cid1())).as_ref()); 396 396 + push_from_node(&mut stack, &node, Depth::Depth(4)).unwrap(); 397 397 + assert_eq!( 398 398 + stack.last(), 399 399 + Some(Need::Node { 400 400 + depth: Depth::Depth(3), 401 401 + cid: cid1() 402 402 + }) 403 403 + .as_ref() 404 404 + ); 221 405 } 222 222 - 223 223 - // #[test] 224 224 - // fn test_needs_from_node_just_one_record() { 225 225 - // let node = Node { 226 226 - // left: None, 227 227 - // entries: vec![Entry { 228 228 - // keysuffix: "asdf".into(), 229 229 - // prefix_len: 0, 230 230 - // value: cid1(), 231 231 - // tree: None, 232 232 - // }], 233 233 - // }; 234 234 - // assert_eq!( 235 235 - // needs_from_node(node).unwrap(), 236 236 - // vec![Need::Record { 237 237 - // rkey: "asdf".into(), 238 238 - // cid: cid1(), 239 239 - // },] 240 240 - // ); 241 241 - // } 242 242 - 243 243 - // #[test] 244 244 - // fn test_needs_from_node_two_records() { 245 245 - // let node = Node { 246 246 - // left: None, 247 247 - // entries: vec![ 248 248 - // Entry { 249 249 - // keysuffix: "asdf".into(), 250 250 - // prefix_len: 0, 251 251 - // value: cid1(), 252 252 - // tree: None, 253 253 - // }, 254 254 - // Entry { 255 255 - // keysuffix: "gh".into(), 256 256 - // prefix_len: 2, 257 257 - // value: cid2(), 258 258 - // tree: None, 259 259 - // }, 260 260 - // ], 261 261 - // }; 262 262 - // assert_eq!( 263 263 - // needs_from_node(node).unwrap(), 264 264 - // vec![ 265 265 - // Need::Record { 266 266 - // rkey: "asdf".into(), 267 267 - // cid: cid1(), 268 268 - // }, 269 269 - // Need::Record { 270 270 - // rkey: "asgh".into(), 271 271 - // cid: cid2(), 272 272 - // }, 273 273 - // ] 274 274 - // ); 275 275 - // } 276 276 - 277 277 - // #[test] 278 278 - // fn test_needs_from_node_with_both() { 279 279 - // let node = Node { 280 280 - // left: None, 281 281 - // entries: vec![Entry { 282 282 - // keysuffix: "asdf".into(), 283 283 - // prefix_len: 0, 284 284 - // value: cid1(), 285 285 - // tree: Some(cid2()), 286 286 - // }], 287 287 - // }; 288 288 - // assert_eq!( 289 289 - // needs_from_node(node).unwrap(), 290 290 - // vec![ 291 291 - // Need::Record { 292 292 - // rkey: "asdf".into(), 293 293 - // cid: cid1(), 294 294 - // }, 295 295 - // Need::Node(cid2()), 296 296 - // ] 297 297 - // ); 298 298 - // } 299 299 - 300 300 - // #[test] 301 301 - // fn test_needs_from_node_left_and_record() { 302 302 - // let node = Node { 303 303 - // left: Some(cid1()), 304 304 - // entries: vec![Entry { 305 305 - // keysuffix: "asdf".into(), 306 306 - // prefix_len: 0, 307 307 - // value: cid2(), 308 308 - // tree: None, 309 309 - // }], 310 310 - // }; 311 311 - // assert_eq!( 312 312 - // needs_from_node(node).unwrap(), 313 313 - // vec![ 314 314 - // Need::Node(cid1()), 315 315 - // Need::Record { 316 316 - // rkey: "asdf".into(), 317 317 - // cid: cid2(), 318 318 - // }, 319 319 - // ] 320 320 - // ); 321 321 - // } 322 322 - 323 323 - // #[test] 324 324 - // fn test_needs_from_full_node() { 325 325 - // let node = Node { 326 326 - // left: Some(cid1()), 327 327 - // entries: vec![ 328 328 - // Entry { 329 329 - // keysuffix: "asdf".into(), 330 330 - // prefix_len: 0, 331 331 - // value: cid2(), 332 332 - // tree: Some(cid3()), 333 333 - // }, 334 334 - // Entry { 335 335 - // keysuffix: "ghi".into(), 336 336 - // prefix_len: 1, 337 337 - // value: cid4(), 338 338 - // tree: Some(cid5()), 339 339 - // }, 340 340 - // Entry { 341 341 - // keysuffix: "jkl".into(), 342 342 - // prefix_len: 2, 343 343 - // value: cid6(), 344 344 - // tree: Some(cid7()), 345 345 - // }, 346 346 - // Entry { 347 347 - // keysuffix: "mno".into(), 348 348 - // prefix_len: 4, 349 349 - // value: cid8(), 350 350 - // tree: Some(cid9()), 351 351 - // }, 352 352 - // ], 353 353 - // }; 354 354 - // assert_eq!( 355 355 - // needs_from_node(node).unwrap(), 356 356 - // vec![ 357 357 - // Need::Node(cid1()), 358 358 - // Need::Record { 359 359 - // rkey: "asdf".into(), 360 360 - // cid: cid2(), 361 361 - // }, 362 362 - // Need::Node(cid3()), 363 363 - // Need::Record { 364 364 - // rkey: "aghi".into(), 365 365 - // cid: cid4(), 366 366 - // }, 367 367 - // Need::Node(cid5()), 368 368 - // Need::Record { 369 369 - // rkey: "agjkl".into(), 370 370 - // cid: cid6(), 371 371 - // }, 372 372 - // Need::Node(cid7()), 373 373 - // Need::Record { 374 374 - // rkey: "agjkmno".into(), 375 375 - // cid: cid8(), 376 376 - // }, 377 377 - // Need::Node(cid9()), 378 378 - // ] 379 379 - // ); 380 380 - // } 381 406 }

+34 -31

tests/non-huge-cars.rs

··· 1 1 extern crate repo_stream; 2 2 - use futures::TryStreamExt; 3 3 - use iroh_car::CarReader; 4 4 - use std::convert::Infallible; 2 2 + use repo_stream::Driver; 5 3 4 4 + const EMPTY_CAR: &'static [u8] = include_bytes!("../car-samples/empty.car"); 6 5 const TINY_CAR: &'static [u8] = include_bytes!("../car-samples/tiny.car"); 7 6 const LITTLE_CAR: &'static [u8] = include_bytes!("../car-samples/little.car"); 8 7 const MIDSIZE_CAR: &'static [u8] = include_bytes!("../car-samples/midsize.car"); 9 8 10 10 - async fn test_car(bytes: &[u8], expected_records: usize, expected_sum: usize) { 11 11 - let reader = CarReader::new(bytes).await.unwrap(); 12 12 - 13 13 - let root = reader 14 14 - .header() 15 15 - .roots() 16 16 - .first() 17 17 - .ok_or("missing root") 9 9 + async fn test_car( 10 10 + bytes: &[u8], 11 11 + expected_records: usize, 12 12 + expected_sum: usize, 13 13 + expect_profile: bool, 14 14 + ) { 15 15 + let mut driver = match Driver::load_car(bytes, |block| block.len(), 10 /* MiB */) 16 16 + .await 18 17 .unwrap() 19 19 - .clone(); 20 20 - 21 21 - let stream = std::pin::pin!(reader.stream()); 22 22 - 23 23 - let (_commit, v) = 24 24 - repo_stream::drive::Vehicle::init(root, stream, |block| Ok::<_, Infallible>(block.len())) 25 25 - .await 26 26 - .unwrap(); 27 27 - let mut record_stream = std::pin::pin!(v.stream()); 18 18 + { 19 19 + Driver::Memory(_commit, mem_driver) => mem_driver, 20 20 + Driver::Disk(_) => panic!("too big"), 21 21 + }; 28 22 29 23 let mut records = 0; 30 24 let mut sum = 0; 31 25 let mut found_bsky_profile = false; 32 26 let mut prev_rkey = "".to_string(); 33 33 - while let Some((rkey, size)) = record_stream.try_next().await.unwrap() { 34 34 - records += 1; 35 35 - sum += size; 36 36 - if rkey.0 == "app.bsky.actor.profile/self" { 37 37 - found_bsky_profile = true; 27 27 + 28 28 + while let Some(pairs) = driver.next_chunk(256).await.unwrap() { 29 29 + for (rkey, size) in pairs { 30 30 + records += 1; 31 31 + sum += size; 32 32 + if rkey == "app.bsky.actor.profile/self" { 33 33 + found_bsky_profile = true; 34 34 + } 35 35 + assert!(rkey > prev_rkey, "rkeys are streamed in order"); 36 36 + prev_rkey = rkey; 38 37 } 39 39 - assert!(rkey.0 > prev_rkey, "rkeys are streamed in order"); 40 40 - prev_rkey = rkey.0; 41 38 } 39 39 + 42 40 assert_eq!(records, expected_records); 43 41 assert_eq!(sum, expected_sum); 44 44 - assert!(found_bsky_profile); 42 42 + assert_eq!(found_bsky_profile, expect_profile); 43 43 + } 44 44 + 45 45 + #[tokio::test] 46 46 + async fn test_empty_car() { 47 47 + test_car(EMPTY_CAR, 0, 0, false).await 45 48 } 46 49 47 50 #[tokio::test] 48 51 async fn test_tiny_car() { 49 49 - test_car(TINY_CAR, 8, 2071).await 52 52 + test_car(TINY_CAR, 8, 2071, true).await 50 53 } 51 54 52 55 #[tokio::test] 53 56 async fn test_little_car() { 54 54 - test_car(LITTLE_CAR, 278, 246960).await 57 57 + test_car(LITTLE_CAR, 278, 246960, true).await 55 58 } 56 59 57 60 #[tokio::test] 58 61 async fn test_midsize_car() { 59 59 - test_car(MIDSIZE_CAR, 11585, 3741393).await 62 62 + test_car(MIDSIZE_CAR, 11585, 3741393, true).await 60 63 }