# This is a combination of 2 commits.

# This is the 1st commit message:

Disable notes cache by default

This backend has perf issues on large repos with many merges,
so we disable it for now until the issue is fixed.

 The commit message #2 will be skipped:

# f

Author: christian-schilling

josh-cli/src/bin/josh-filter.rs

@@ -86,6 +86,12 @@ fn make_app() -> clap::Command {
                 .help("Don't load cache")
                 .short('n'),
         )
+        .arg(
+            clap::Arg::new("notes-cache")
+                .action(clap::ArgAction::SetTrue)
+                .help("Enables notes based cache")
+                .long("notes-cache"),
+        )
         .arg(
             clap::Arg::new("pack")
                 .action(clap::ArgAction::SetTrue)
@@ -196,11 +202,16 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
         josh_core::cache::sled_load(&repo_path)?;
     }
 
-    let cache = std::sync::Arc::new(
-        josh_core::cache::CacheStack::new()
-            .with_backend(josh_core::cache::SledCacheBackend::default())
-            .with_backend(josh_core::cache::NotesCacheBackend::new(&repo_path)?),
-    );
+    let cache = std::sync::Arc::new({
+        let cache = josh_core::cache::CacheStack::new()
+            .with_backend(josh_core::cache::SledCacheBackend::default());
+
+        if args.get_flag("notes-cache") {
+            cache.with_backend(josh_core::cache::NotesCacheBackend::new(&repo_path)?)
+        } else {
+            cache
+        }
+    });
 
     let mut transaction =
         josh_core::cache::TransactionContext::from_env(cache.clone())?.open(None)?;

josh-cli/src/bin/josh.rs

