Delta compression: reuse DeltaTask.getAdjustedWeight()

Change-Id: I07ed5207b175735b4e2c46edf652cc35908dad02
Signed-off-by: Terry Parker <tparker@google.com>

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 076df1880014e54fe5c7575141a086efa4f28c9e..42927426b9e3445011469f93d442e57757ee1c69 100644 (file)
--- 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 @@ final class DeltaTask implements Callable<Object> {
                }
        }
 
-       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 f087aca05b2cd39a337a279674be1e58ce388025..19b6b080da1685e507ab61625017e7fd5b5972a9 100644 (file)
--- 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 @@ public class PackWriter implements AutoCloseable {
                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;