Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ cli-test/vendor/
.cursor
.cargo/config.toml
.claude/settings.local.json
.claude/*.lock
.superset

data/
125 changes: 123 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ futures = "0.3.28"
futures-util = "0.3.28"
glob = "0.3.1"
glob-match = "0.2.1"
heed = "0.22.0"
hex = "0.4.3"
http = "1.1.0"
humantime = "2.1.0"
Expand Down Expand Up @@ -161,6 +162,7 @@ utoipa-swagger-ui = { version = "9", features = ["actix-web"] }
uuid = { version = "1.4.1", features = ["serde", "v4"] }
walkdir = "2.5.0"
xxhash-rust = { version = "0.8.7", features = ["xxh3"] }
zerocopy = { version = "0.8", features = ["derive"] }
zip = { version = "2.4.1", default-features = false, features = ["deflate"] }

[profile.dev]
Expand Down
2 changes: 2 additions & 0 deletions crates/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ futures = { workspace = true }
futures-util = { workspace = true }
glob = { workspace = true }
glob-match = { workspace = true }
heed = { workspace = true }
http = { workspace = true }
humantime = { workspace = true }
ignore = { workspace = true }
Expand Down Expand Up @@ -137,6 +138,7 @@ utoipa = { workspace = true }
uuid = { workspace = true }
walkdir = { workspace = true }
xxhash-rust = { workspace = true }
zerocopy = { workspace = true }
zip = { workspace = true }

[dev-dependencies]
Expand Down
4 changes: 4 additions & 0 deletions crates/lib/src/core/db/merkle_node.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
pub mod file_backend;
pub mod lmdb;
pub mod merkle_node_db;

pub(crate) use merkle_node_db::MerkleNodeDB;

pub use file_backend::FileBackend;
pub use lmdb::LmdbBackend;
7 changes: 2 additions & 5 deletions crates/lib/src/core/db/merkle_node/file_backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,9 @@ fn extract_tar_under<R: Read>(
// we have the hex-encoded hash as the `{prefix}/{suffix}` dirs.
if let Some(hash) = extract_hash_from_entry_path(&dst_path, oxen_hidden)? {
hashes.insert(hash);
} else {
log::warn!(
"Skipping non-merkle entry in tarball: {}",
dst_path.display()
);
}
// If we can't extract a path, it's because we're looking at a node or children file.
// We will have already obtained the hash from the directory, so this is ok!
}
Ok(hashes)
}
Expand Down
Loading
Loading