@@ -325,12 +325,13 @@ fn run_command(cli: &Cli) -> anyhow::Result<()> {
 
     let cache = std::sync::Arc::new(
         josh_core::cache::CacheStack::new()
-            .with_backend(josh_core::cache::SledCacheBackend::default())
-            .with_backend(
-                josh_core::cache::NotesCacheBackend::new(&repo_path)
-                    .map_err(from_josh_err)
-                    .context("Failed to create NotesCacheBackend")?,
-            ),
+            .with_backend(josh_core::cache::SledCacheBackend::default()),
+        // FIXME: NotesCacheBackend seems to have perf issues, so disable it for now
+        //.with_backend(
+        //    josh_core::cache::NotesCacheBackend::new(&repo_path)
+        //        .map_err(from_josh_err)
+        //        .context("Failed to create NotesCacheBackend")?,
+        //),
     );
 
     // Create transaction using the known repo path

tests/cli/clone-main-branch.t

@@ -111,10 +111,6 @@ Test josh clone with main branch as default
   |   |-- feature-branch
   |   `-- main
   |-- josh
-  |   |-- 24
-  |   |   `-- 0
-  |   |       |-- 9d5b5e98dceaf62470a7569949757c9643632621
-  |   |       `-- bf567e0faf634a663d6cef48145a035e1974ab1d
   |   `-- remotes
   |       `-- origin
   |           |-- feature-branch
@@ -133,6 +129,6 @@ Test josh clone with main branch as default
   |       `-- main
   `-- tags
 
-  14 directories, 12 files
+  12 directories, 10 files
 
   $ cd ..

tests/cli/clone.t

@@ -51,10 +51,6 @@
   |-- heads
   |   `-- master
   |-- josh
-  |   |-- 24
-  |   |   `-- 0
-  |   |       |-- 9d5b5e98dceaf62470a7569949757c9643632621
-  |   |       `-- bf567e0faf634a663d6cef48145a035e1974ab1d
   |   `-- remotes
   |       `-- origin
   |           |-- feature
@@ -73,7 +69,7 @@
   |       `-- master
   `-- tags
 
-  14 directories, 11 files
+  12 directories, 9 files
 
   $ tree
   .

tests/cli/empty-filter.t

@@ -166,10 +166,6 @@ Test josh clone with filter that results in empty tree for some branches
   |   |-- master
   |   `-- mixed-branch
   |-- josh
-  |   |-- 24
-  |   |   `-- 0
-  |   |       |-- 9d5b5e98dceaf62470a7569949757c9643632621
-  |   |       `-- bf567e0faf634a663d6cef48145a035e1974ab1d
   |   `-- remotes
   |       `-- origin
   |           |-- content-branch
@@ -192,6 +188,6 @@ Test josh clone with filter that results in empty tree for some branches
   |       `-- mixed-branch
   `-- tags
 
-  14 directories, 17 files
+  12 directories, 15 files
 
   $ cd ..

tests/cli/push_stacked.t

@@ -65,8 +65,6 @@ Push with stacked changes (should create multiple refs)
   $ git ls-remote .
   da80e49d24d110866ce2ec7a5c21112696fd165b\tHEAD (esc)
   da80e49d24d110866ce2ec7a5c21112696fd165b\trefs/heads/master (esc)
-  725a17751b9dc03b1696fb894d0643c5b6f0397d\trefs/josh/24/0/9d5b5e98dceaf62470a7569949757c9643632621 (esc)
-  030ef005644909d7f6320dcd99684a36860fb7d9\trefs/josh/24/0/bf567e0faf634a663d6cef48145a035e1974ab1d (esc)
   6ed6c1ca90cb15fe4edf8d133f0e2e44562aa77d\trefs/josh/remotes/origin/master (esc)
   da80e49d24d110866ce2ec7a5c21112696fd165b\trefs/namespaces/josh-origin/HEAD (esc)
   5f2928c89c4dcc7f5a8c59ef65734a83620cefee\trefs/namespaces/josh-origin/refs/heads/master (esc)
@@ -88,8 +86,6 @@ Push with stacked changes (should create multiple refs)
   $ git ls-remote .
   da80e49d24d110866ce2ec7a5c21112696fd165b\tHEAD (esc)
   da80e49d24d110866ce2ec7a5c21112696fd165b\trefs/heads/master (esc)
-  725a17751b9dc03b1696fb894d0643c5b6f0397d\trefs/josh/24/0/9d5b5e98dceaf62470a7569949757c9643632621 (esc)
-  030ef005644909d7f6320dcd99684a36860fb7d9\trefs/josh/24/0/bf567e0faf634a663d6cef48145a035e1974ab1d (esc)
   6ed6c1ca90cb15fe4edf8d133f0e2e44562aa77d\trefs/josh/remotes/origin/master (esc)
   da80e49d24d110866ce2ec7a5c21112696fd165b\trefs/namespaces/josh-origin/HEAD (esc)
   5f2928c89c4dcc7f5a8c59ef65734a83620cefee\trefs/namespaces/josh-origin/refs/heads/master (esc)

tests/cli/push_stacked_split.t

@@ -144,8 +144,6 @@ Test that we can fetch the split refs back
   * | Change-Id: 1234  (origin/@changes/master/josh@example.com/1234) 43d6fcc9e7a81452d7343c78c0102f76027717fb
   |/  
   * add file1  (origin/master, origin/HEAD) 5f2928c89c4dcc7f5a8c59ef65734a83620cefee
-  * Notes added by 'git_note_create' from libgit2  725a17751b9dc03b1696fb894d0643c5b6f0397d
-  * Notes added by 'git_note_create' from libgit2  030ef005644909d7f6320dcd99684a36860fb7d9
 
 Test normal push still works
 

tests/filter/cmdline.t

@@ -33,15 +33,15 @@
 
   $ git commit -m "initial" --allow-empty 1> /dev/null
 
-  $ josh-filter -s c=:/sub1 --update refs/josh/filter/libs/master libs/master
+  $ josh-filter --notes-cache -s c=:/sub1 --update refs/josh/filter/libs/master libs/master
   21a904a6f350cb1f8ea4dc6fe9bd4e3b4cc4840b
   [2] :/sub1
   [2] :prefix=c
   [4] sequence_number
   $ git log --graph --pretty=%s josh/filter/libs/master
   * add file2
   * add file1
-  $ josh-filter -s a/b=:/sub2 --update refs/josh/filter/libs/foo libs/foo
+  $ josh-filter --notes-cache -s a/b=:/sub2 --update refs/josh/filter/libs/foo libs/foo
   933f26e096e3452793bcbb82e8d927d7820340fb
   [1] :prefix=a
   [1] :prefix=b

tests/filter/file.t

@@ -54,11 +54,7 @@
   .git/refs/
   |-- heads
   |   `-- master
-  |-- josh
-  |   `-- 24
-  |       `-- 0
-  |           `-- fc16bb70cbbc24982dac74e19c853a8fc91a2aed
   `-- tags
 
-  6 directories, 2 files
+  3 directories, 1 file