forked from mirrors/jj
5174489959
The commit backend at Google is cloud-based (and so are the other backends); it reads and writes commits from/to a server, which stores them in a database. That makes latency much higher than for disk-based backends. To reduce the latency, we have a local daemon process that caches and prefetches objects. There are still many cases where latency is high, such as when diffing two uncached commits. We can improve that by changing some of our (jj's) algorithms to read many objects concurrently from the backend. In the case of tree-diffing, we can fetch one level (depth) of the tree at a time. There are several ways of doing that: * Make the backend methods `async` * Use many threads for reading from the backend * Add backend methods for batch reading I don't think we typically need CPU parallelism, so it's wasteful to have hundreds of threads running in order to fetch hundreds of objects in parallel (especially when using a synchronous backend like the Git backend). Batching would work well for the tree-diffing case, but it's not as composable as `async`. For example, if we wanted to fetch some commits at the same time as we were doing a diff, it's hard to see how to do that with batching. Using async seems like our best bet. I didn't make the backend interface's write functions async because writes are already async with the daemon we have at Google. That daemon will hash the object and immediately return, and then send the object to the server in the background. I think any cloud-based solution will need a similar daemon process. However, we may need to reconsider this if/when jj gets used on a server with a custom backend that writes directly to a database (i.e. no async daemon in between). I've tried to measure the performance impact. That's the largest difference I've been able to measure was on `jj diff --ignore-working-copy -s --from v5.0 --to v6.0` in the Linux repo, which increases from 749 ms to 773 ms (3.3%). In most cases I've tested, there's no measurable difference. I've tried diffing from the root commit, as well as `jj --ignore-working-copy log --no-graph -r '::v3.0 & author(torvalds)' -T 'commit_id ++ "\n"'` (to test a commit-heavy load).
105 lines
2.7 KiB
TOML
105 lines
2.7 KiB
TOML
cargo-features = []
|
|
|
|
[workspace]
|
|
resolver = "2"
|
|
members = ["cli", "lib", "lib/testutils", "lib/gen-protos"]
|
|
|
|
[workspace.package]
|
|
version = "0.10.0"
|
|
license = "Apache-2.0"
|
|
rust-version = "1.71" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix
|
|
edition = "2021"
|
|
readme = "README.md"
|
|
homepage = "https://github.com/martinvonz/jj"
|
|
repository = "https://github.com/martinvonz/jj"
|
|
documentation = "https://github.com/martinvonz/jj"
|
|
categories = ["version-control", "development-tools"]
|
|
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
|
|
|
|
[workspace.dependencies]
|
|
anyhow = "1.0.75"
|
|
assert_cmd = "2.0.8"
|
|
assert_matches = "1.5.0"
|
|
async-trait = "0.1.73"
|
|
backoff = "0.4.0"
|
|
blake2 = "0.10.6"
|
|
byteorder = "1.5.0"
|
|
bytes = "1.5.0"
|
|
cargo_metadata = "0.17.0"
|
|
clap = { version = "4.4.6", features = ["derive", "deprecated", "wrap_help"] }
|
|
clap_complete = "4.4.3"
|
|
clap_mangen = "0.2.10"
|
|
chrono = { version = "0.4.31", default-features = false, features = [
|
|
"std",
|
|
"clock",
|
|
] }
|
|
config = { version = "0.13.2", default-features = false, features = ["toml"] }
|
|
criterion = "0.5.1"
|
|
crossterm = { version = "0.26", default-features = false }
|
|
digest = "0.10.7"
|
|
dirs = "5.0.1"
|
|
either = "1.9.0"
|
|
esl01-renderdag = "0.3.0"
|
|
futures = "0.3.28"
|
|
glob = "0.3.1"
|
|
git2 = "0.17.2"
|
|
hex = "0.4.3"
|
|
itertools = "0.11.0"
|
|
indexmap = "2.0.2"
|
|
libc = { version = "0.2.148" }
|
|
insta = { version = "1.33.0", features = ["filters"] }
|
|
maplit = "1.0.2"
|
|
num_cpus = "1.16.0"
|
|
once_cell = "1.18.0"
|
|
pest = "2.7.4"
|
|
pest_derive = "2.7.4"
|
|
pretty_assertions = "1.4.0"
|
|
prost = "0.11.9"
|
|
prost-build = "0.11.9"
|
|
rand = "0.8.5"
|
|
rand_chacha = "0.3.1"
|
|
rayon = "1.8.0"
|
|
regex = "1.9.6"
|
|
rpassword = "7.2.0"
|
|
rustix = { version = "0.38.17", features = ["fs"] }
|
|
smallvec = { version = "1.11.1", features = [
|
|
"const_generics",
|
|
"const_new",
|
|
"union",
|
|
] }
|
|
scm-record = "0.1.0"
|
|
serde = { version = "1.0", features = ["derive"] }
|
|
serde_json = "1.0.107"
|
|
slab = "0.4.9"
|
|
strsim = "0.10.0"
|
|
tempfile = "3.8.0"
|
|
test-case = "3.2.1"
|
|
textwrap = "0.16.0"
|
|
thiserror = "1.0.49"
|
|
timeago = { version = "0.4.2", default-features = false }
|
|
toml_edit = { version = "0.19.15", features = ["serde"] }
|
|
tracing = "0.1.37"
|
|
tracing-chrome = "0.7.1"
|
|
tracing-subscriber = { version = "0.3.17", default-features = false, features = [
|
|
"std",
|
|
"ansi",
|
|
"env-filter",
|
|
"fmt",
|
|
] }
|
|
tokio = { version = "1.32.0" }
|
|
unicode-width = "0.1.11"
|
|
watchman_client = { version = "0.8.0" }
|
|
whoami = "1.4.1"
|
|
version_check = "0.9.4"
|
|
zstd = "0.12.4"
|
|
|
|
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
|
|
# their own (alphabetically sorted) block
|
|
|
|
jj-lib = { path = "lib", version = "0.10.0" }
|
|
testutils = { path = "lib/testutils" }
|
|
|
|
[profile.release]
|
|
strip = "debuginfo"
|
|
codegen-units = 1
|