From f944e49ec97b6e9dcffab8606ca0b46e343d7e55 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Wed, 21 Aug 2024 16:40:10 +0200 Subject: [PATCH] use improved gix-diff API for better buffer handling --- gitoxide-core/src/hours/core.rs | 2 +- gitoxide-core/src/query/engine/update.rs | 4 ++-- gix/src/object/tree/diff/mod.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitoxide-core/src/hours/core.rs b/gitoxide-core/src/hours/core.rs index aacd3494adc..b402de1cddd 100644 --- a/gitoxide-core/src/hours/core.rs +++ b/gitoxide-core/src/hours/core.rs @@ -105,7 +105,7 @@ pub fn spawn_tree_delta_threads<'scope>( for chunk in rx { for (commit_idx, parent_commit, commit) in chunk { if let Some(cache) = cache.as_mut() { - cache.clear_resource_cache(); + cache.clear_resource_cache_keep_allocation(); } commits.fetch_add(1, Ordering::Relaxed); if gix::interrupt::is_triggered() { diff --git a/gitoxide-core/src/query/engine/update.rs b/gitoxide-core/src/query/engine/update.rs index 2e809f0e2b3..20c284b9d06 100644 --- a/gitoxide-core/src/query/engine/update.rs +++ b/gitoxide-core/src/query/engine/update.rs @@ -204,8 +204,8 @@ pub fn update( Some(c) => c, None => continue, }; - rewrite_cache.clear_resource_cache(); - diff_cache.clear_resource_cache(); + rewrite_cache.clear_resource_cache_keep_allocation(); + diff_cache.clear_resource_cache_keep_allocation(); from.changes()? .track_path() .track_rewrites(Some(rewrites)) diff --git a/gix/src/object/tree/diff/mod.rs b/gix/src/object/tree/diff/mod.rs index f1e6d64facf..751e6bcc5ea 100644 --- a/gix/src/object/tree/diff/mod.rs +++ b/gix/src/object/tree/diff/mod.rs @@ -156,7 +156,7 @@ impl<'a, 'repo> Platform<'a, 'repo> { lines_removed += counts.removals as u64; } - resource_cache.clear_resource_cache(); + resource_cache.clear_resource_cache_keep_allocation(); Ok::<_, std::convert::Infallible>(Action::Continue) })?;