From 36c6aecbe830d0bf6fa1bbf69176d56fd2e7318a Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Tue, 3 Nov 2015 15:08:32 -0800 Subject: [PATCH] Delta compression: reuse DeltaTask.getAdjustedWeight() Change-Id: I07ed5207b175735b4e2c46edf652cc35908dad02 Signed-off-by: Terry Parker --- .../src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java | 2 +- .../src/org/eclipse/jgit/internal/storage/pack/PackWriter.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java index 076df1880..42927426b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java @@ -226,7 +226,7 @@ public int compare(WeightedPath a, WeightedPath b) { } } - private static int getAdjustedWeight(ObjectToPack o) { + static int getAdjustedWeight(ObjectToPack o) { // Edge objects and those with reused deltas do not need to be // compressed. For compression calculations, ignore their weights. if (o.isEdge() || o.doNotAttemptDelta()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index f087aca05..19b6b080d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -1306,8 +1306,7 @@ private void singleThreadDeltaSearch(ProgressMonitor monitor, long totalWeight = 0; for (int i = 0; i < cnt; i++) { ObjectToPack o = list[i]; - if (!o.isEdge() && !o.doNotAttemptDelta()) - totalWeight += o.getWeight(); + totalWeight += DeltaTask.getAdjustedWeight(o); } long bytesPerUnit = 1;