[JGIT PATCH 02/11] Fix performance problem recently introduced to DeltaPackedObjectLoader
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Apr 29, 2009, 18:54 UTC
- Message-ID
- <1241031288-23437-3-git-send-email-spearce@spearce.org>
- In-Reply-To
- <1241031288-23437-2-git-send-email-spearce@spearce.org>
In fe6c8248e1ed6bd9db76a8314103081a02d55393 ("Fully materialize an ObjectLoader before returning it from ObjectDatabase") I missed a crucial return call here in DeltaPackedObjectLoadeder. That one missing line caused cache hits in the UnpackedObjectCache to then fall through and unpack the delta base, and apply the delta onto it, ignoring the fact that we had a successful cache hit.
When packing and serving e.g. the Linux kernel repository this resulted in a 10x increase in the number of WindowCache.get() invocations we saw, as the UnpackedObjectCache was useless.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> ---
Unchanged.
.../spearce/jgit/lib/DeltaPackedObjectLoader.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/DeltaPackedObjectLoader.java b/org.spearce.jgit/src/org/spearce/jgit/lib/DeltaPackedObjectLoader.java index 8194d94..7d3f30d 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/DeltaPackedObjectLoader.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/DeltaPackedObjectLoader.java @@ -69,6 +69,7 @@ public void materialize(final WindowCursor curs) throws IOException { objectType = cache.type; objectSize = cache.data.length; cachedBytes = cache.data; + return; } }
-- 1.6.3.rc3.199.g24398